add

mqtt信息发送

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

@@ -111,7 +111,8 @@ public class BusLiquidController {
                 excelVO.setDeviceAlias(record.getDeviceId());
             }
             excelVO.setClinicStartTime(DateUtil.format(record.getClinicStartTime(), "yyyy/MM/dd HH:mm"));
-            excelVO.setUndoTime(DateUtil.format(record.getUndoTime(),"yyyy/MM/dd HH:mm"));
+//            excelVO.setUndoTime(DateUtil.format(record.getUndoTime(),"yyyy/MM/dd HH:mm"));
+            excelVO.setUndoTime("/");
             excelVO.setName(formulaDrugDetailDomain.getName());
             if(StrUtil.isNotEmpty(formulaDrugDetailDomain.getDose())){
                 excelVO.setDose(formulaDrugDetailDomain.getDose()+formulaDrugDetailDomain.getUnit());

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

@@ -128,7 +128,7 @@
         c.`patient_name` as name,
         c.patient_age as age,
         c.ward,
-        COALESCE(c.manual_bedno, c.bed_no) as bed_no,
+        COALESCE(NULLIF(c.manual_bedno, ''), c.bed_no) AS bed_no,
         c.id as clinic_id,
         c.`surgery_name` as clinic_name,
         i.device_id as device_id,
@@ -160,7 +160,7 @@
             c.`patient_name` as name,
             c.patient_age as age,
             c.ward as ward,
-            COALESCE(c.manual_bedno, c.bed_no) as bed_no,
+            COALESCE(NULLIF(c.manual_bedno,''), c.bed_no) as bed_no,
             c.`surgery_name` as surgery_name,
             c.weight as weight,
             c.height as height,
@@ -245,7 +245,7 @@
         c.surgery_doctor as surgery_doctor,
         c.surgery_name as surgery_name,
         c.ward as ward,
-        COALESCE(c.manual_bedno, c.bed_no) as bed_no,
+        COALESCE(NULLIF(c.manual_bedno,''), c.bed_no) as bed_no,
         c.eval_time as eval_time,
         c.manage_type as manage_type,
         c.abnormal as abnormal,
@@ -458,7 +458,7 @@
         c.surgery_doctor as surgery_doctor,
         c.surgery_name as surgery_name,
         c.ward as ward,
-        COALESCE(c.manual_bedno, c.bed_no) as bed_no,
+        COALESCE(NULLIF(c.manual_bedno,''), c.bed_no) as bed_no,
         c.eval_time as eval_time,
         bh.code as hospital_code
         from
@@ -571,7 +571,7 @@
         <!-- 临床信息 -->
         c.patient_name AS patient_name,
         c.ward AS ward,
-        COALESCE(i.bed_no, c.bed_no) as bed_no,
+        COALESCE(NULLIF(c.manual_bedno,''), c.bed_no) as bed_no,
         c.ana_doctor AS ana_doctor,
         c.surgery_name AS surge_name,
         c.ana_type AS ana_type,