add

输注列表新增输注标识

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

@@ -114,7 +114,9 @@ public class BusLiquidController {
             excelVO.setClinicStartTime(DateUtil.format(record.getClinicStartTime(), "yyyy/MM/dd HH:mm"));
             excelVO.setUndoTime(DateUtil.format(record.getUndoTime(),"yyyy/MM/dd HH:mm"));
             excelVO.setName(formulaDrugDetailDomain.getName());
-            excelVO.setDose(formulaDrugDetailDomain.getDose()+formulaDrugDetailDomain.getUnit());
+            if(StrUtil.isNotEmpty(formulaDrugDetailDomain.getDose())){
+                excelVO.setDose(formulaDrugDetailDomain.getDose()+formulaDrugDetailDomain.getUnit());
+            }
             //根据药液剩余量计算药品残余量
             if(StrUtil.isEmpty(formulaDrugDetailDomain.getDose())|| !NumberUtil.isNumber(formulaDrugDetailDomain.getDose()) ||ObjectUtil.equals(record.getRemainDose(), BigDecimal.ZERO)){
                 excelVO.setDrugRemainDose("0"+formulaDrugDetailDomain.getUnit());

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

@@ -366,6 +366,7 @@
         c.liquid_executor as liquid_executor,
         c.liquid_checker as liquid_checker,
         c.liquid_remark as liquid_remark,
+        c.liquid_method as liquid_method,
         c.liquid_time as liquid_time
         from bus_clinic as c
         left join bus_patient as p on c.patient_id = p.id