add

平板技改项目

nb-admin/src/main/resources/db/migration/V2__init_20240830.sql

@@ -0,0 +1 @@
+ALTER TABLE bus_evaluation ADD COLUMN remark varchar(2048) DEFAULT NULL COMMENT '备注';

nb-admin/src/main/resources/db/migration/V3__init_20241220.sql

@@ -0,0 +1,17 @@
+ALTER TABLE bus_device_history ADD COLUMN block1 int(255) DEFAULT NULL COMMENT '运行时电机压力值';
+ALTER TABLE bus_device_history ADD COLUMN block2 int(255) DEFAULT NULL COMMENT '非运行时电机压力值';
+ALTER TABLE bus_device_history ADD COLUMN block_status varchar(255) DEFAULT NULL COMMENT '堵塞状态';
+ALTER TABLE bus_device_history ADD COLUMN evening_time1 int(255) DEFAULT NULL COMMENT '夜间减档开始时间';
+ALTER TABLE bus_device_history ADD COLUMN evening_time2 int(255) DEFAULT NULL COMMENT '夜间减档结束时间';
+ALTER TABLE bus_device_history ADD COLUMN night_ratio int(255) DEFAULT NULL COMMENT '夜间减档比例';
+ALTER TABLE bus_device_history ADD COLUMN reset_params int(255) DEFAULT NULL COMMENT '是否重设参数';
+
+ALTER TABLE bus_infusion_history ADD COLUMN block1 int(255) DEFAULT NULL COMMENT '运行时电机压力值';
+ALTER TABLE bus_infusion_history ADD COLUMN block2 int(255) DEFAULT NULL COMMENT '非运行时电机压力值';
+ALTER TABLE bus_infusion_history ADD COLUMN block_status varchar(255) DEFAULT NULL COMMENT '堵塞状态';
+ALTER TABLE bus_infusion_history ADD COLUMN evening_time1 int(255) DEFAULT NULL COMMENT '夜间减档开始时间';
+ALTER TABLE bus_infusion_history ADD COLUMN evening_time2 int(255) DEFAULT NULL COMMENT '夜间减档结束时间';
+ALTER TABLE bus_infusion_history ADD COLUMN night_ratio int(255) DEFAULT NULL COMMENT '夜间减档比例';
+ALTER TABLE bus_infusion_history ADD COLUMN reset_params int(255) DEFAULT NULL COMMENT '是否重设参数';
+
+ALTER TABLE sys_user ADD COLUMN psw_need_reset tinyint(1) DEFAULT NULL COMMENT '是否需要修改密码';

nb-service-api/web-service-api/src/main/java/com/nb/web/api/dto/BusPatientAbnormalMarkDTO.java

@@ -17,7 +17,7 @@ public class BusPatientAbnormalMarkDTO {
     @NotBlank(message = "临床id不能为空")
     private String clinicId;
     @ApiModelProperty("是否异常 0、正常 1、异常")
-    private String abnormal;
+    private Boolean abnormal;
     @ApiModelProperty("异常情况备注")
-    private String remark;
+    private String abnormalRemark;
 }

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

@@ -81,9 +81,6 @@ public class PatientMonitorController {
     @Autowired
     private WsPublishUtils wsPublishUtils;
 
-    @Autowired
-    private LocalBusDeviceManualService manualService;
-
     @Autowired
     private LocalBusInfusionHistoryService infusionService;
 
@@ -202,7 +199,6 @@ public class PatientMonitorController {
     @ApiOperation(value = "从his或数据库中拉取数据病人数据")
     public R<BusClinicEntity> syn(@RequestAttribute("tenantId") @ApiParam(hidden = true) String tenantId, @Validated @RequestBody GetPatientInfoVo vo) {
         return R.success(patientClient.lookClinic(tenantId, vo.getPatientCode()));
-//        return  patientClient.getPatientInfoFromHis(tenantId, vo.getPatientCode(), vo.getTimeout(), false, true);
     }
 
     @PostMapping("/list/assist/{patientId}")
@@ -329,5 +325,4 @@ public class PatientMonitorController {
         return R.success(patientClient.editAbnormalMark(source));
     }
 
-
 }

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

@@ -801,6 +801,16 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
 
     @Override
     public boolean editAbnormalMark(BusPatientAbnormalMarkDTO query) {
-        return true;
+        BusClinicEntity clinic = clinicMapper.selectById(query.getClinicId());
+        if(ObjectUtil.isNull(clinic)){
+            throw new CustomException("临床信息不存在");
+        }
+        clinic.setAbnormal(query.getAbnormal());
+        if(Boolean.FALSE.equals(query.getAbnormal())){
+            clinic.setAbnormalReason(null);
+        }else {
+            clinic.setAbnormalReason(query.getAbnormalRemark());
+        }
+        return clinicMapper.updateById(clinic)!=0;
     }
 }

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

@@ -613,7 +613,7 @@
             </if>
             <!--todo-->
             <if test="query.abnormal != null">
-                AND c.patient_abnormal = #{query.abnormal}  <!-- 假设患者异常字段为 patient_abnormal -->
+                AND c.abnormal = #{query.abnormal}
             </if>
             <!-- 临床与病区条件 -->
             <if test="query.wards != null and query.wards.size > 0">