add 疼痛小管家

nb-admin/src/test/java/com/nb/admin/AliyunTest.java

@@ -3,7 +3,7 @@ package com.nb.admin;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nb.aliyun.api.service.AliyunIotSdk;
 import com.nb.web.api.entity.BusDeviceEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.listener.event.bean.DeviceInfoEvent;
 import com.nb.web.service.bus.service.LocalBusDeviceService;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;

nb-admin/src/test/java/com/nb/admin/BusClinicTest.java

@@ -6,9 +6,9 @@ import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.BusDocEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.service.LocalBusClinicService;
 import com.nb.web.service.bus.service.LocalBusDocService;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;

nb-admin/src/test/java/com/nb/admin/BusDeviceAlarmTest.java

@@ -1,8 +1,8 @@
 package com.nb.admin;
 
 import com.nb.web.service.bus.controller.BusDeviceHistoryController;
-import com.nb.web.service.bus.entity.BusDeviceAlarmEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.api.enums.DeviceStatusEnum;
 import com.nb.web.service.bus.mapper.BusDeviceAlarmMapper;
 import com.nb.web.service.bus.service.LocalBusDeviceAlarmService;

nb-admin/src/test/java/com/nb/admin/BusDeviceTest.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.api.entity.BusDeviceEntity;
-import com.nb.web.service.bus.entity.BusDeviceHistoryEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import com.nb.web.service.bus.service.LocalBusDeviceHistoryService;
 import com.nb.web.service.bus.service.LocalBusDeviceService;
 import com.nb.web.service.bus.service.dto.ClinicAnalInfusionRecord;

nb-admin/src/test/java/com/nb/admin/BusPatientTest.java

@@ -7,11 +7,11 @@ import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nb.web.service.bus.controller.BusDeviceManualController;
 import com.nb.web.service.bus.controller.vo.ClinicEditVo;
-import com.nb.web.service.bus.entity.BusClinicEntity;
-import com.nb.web.service.bus.entity.BusDeviceManualEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusDeviceManualEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
-import com.nb.web.service.bus.enums.DeviceManualEnum;
+import com.nb.web.api.enums.DeviceManualEnum;
 import com.nb.web.service.bus.hospital.his.strategy.all.EqualsStrategyHandler;
 import com.nb.web.service.bus.service.LocalBusClinicService;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;

nb-admin/src/test/java/com/nb/admin/HisStrategyTest.java

@@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.hospital.his.strategy.HisStrategyEnum;
 import com.nb.web.service.bus.hospital.his.strategy.HisStrategyHandler;
 import com.nb.web.service.bus.hospital.his.strategy.HisStrategyManager;

nb-service-api/app-doctor-api/src/main/java/com/nb/app/doctor/api/feign/IAppDoctorUserClient.java

@@ -1,6 +1,10 @@
 package com.nb.app.doctor.api.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.app.doctor.api.entity.AppDoctorUserEntity;
+import com.nb.core.entity.QueryParamEntity;
+
+import java.io.Serializable;
 import java.util.*;
 /**
  * @author lifang
@@ -17,7 +21,7 @@ public interface IAppDoctorUserClient {
      * @param sources
      * @return boolean
      */
-    public boolean saveBatch(List<AppDoctorUserEntity> sources);
+    boolean saveBatch(List<AppDoctorUserEntity> sources);
 
     /**
      * 描述: 重置密码
@@ -27,7 +31,7 @@ public interface IAppDoctorUserClient {
      * @param newPws
      * @return boolean
      */
-    public boolean resetPsw(String id,String newPws);
+    boolean resetPsw(String id,String newPws);
 
     /**
      * 描述: 编辑个人信息
@@ -36,5 +40,26 @@ public interface IAppDoctorUserClient {
      * @param source
      * @return boolean
      */
-    public boolean edit(AppDoctorUserEntity source);
+    boolean edit(AppDoctorUserEntity source);
+
+
+    /**
+     * 描述: 查询用户列表
+     * @author lifang
+     * @date 2022/8/10 14:14
+     * @param param
+     * @return IPage<AppDoctorUserEntity>
+     */
+    IPage<AppDoctorUserEntity> list(QueryParamEntity<AppDoctorUserEntity> param) ;
+
+
+
+    /**
+     * 描述: 删除某一医生用户
+     * @author lifang
+     * @date 2022/8/10 14:14
+     * @param id
+     * @return boolean
+     */
+     boolean removeById(Serializable id) ;
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/FormulaDrugDetailDomain.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/bean/FormulaDrugDetailDomain.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.service.dto;
+package com.nb.web.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/FormulaDrugDomain.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/bean/FormulaDrugDomain.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.service.dto;
+package com.nb.web.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/UndoDeviceConfig.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/bean/UndoDeviceConfig.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.service.dto;
+package com.nb.web.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusClinicEntity.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusClinicEntity.java

@@ -1,9 +1,9 @@
-package com.nb.web.service.bus.entity;
+package com.nb.web.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.nb.web.service.bus.service.dto.FormulaDrugDomain;
-import com.nb.web.service.bus.service.dto.UndoDeviceConfig;
+import com.nb.web.api.bean.FormulaDrugDomain;
+import com.nb.web.api.bean.UndoDeviceConfig;
 import com.nb.core.entity.TenantGenericEntity;
 import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusDeviceAlarmEntity.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusDeviceAlarmEntity.java

@@ -1,5 +1,6 @@
-package com.nb.web.service.bus.entity;
+package com.nb.web.api.entity;
 
+import cn.hutool.crypto.digest.MD5;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -16,7 +17,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.tio.utils.crypto.Md5;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -34,7 +34,7 @@ import java.util.Date;
 @ApiModel(value="设备报警信息", description="设备报警信息记录")
 @ToString
 public class BusDeviceAlarmEntity extends TenantGenericEntity<String,String> {
-
+    private final static MD5 md5=MD5.create();
     @ApiModelProperty(value = "设备唯一编码",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @NotNull(groups = Insert.class,message = "设备唯一标识不能为空")
     private String deviceId;
@@ -131,7 +131,7 @@ public class BusDeviceAlarmEntity extends TenantGenericEntity<String,String> {
         param.putOpt("warnAnalgesicPoor",String.valueOf(this.getWarnAnalgesicPoor()));
         param.putOpt("warnLowBattery",String.valueOf(this.getWarnLowBattery()));
         param.putOpt("warnFlow",String.valueOf(this.getWarnFlow()));
-        return Md5.getMD5(param.toString());
+        return md5.digestHex16(param.toString());
     }
 
     public static boolean alarmOrWarn(CommonDeviceParam history){

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusDeviceHistoryEntity.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusDeviceHistoryEntity.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.entity;
+package com.nb.web.api.entity;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.TableName;

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusDeviceManualEntity.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusDeviceManualEntity.java

@@ -1,9 +1,9 @@
-package com.nb.web.service.bus.entity;
+package com.nb.web.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.nb.web.service.bus.enums.DeviceManualEnum;
+import com.nb.web.api.enums.DeviceManualEnum;
 import com.nb.core.entity.GenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusInfusionHistoryEntity.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusInfusionHistoryEntity.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.entity;
+package com.nb.web.api.entity;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.*;

nb-service/web-service/src/main/java/com/nb/web/service/bus/enums/DeviceManualEnum.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/enums/DeviceManualEnum.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.enums;
+package com.nb.web.api.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;

nb-service/web-service/src/main/java/com/nb/web/service/bus/enums/PatientAlarmEnum.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/enums/PatientAlarmEnum.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.enums;
+package com.nb.web.api.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;

nb-service/web-service/src/main/java/com/nb/web/service/bus/enums/WarnEnum.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/enums/WarnEnum.java

@@ -1,4 +1,4 @@
-package com.nb.web.service.bus.enums;
+package com.nb.web.api.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import com.nb.web.api.enums.FlowStatusEnum;

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IDeviceAlarmClient.java

@@ -0,0 +1,24 @@
+package com.nb.web.api.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.nb.core.entity.QueryParamEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName IDeviceAlarmClient.java
+ * @Description 设备报警
+ * @createTime 2022年08月10日 14:04:00
+ */
+public interface IDeviceAlarmClient {
+
+    /**
+     * 描述: 查询报警信息
+     * @author lifang
+     * @date 2022/8/10 14:10
+     * @param source
+     * @return boolean
+     */
+    IPage<BusDeviceAlarmEntity> list(QueryParamEntity<BusDeviceAlarmEntity> source) ;
+}

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IPatientClient.java

@@ -0,0 +1,37 @@
+package com.nb.web.api.feign;
+
+import com.nb.web.api.feign.query.PatientMonitorQuery;
+import com.nb.web.api.feign.result.PatientMonitorDetailResult;
+import com.nb.web.api.feign.result.PatientMonitorResult;
+
+import java.util.List;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName IPatientClient.java
+ * @Description TODO
+ * @createTime 2022年08月10日 13:42:00
+ */
+public interface IPatientClient {
+    /**
+     * 描述: 查询所有的监护中的病人信息
+     * @author lifang
+     * @date 2022/8/10 13:46
+     * @param query
+     * @return List<PatientMonitorResult>
+     */
+    List<PatientMonitorResult> selectAll(PatientMonitorQuery query) ;
+
+    /**
+     * 描述: 查询病人详情
+     * @author lifang
+     * @date 2022/8/10 13:58
+     * @param patientId
+     * @return PatientMonitorDetailResult
+     */
+    PatientMonitorDetailResult lookPatientDetail(String patientId);
+
+
+
+}

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/PatientMonitorQuery.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/query/PatientMonitorQuery.java

@@ -1,10 +1,10 @@
-package com.nb.web.service.bus.service.dto;
+package com.nb.web.api.feign.query;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.nb.web.api.enums.DeviceAlarmEnum;
 import com.nb.web.api.enums.DeviceTypeEnum;
 import com.nb.web.api.enums.DeviceStatusEnum;
-import com.nb.web.service.bus.enums.WarnEnum;
+import com.nb.web.api.enums.WarnEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -92,7 +92,7 @@ public class PatientMonitorQuery  implements Serializable {
 
     /**
      * 根据此提醒进行解析
-     * @see  com.nb.web.service.bus.enums.WarnEnum
+     * @see  WarnEnum
      */
     @ApiModelProperty(value = "提醒【0、智能泵-正常; 1、智能泵-加档受限; 2、智能泵-流速已达上限; 3、智能泵-加档; 4、智能泵-减档; 5、智能泵-低输注状态; 6、输注即将结束;7、镇痛不足;8、低电量】 ")
     private List<WarnEnum> warns;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/PatientMonitorDetailResult.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/result/PatientMonitorDetailResult.java

@@ -1,8 +1,8 @@
-package com.nb.web.service.bus.service.dto;
+package com.nb.web.api.feign.result;
 
-import com.nb.web.service.bus.entity.BusClinicEntity;
-import com.nb.web.service.bus.entity.BusDeviceManualEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusDeviceManualEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/PatientMonitorResult.java → nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/result/PatientMonitorResult.java

@@ -1,14 +1,10 @@
-package com.nb.web.service.bus.service.dto;
+package com.nb.web.api.feign.result;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
-import com.nb.web.service.bus.enums.*;
+import com.nb.web.api.enums.*;
 import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.nb.web.api.enums.DeviceAlarmEnum;
-import com.nb.web.api.enums.DeviceStatusEnum;
-import com.nb.web.api.enums.DeviceTypeEnum;
-import com.nb.web.api.enums.FlowStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-service/app-doctor/pom.xml

@@ -13,6 +13,11 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>web-service-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>app-doctor-api</artifactId>

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/AppDoctorMonitorController.java

@@ -0,0 +1,44 @@
+package com.nb.app.doctor.controller;
+
+import cn.hutool.json.JSONUtil;
+import com.nb.core.result.R;
+import com.nb.web.api.feign.IPatientClient;
+import com.nb.web.api.feign.query.PatientMonitorQuery;
+import com.nb.web.api.feign.result.PatientMonitorDetailResult;
+import com.nb.web.api.feign.result.PatientMonitorResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AppDoctorUserController.java
+ * @Description TODO
+ * @createTime 2022年08月09日 21:37:00
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app/monitor")
+@Api(tags = "输注监护")
+@Slf4j
+public class AppDoctorMonitorController {
+    private final IPatientClient patientClient;
+
+    @PostMapping("/no_page")
+    @ApiOperation(value = "输注监控列表")
+    public R<List<PatientMonitorResult>> selectPage(@RequestBody PatientMonitorQuery query) {
+        log.info("医生查看输注监控列表,【{}】", JSONUtil.toJsonStr(query));
+        return R.success(patientClient.selectAll(query));
+    }
+
+    @PostMapping("/{patientId}")
+    @ApiOperation(value = "查看病人当前监控详情")
+    public R<PatientMonitorDetailResult> monitor(@PathVariable("patientId") String patientId) {
+        return R.success(patientClient.lookPatientDetail(patientId));
+    }
+}

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/AppDoctorUserController.java

@@ -1,23 +0,0 @@
-package com.nb.app.doctor.controller;
-
-import com.nb.app.doctor.service.LocalAppDoctorUserService;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName AppDoctorUserController.java
- * @Description TODO
- * @createTime 2022年08月09日 21:37:00
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/app/doctor/user")
-@Api(tags = "app医生用户管理")
-public class AppDoctorUserController{
-    private final LocalAppDoctorUserService appDoctorUserService;
-
-}

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusAlarmController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.service.bus.controller.vo.CauseVo;
 import com.nb.web.service.bus.service.dto.AlarmQuery;
-import com.nb.web.service.bus.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
 import com.nb.web.service.bus.service.LocalBusDeviceAlarmService;
 import com.nb.common.crud.BaseService;
 import com.nb.common.crud.controller.BaseCrudController;

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusAppDoctorUserController.java

@@ -1,14 +1,24 @@
 package com.nb.web.service.bus.controller;
 
+import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpLogic;
+import cn.hutool.core.text.CharSequenceUtil;
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.app.doctor.api.entity.AppDoctorUserEntity;
 import com.nb.app.doctor.api.feign.IAppDoctorUserClient;
 import com.nb.auth.utils.SecurityUtil;
+import com.nb.common.crud.BaseService;
+import com.nb.common.crud.controller.BaseDeleteController;
 import com.nb.core.annotation.Log;
+import com.nb.core.entity.QueryParamEntity;
 import com.nb.core.exception.CustomException;
 import com.nb.core.result.R;
 import com.nb.web.service.system.common.dto.SysUserResetPwdDTO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -29,6 +39,14 @@ public class BusAppDoctorUserController {
     @Autowired
     private IAppDoctorUserClient appDoctorUserClient;
 
+
+    @PostMapping("/page")
+    @SaCheckPermission("bus:doctor:query")
+    @ApiOperation(value = "使用POST方式分页动态查询,权限 【bus:doctor:query】")
+    public R<IPage<AppDoctorUserEntity>> page(@RequestBody QueryParamEntity<AppDoctorUserEntity> query) {
+        return R.success(this.appDoctorUserClient.list(query));
+    }
+
     @PostMapping("/save")
     @SaCheckPermission("bus:doctor:save")
     @ApiOperation(value = "新增医院医生账户",notes = "权限【bus:doctor:save】")
@@ -36,6 +54,19 @@ public class BusAppDoctorUserController {
         return R.success(appDoctorUserClient.saveBatch(sources));
     }
 
+    @PostMapping("/remove")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "主键id",required = true)
+    })
+    @SaCheckPermission("bus:doctor:remove")
+    @ApiOperation(value = "根据ID删除 权限【bus:doctor:remove】")
+    public R delete(@RequestParam("id") String id) {
+        if(CharSequenceUtil.isNullOrUndefined(String.valueOf(id))){
+            return R.success();
+        }
+        return appDoctorUserClient
+                .removeById(id)? R.success():R.fail("删除失败");
+    }
 
     /**
      * 重置密码

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusClinicController.java

@@ -7,6 +7,9 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
 import com.nb.web.service.bus.controller.vo.ClinicEditVo;
 import com.nb.web.service.bus.controller.vo.VisitRecord;

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusDeviceHistoryController.java

@@ -5,8 +5,8 @@ import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.web.service.bus.entity.BusDeviceAlarmEntity;
-import com.nb.web.service.bus.entity.BusDeviceHistoryEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import com.nb.web.service.bus.service.LocalBusDeviceAlarmService;
 import com.nb.web.service.bus.service.LocalBusDeviceHistoryService;
 import com.nb.web.service.bus.service.dto.DeviceAlarmQuery;

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusInfusionHistoryController.java

@@ -5,7 +5,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpLogic;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;
 import com.nb.web.service.bus.service.dto.CombineQuery;
 import com.nb.web.service.bus.service.dto.CombineResult;

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusPatientController.java

@@ -5,19 +5,24 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusDeviceManualEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.api.entity.common.BusDeviceRunningEntity;
+import com.nb.web.api.feign.result.PatientMonitorDetailResult;
+import com.nb.web.api.feign.query.PatientMonitorQuery;
+import com.nb.web.api.feign.result.PatientMonitorResult;
 import com.nb.web.service.bus.controller.vo.GetPatientInfoVo;
 import com.nb.web.service.bus.controller.vo.MonitorDetailVo;
 import com.nb.web.service.bus.controller.vo.MonitorFinishedVo;
 import com.nb.web.service.bus.entity.*;
 import com.nb.web.api.enums.DeviceStatusEnum;
-import com.nb.web.service.bus.enums.PatientAlarmEnum;
+import com.nb.web.api.enums.PatientAlarmEnum;
 import com.nb.web.service.bus.service.*;
 import com.nb.web.service.bus.service.dto.*;
 import com.nb.web.service.bus.utils.WsPublishUtils;
@@ -267,25 +272,26 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
             if (StrUtil.isEmpty(vo.getPatientId())) {
                 throw new CustomException("病号id不能为空");
             }
-            String infusionId=vo.getInfusionId();
-            if(CharSequenceUtil.isAllBlank(infusionId)){
-                BusPatientEntity patient = patientService.getById(vo.getPatientId());
-                if(patient==null){
-                    throw new CustomException("该病号信息不存在,请刷新后重试");
-                }
-                clinic = clinicService.getById(patient.getClinicId());
-                infusionId=patient.getInfusionId();
-            }else {
-                clinic= clinicService.getById(vo.getClinicId());
-            }
-            BusInfusionHistoryEntity infusion =infusionService.getById(infusionId);
-            Optional.ofNullable(deviceService.getByDeviceId(infusion.getDeviceId()))
-                    .map(device-> {
-                        //填充泵别名
-                        infusion.setAlias(device.getAlias());
-                        return device;
-                    });
-            result.setInfusion(infusion);
+            return  R.success(patientService.lookPatientDetail(vo.getPatientId()));
+//            String infusionId=vo.getInfusionId();
+//            if(CharSequenceUtil.isAllBlank(infusionId)){
+//                BusPatientEntity patient = patientService.getById(vo.getPatientId());
+//                if(patient==null){
+//                    throw new CustomException("该病号信息不存在,请刷新后重试");
+//                }
+//                clinic = clinicService.getById(patient.getClinicId());
+//                infusionId=patient.getInfusionId();
+//            }else {
+//                clinic= clinicService.getById(vo.getClinicId());
+//            }
+//            BusInfusionHistoryEntity infusion =infusionService.getById(infusionId);
+//            Optional.ofNullable(deviceService.getByDeviceId(infusion.getDeviceId()))
+//                    .map(device-> {
+//                        填充泵别名
+//                        infusion.setAlias(device.getAlias());
+//                        return device;
+//                    });
+//            result.setInfusion(infusion);
         }else {
             String clinicId = vo.getClinicId();
             clinic = clinicService.getById(clinicId);
@@ -298,10 +304,7 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
         if(clinic==null){
             throw new CustomException("该临床信息不存在,请刷新后重试");
         }
-        if (Boolean.TRUE.equals(clinic.getMonitorType())) {
-            BusPatientEntity patient = patientService.getById(clinic.getPatientId());
-            clinic.setPatientCode(patient.getCode());
-        }
+
 
         result.setClinic(clinic);
         return R.success(result);

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/vo/ClinicEditVo.java

@@ -1,7 +1,7 @@
 package com.nb.web.service.bus.controller.vo;
 
-import com.nb.web.service.bus.entity.BusClinicEntity;
-import com.nb.web.service.bus.entity.BusDeviceManualEntity;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusDeviceManualEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/vo/MonitorFinishedVo.java

@@ -1,6 +1,6 @@
 package com.nb.web.service.bus.controller.vo;
 
-import com.nb.web.service.bus.service.dto.UndoDeviceConfig;
+import com.nb.web.api.bean.UndoDeviceConfig;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusFormulaEntity.java

@@ -3,7 +3,7 @@ package com.nb.web.service.bus.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.nb.web.service.bus.service.dto.FormulaDrugDetailDomain;
+import com.nb.web.api.bean.FormulaDrugDetailDomain;
 import com.nb.core.entity.TenantGenericEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusPatientEntity.java

@@ -2,7 +2,8 @@ package com.nb.web.service.bus.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.nb.web.service.bus.enums.PatientAlarmEnum;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.enums.PatientAlarmEnum;
 import com.nb.core.entity.TenantGenericEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/HospitalManager.java

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.api.bean.Script;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.*;
 import com.nb.web.service.bus.hospital.config.*;
 import com.nb.web.service.bus.hospital.config.bean.*;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/HospitalDeviceAutoUndoConfigHandler.java

@@ -7,7 +7,7 @@ import com.nb.web.api.entity.common.BusDeviceRunningEntity;
 import com.nb.web.api.enums.DeviceStatusEnum;
 import com.nb.web.service.bus.hospital.config.handler.HandlerConstant;
 import com.nb.web.service.bus.hospital.enums.ConfigHandlerEnums;
-import com.nb.web.service.bus.service.dto.UndoDeviceConfig;
+import com.nb.web.api.bean.UndoDeviceConfig;
 import com.nb.core.cache.ConfigStorage;
 import com.nb.core.Value;
 import com.nb.common.queue.delay.manager.DelayMessageManager;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/HospitalFinishMonitorConfigHandler.java

@@ -7,7 +7,7 @@ import com.nb.web.api.entity.common.BusDeviceRunningEntity;
 import com.nb.web.api.enums.DeviceStatusEnum;
 import com.nb.web.service.bus.hospital.config.handler.HandlerConstant;
 import com.nb.web.service.bus.hospital.enums.ConfigHandlerEnums;
-import com.nb.web.service.bus.service.dto.UndoDeviceConfig;
+import com.nb.web.api.bean.UndoDeviceConfig;
 import com.nb.core.cache.ConfigStorage;
 import com.nb.core.Value;
 import com.nb.common.queue.delay.manager.DelayMessageManager;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/handler/AnalPoorDisappearHandler.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.hospital.config.handler;
 
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.hospital.config.HospitalFunctionAnalConfigHandler;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;
 import com.nb.web.service.bus.utils.WsPublishUtils;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/handler/ClinicAutoFinishMonitorHandler.java

@@ -1,13 +1,13 @@
 package com.nb.web.service.bus.hospital.config.handler;
 
 import cn.hutool.json.JSONUtil;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
 import com.nb.web.service.bus.hospital.config.HospitalFinishMonitorConfigHandler;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;
 import com.nb.web.service.bus.service.LocalBusPatientService;
 import com.nb.web.service.bus.service.dto.ManualUndoConfig;
-import com.nb.web.service.bus.service.dto.UndoDeviceConfig;
+import com.nb.web.api.bean.UndoDeviceConfig;
 import com.nb.common.queue.delay.handler.DelayMessageHandler;
 import com.nb.common.queue.delay.message.DelayMessage;
 import lombok.AllArgsConstructor;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/handler/DeputyDeviceAutoUndoHandler.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.hospital.config.handler;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
 import com.nb.web.service.bus.hospital.config.HospitalDeviceAutoUndoConfigHandler;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/handler/NoSignalHandler.java

@@ -2,8 +2,8 @@ package com.nb.web.service.bus.hospital.config.handler;
 
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.nb.web.service.bus.entity.BusDeviceAlarmEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.api.enums.DeviceStatusEnum;
 import com.nb.web.service.bus.hospital.HospitalManagerRegister;
 import com.nb.web.service.bus.hospital.config.HospitalFunctionExtraConfigHandler;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/HisRequest.java

@@ -1,6 +1,6 @@
 package com.nb.web.service.bus.hospital.his;
 
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.core.result.R;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/HisScriptSession.java

@@ -8,6 +8,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.*;
 import com.nb.web.service.bus.listener.event.bean.HisEvent;
 import com.nb.web.service.bus.hospital.script.DefaultParse;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/HisStrategyHandler.java

@@ -1,6 +1,6 @@
 package com.nb.web.service.bus.hospital.his.strategy;
 
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import java.util.*;
 /**
  * @author lifang

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/all/EqualsStrategyHandler.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.hospital.his.strategy.all;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.service.LocalBusClinicService;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;
 import com.nb.web.service.bus.utils.WsPublishUtils;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/all/HisAllStrategyHandler.java

@@ -1,7 +1,7 @@
 package com.nb.web.service.bus.hospital.his.strategy.all;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.hospital.his.strategy.HisStrategyHandler;
 import java.util.*;
 /**

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/all/LessToMoreHisStrategyHandler.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.hospital.his.strategy.all;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.service.LocalBusClinicService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/all/MoreToLessHisStrategyHandler.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.hospital.his.strategy.all;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.service.LocalBusClinicService;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;
 import com.nb.web.service.bus.utils.WsPublishUtils;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/onlynew/DefaultHisNewStrategyHandler.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.hospital.his.strategy.onlynew;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.service.LocalBusClinicService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/part/DefaultHisPartStrategyHandler.java

@@ -3,7 +3,7 @@ package com.nb.web.service.bus.hospital.his.strategy.part;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.hospital.his.strategy.all.HisAllStrategyHandler;
 import com.nb.web.service.bus.hospital.his.strategy.onlynew.HisNewStrategyHandler;
 import com.nb.web.service.bus.service.LocalBusClinicService;

nb-service/web-service/src/main/java/com/nb/web/service/bus/job/DeviceFlowStatsJob.java

@@ -6,7 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nb.web.api.entity.BusHospitalLogEntity;
 import com.nb.web.api.enums.HospitalLogEnum;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.service.LocalBusHospitalLogService;
 import com.nb.common.config.notice.msg.DeviceMsg;
 import com.nb.common.config.notice.wechat.EnterpriseWeChatNotify;

nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/DeviceInfoListener.java

@@ -7,13 +7,16 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.*;
 import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.api.entity.common.BusDeviceRunningEntity;
 import com.nb.web.api.enums.DeviceStatusEnum;
 import com.nb.web.api.enums.DeviceTypeEnum;
 import com.nb.web.api.enums.FlowStatusEnum;
-import com.nb.web.service.bus.enums.PatientAlarmEnum;
+import com.nb.web.api.enums.PatientAlarmEnum;
 import com.nb.web.service.bus.hospital.HospitalManagerRegister;
 import com.nb.web.service.bus.registry.device.DeviceOperator;
 import com.nb.web.service.bus.registry.device.DeviceRegistry;

nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/HisInfoListener.java

@@ -3,7 +3,7 @@ package com.nb.web.service.bus.listener;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.BusHospitalEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
 import com.nb.web.service.bus.hospital.his.strategy.HisStrategyHandler;

nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/event/bean/HisEvent.java

@@ -1,6 +1,6 @@
 package com.nb.web.service.bus.listener.event.bean;
 
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 import java.util.*;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusClinicMapper.java

@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import java.util.*;
 
 import com.nb.web.service.bus.service.dto.ClinicQuery;
 import com.nb.web.service.bus.service.dto.ClinicResult;
 import com.nb.web.service.bus.service.dto.ClinicStatsQueryResult;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusDeviceAlarmMapper.java

@@ -3,7 +3,7 @@ package com.nb.web.service.bus.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.web.service.bus.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
 import com.nb.web.service.bus.service.dto.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusDeviceHistoryMapper.java

@@ -3,7 +3,7 @@ package com.nb.web.service.bus.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.web.service.bus.entity.BusDeviceHistoryEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import com.nb.web.service.bus.service.dto.DeviceHistoryQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusDeviceManualMapper.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.web.service.bus.entity.BusDeviceManualEntity;
+import com.nb.web.api.entity.BusDeviceManualEntity;
 import com.nb.web.service.bus.service.dto.ManualMonitorQuery;
 import com.nb.web.service.bus.service.dto.ManualMonitorResult;
 import org.apache.ibatis.annotations.Mapper;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusInfusionHistoryMapper.java

@@ -3,7 +3,7 @@ package com.nb.web.service.bus.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.service.dto.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusPatientMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.service.bus.entity.BusPatientEntity;
 import com.nb.web.service.bus.entity.PatientDeviceRepeatDomain;
-import com.nb.web.service.bus.service.dto.PatientMonitorResult;
+import com.nb.web.api.feign.result.PatientMonitorResult;
 import com.nb.web.service.bus.service.dto.PatientDeviceNoneResult;
-import com.nb.web.service.bus.service.dto.PatientMonitorQuery;
+import com.nb.web.api.feign.query.PatientMonitorQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/registry/device/ClusterDeviceOperator.java

@@ -4,7 +4,7 @@ package com.nb.web.service.bus.registry.device;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.nb.web.api.entity.BusDeviceEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusInfusionModifyEntity;
 import com.nb.web.api.enums.DeviceTypeEnum;
 import com.nb.web.api.enums.FlowStatusEnum;

nb-service/web-service/src/main/java/com/nb/web/service/bus/registry/patient/ClusterPatientOperator.java

@@ -2,7 +2,7 @@ package com.nb.web.service.bus.registry.patient;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
 import com.nb.web.service.bus.registry.constant.DeviceKeyConstant;
 import com.nb.web.service.bus.registry.constant.PatientKeyConstant;

nb-service/web-service/src/main/java/com/nb/web/service/bus/registry/patient/ClusterPatientRegistry.java

@@ -3,8 +3,8 @@ package com.nb.web.service.bus.registry.patient;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.nb.web.service.bus.entity.BusClinicEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
 import com.nb.web.service.bus.registry.RegistryConstant;
 import com.nb.web.service.bus.service.LocalBusClinicService;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusClinicService.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
-import com.nb.web.service.bus.entity.BusClinicEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
 import com.nb.web.service.bus.mapper.BusClinicMapper;
 import com.nb.web.service.bus.registry.patient.PatientOperator;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceAlarmService.java

@@ -6,9 +6,10 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.web.service.bus.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.feign.IDeviceAlarmClient;
 import com.nb.web.service.bus.entity.BusHospitalEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.api.enums.DeviceAlarmEnum;
 import com.nb.web.api.enums.FlowStatusEnum;
 import com.nb.web.service.bus.mapper.BusDeviceAlarmMapper;
@@ -36,7 +37,7 @@ import java.util.Map;
 @Service
 @Slf4j
 @AllArgsConstructor
-public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper, BusDeviceAlarmEntity,String> {
+public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper, BusDeviceAlarmEntity,String> implements IDeviceAlarmClient {
 
     @Autowired
     @Lazy

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceHistoryService.java

@@ -1,7 +1,7 @@
 package com.nb.web.service.bus.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.web.service.bus.entity.BusDeviceHistoryEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import com.nb.web.service.bus.mapper.BusDeviceHistoryMapper;
 import com.nb.web.service.bus.service.dto.DeviceHistoryQuery;
 import com.nb.common.crud.BaseService;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceManualService.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.service.bus.controller.vo.MonitorFinishedVo;
-import com.nb.web.service.bus.entity.BusClinicEntity;
-import com.nb.web.service.bus.entity.BusDeviceManualEntity;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusDeviceManualEntity;
 import com.nb.web.service.bus.mapper.BusDeviceManualMapper;
 import com.nb.web.service.bus.service.dto.*;
 import com.nb.common.crud.BaseService;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusEvaluationService.java

@@ -4,7 +4,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.BusEvaluationEntity;
 import com.nb.web.service.bus.mapper.BusEvaluationMapper;
 import com.nb.web.service.bus.service.dto.EvalQuery;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusInfusionHistoryService.java

@@ -7,8 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nb.web.api.bean.UndoDeviceConfig;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.*;
-import com.nb.web.service.bus.enums.PatientAlarmEnum;
+import com.nb.web.api.enums.PatientAlarmEnum;
 import com.nb.web.service.bus.mapper.BusInfusionHistoryMapper;
 import com.nb.web.service.bus.registry.device.DeviceOperator;
 import com.nb.web.service.bus.registry.device.DeviceRegistry;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusPatientService.java

@@ -9,10 +9,16 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.feign.IPatientClient;
+import com.nb.web.api.feign.result.PatientMonitorDetailResult;
+import com.nb.web.api.feign.query.PatientMonitorQuery;
+import com.nb.web.api.feign.result.PatientMonitorResult;
 import com.nb.web.service.bus.entity.*;
 import com.nb.web.api.enums.DeviceAlarmEnum;
 import com.nb.web.api.enums.DeviceStatusEnum;
-import com.nb.web.service.bus.enums.PatientAlarmEnum;
+import com.nb.web.api.enums.PatientAlarmEnum;
 import com.nb.web.service.bus.hospital.HospitalManager;
 import com.nb.web.service.bus.hospital.HospitalManagerRegister;
 import com.nb.web.service.bus.hospital.config.HospitalDeviceAutoUndoConfigHandler;
@@ -51,7 +57,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Service
 @Slf4j
-public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPatientEntity,String> {
+public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPatientEntity,String> implements IPatientClient {
     @Autowired
     @Lazy
     private LocalBusClinicService clinicService;
@@ -79,6 +85,13 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
     @Lazy
     private LocalBusHospitalService hospitalService;
 
+    @Autowired
+    @Lazy
+    private LocalBusInfusionHistoryService infusionService;
+
+    @Autowired
+    @Lazy
+    private LocalBusDeviceService deviceService;
 
     private ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
 
@@ -197,6 +210,7 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         return this.baseMapper.selectNoneDevice();
     }
 
+    @Override
     public List<PatientMonitorResult> selectAll(PatientMonitorQuery query) {
         Page<PatientMonitorResult> page = new Page<>(0, 500, false);
         IPage<PatientMonitorResult> result = this.baseMapper.selectMonitor(page, query);
@@ -446,4 +460,31 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         return this.getOne(new QueryWrapper<BusPatientEntity>().lambda().eq(BusPatientEntity::getOriginCode, patientCode)
                 .eq(StrUtil.isNotBlank(tenantId), BusPatientEntity::getTenantId, tenantId));
     }
+
+    @Override
+    public PatientMonitorDetailResult lookPatientDetail(String patientId){
+        PatientMonitorDetailResult result = new PatientMonitorDetailResult();
+        BusPatientEntity patient = patientService.getById(patientId);
+        if(patient==null){
+            throw new CustomException("该住院号信息不存在,请刷新后重试");
+        }
+
+        BusClinicEntity clinic = clinicService.getById(patient.getClinicId());
+        String infusionId=patient.getInfusionId();
+
+        BusInfusionHistoryEntity infusion =infusionService.getById(infusionId);
+
+        Optional.ofNullable(deviceService.getByDeviceId(infusion.getDeviceId()))
+                .map(device-> {
+                    //填充泵别名
+                    infusion.setAlias(device.getAlias());
+                    return device;
+                });
+
+        clinic.setPatientCode(patient.getCode());
+
+        result.setInfusion(infusion);
+        result.setClinic(clinic);
+        return result;
+    }
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/constant/LocalBusConDoctorService.java

@@ -5,7 +5,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.BusConDoctor;
 import com.nb.web.service.bus.enums.ConstantEnum;
 import com.nb.web.service.bus.mapper.BusConDoctorMapper;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/constant/LocalBusConMixService.java

@@ -5,21 +5,16 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.BusConMixEntity;
 import com.nb.web.service.bus.enums.ConstantEnum;
 import com.nb.web.service.bus.enums.ConstantMixEnum;
 import com.nb.web.service.bus.mapper.BusConMixMapper;
-import com.nb.common.config.utils.RedissonUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RMap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author lifang

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/AlarmQuery.java

@@ -1,7 +1,7 @@
 package com.nb.web.service.bus.service.dto;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.web.service.bus.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalClinicRecord.java

@@ -1,6 +1,7 @@
 package com.nb.web.service.bus.service.dto;
 
-import com.nb.web.service.bus.entity.BusClinicEntity;
+import com.nb.web.api.bean.FormulaDrugDomain;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalInfusionRecord.java

@@ -1,7 +1,7 @@
 package com.nb.web.service.bus.service.dto;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.api.entity.common.DeviceProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalRecordResult.java

@@ -1,9 +1,9 @@
 package com.nb.web.service.bus.service.dto;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.nb.web.service.bus.entity.BusDeviceHistoryEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import com.nb.web.service.bus.entity.BusEvaluationEntity;
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import com.nb.web.service.bus.entity.BusInfusionModifyEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicResult.java

@@ -1,6 +1,6 @@
 package com.nb.web.service.bus.service.dto;
 
-import com.nb.web.service.bus.enums.PatientAlarmEnum;
+import com.nb.web.api.enums.PatientAlarmEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/CombineQuery.java

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.service.bus.enums.StatsTimeUnit;
-import com.nb.web.service.bus.enums.WarnEnum;
+import com.nb.web.api.enums.WarnEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nb.core.enums.SexEnum;
 import com.nb.web.api.enums.DeviceTypeEnum;
@@ -122,7 +122,7 @@ public class CombineQuery {
     private Integer isUndo;
     /**
      * 根据此提醒进行解析
-     * @see  com.nb.web.service.bus.enums.WarnEnum
+     * @see  WarnEnum
      */
     @ApiModelProperty(value = "提醒【0、智能泵-正常; 1、智能泵-加档受限; 2、智能泵-流速已达上限; 3、智能泵-加档; 4、智能泵-减档; 5、智能泵-低输注状态; 6、输注即将结束;7、镇痛不足;8、低电量】 ")
     private List<WarnEnum> warns;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/CombineResult.java

@@ -1,5 +1,6 @@
 package com.nb.web.service.bus.service.dto;
 
+import com.nb.web.api.bean.FormulaDrugDomain;
 import com.nb.web.api.entity.common.CommonDeviceParam;
 import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/DeviceHistoryQuery.java

@@ -1,7 +1,7 @@
 package com.nb.web.service.bus.service.dto;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.web.service.bus.entity.BusDeviceHistoryEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/InfusionHistorySmallResult.java

@@ -1,6 +1,6 @@
 package com.nb.web.service.bus.service.dto;
 
-import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;
+import com.nb.web.api.entity.BusInfusionHistoryEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ManualMonitorQuery.java

@@ -1,5 +1,6 @@
 package com.nb.web.service.bus.service.dto;
 
+import com.nb.web.api.enums.DeviceManualEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +21,7 @@ public class ManualMonitorQuery {
     private String blurry;
 
     /**
-     * @see  com.nb.web.service.bus.enums.DeviceManualEnum
+     * @see  DeviceManualEnum
      */
     @ApiModelProperty("设备类型；-1、无设备；0、机械泵；1、电子脉冲泵；2、电子泵；3、其他泵")
     private List<Integer> types;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ManualMonitorResult.java

@@ -1,6 +1,6 @@
 package com.nb.web.service.bus.service.dto;
 
-import com.nb.web.service.bus.enums.DeviceManualEnum;
+import com.nb.web.api.enums.DeviceManualEnum;
 import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ManualUndoConfig.java

@@ -2,6 +2,7 @@ package com.nb.web.service.bus.service.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nb.web.api.bean.UndoDeviceConfig;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

nb-service/web-service/src/main/java/com/nb/web/service/bus/utils/WsPublishUtils.java

@@ -3,10 +3,10 @@ package com.nb.web.service.bus.utils;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.nb.web.service.bus.enums.PatientAlarmEnum;
+import com.nb.web.api.enums.PatientAlarmEnum;
 import com.nb.web.service.bus.service.LocalBusPatientService;
 import com.nb.web.service.bus.service.dto.MonitorStatusStatsCountResult;
-import com.nb.web.service.bus.service.dto.PatientMonitorResult;
+import com.nb.web.api.feign.result.PatientMonitorResult;
 import com.nb.common.websocket.TopicMessage;
 import com.nb.common.websocket.WebSocketConstant;
 import com.nb.common.config.utils.RedissonUtil;

nb-service/web-service/src/main/resources/mapper/bus/BusDeviceAlarmMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nb.web.service.bus.mapper.BusDeviceAlarmMapper">
 
-    <select id="pageQuery" parameterType="com.nb.web.service.bus.service.dto.AlarmQuery" resultType="com.nb.web.service.bus.entity.BusDeviceAlarmEntity">
+    <select id="pageQuery" parameterType="com.nb.web.service.bus.service.dto.AlarmQuery" resultType="com.nb.web.api.entity.BusDeviceAlarmEntity">
         select a.* from
         (select * from bus_device_alarm
         <where>
@@ -89,7 +89,7 @@
         da.alarm_state
     </select>
 
-    <select id="selectDeviceCount" parameterType="com.nb.web.service.bus.entity.BusDeviceAlarmEntity" resultType="com.nb.web.service.bus.service.dto.DeviceCountResult">
+    <select id="selectDeviceCount" parameterType="com.nb.web.api.entity.BusDeviceAlarmEntity" resultType="com.nb.web.service.bus.service.dto.DeviceCountResult">
         SELECT
         da.device_id,
         COUNT(1) as alarm_count ,

nb-service/web-service/src/main/resources/mapper/bus/BusDeviceHistoryMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.nb.web.service.bus.mapper.BusDeviceHistoryMapper">
 
 
-    <select id="pageQuery" parameterType="com.nb.web.service.bus.service.dto.DeviceHistoryQuery" resultType="com.nb.web.service.bus.entity.BusDeviceHistoryEntity">
+    <select id="pageQuery" parameterType="com.nb.web.service.bus.service.dto.DeviceHistoryQuery" resultType="com.nb.web.api.entity.BusDeviceHistoryEntity">
         select h.* from
          bus_device_history  as h
         join (select * from bus_infusion_history

nb-service/web-service/src/main/resources/mapper/bus/BusInfusionHistoryMapper.xml

@@ -135,7 +135,7 @@
 
 
 
-    <select id="currentInClinic" resultType="com.nb.web.service.bus.entity.BusInfusionHistoryEntity">
+    <select id="currentInClinic" resultType="com.nb.web.api.entity.BusInfusionHistoryEntity">
         select d.alias,i.* from
             (select * from bus_infusion_history where clinic_id=#{clinicId} ORDER BY start_time desc limit 1) as i
             left join bus_device  as d on d.device_id=i.device_id

nb-service/web-service/src/main/resources/mapper/bus/BusPatientMapper.xml

@@ -21,7 +21,7 @@
         <result column="master_infusion_id" property="masterInfusionId"/>
     </resultMap>
 
-    <resultMap id="monitorResult" type="com.nb.web.service.bus.service.dto.PatientMonitorResult">
+    <resultMap id="monitorResult" type="com.nb.web.api.feign.result.PatientMonitorResult">
         <result column="patient_name" property="patientName"/>
         <result column="patient_code" property="patientCode"/>
         <result column="patient_age" property="patientAge"/>
@@ -153,7 +153,7 @@
             order by c.monitor_start_time desc;
         </select>
 
-    <select id="selectMonitor" resultMap="monitorResult" parameterType="com.nb.web.service.bus.service.dto.PatientMonitorQuery">
+    <select id="selectMonitor" resultMap="monitorResult" parameterType="com.nb.web.api.feign.query.PatientMonitorQuery">
         select
         p.id as patient_id,
         p.`code` as patient_code,