add

废液管理
修改异常标识

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

@@ -0,0 +1,11 @@
+ALTER TABLE bus_clinic ADD COLUMN manual_bedno VARCHAR(255) COMMENT '手动编辑的床号信息';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_method  VARCHAR(255) COMMENT '废液处置方式';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_executor text COMMENT '废液收集执行人';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_checker text COMMENT '废液收集核对人';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_remark text COMMENT '废液收集备注';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_time  datetime(3) COMMENT '废液收集时间';

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

@@ -30,6 +30,9 @@ public class FormulaDrugDetailDomain {
     @ApiModelProperty("用法")
     private String use;
 
+    @ApiModelProperty("安瓿")
+    private String ampoule;
+
     @ApiModelProperty("药品残余量")
     private String remainDose;
 

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

@@ -124,6 +124,7 @@ public class BusLiquidController {
                 BigDecimal multiply = totalDose.multiply(divide);
                 excelVO.setDrugRemainDose(multiply+formulaDrugDetailDomain.getUnit());
             }
+            excelVO.setAmpoule(formulaDrugDetailDomain.getAmpoule());
             excelVO.setBatchCode(formulaDrugDetailDomain.getBatchCode());
             excelVO.setUse(formulaDrugDetailDomain.getUse());
             excelVO.setTotalDose(record.getTotalDose()+"ml");

nb-service/web-service/src/main/java/com/nb/web/service/bus/excel/LiquidExcelMergeWriteHandler.java

@@ -33,13 +33,13 @@ public class LiquidExcelMergeWriteHandler implements RowWriteHandler {
         add(6);  // 泵别名 (deviceAlias) - order = 6
         add(7);  // 用泵时间 (clinicStartTime) - order = 7
         add(8);  // 撤泵时间 (undoTime) - order = 8
-        add(14); // 总量 (totalDose) - order = 14
-        add(15); // 剩余量 (remainDose) - order = 15
-        add(16); // 废液执行人 (liquidExecutor) - order = 16
+        add(15); // 总量 (totalDose) - order = 14
+        add(16); // 剩余量 (remainDose) - order = 15
         add(17); // 废液检查人 (liquidChecker) - order = 17
         add(18); // 废液核对备注 (liquidRemark) - order = 18
         add(19); // 废液核对时间 (liquidTime) - order = 19
         add(20); // 废液核对时间 (liquidTime) - order = 19
+        add(21); // 废液执行人 (liquidExecutor) - order = 16
     }};
 
     private List<BusLiquidExcelVO> source;

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

@@ -86,35 +86,39 @@ public class BusLiquidExcelVO implements Serializable {
     @ExcelProperty(value = "批号", order = 12)
     private String batchCode;
 
+    @ApiModelProperty("安瓿")
+    @ExcelProperty(value = "安瓿", order = 13)
+    private String ampoule;
+
     @ApiModelProperty("用法")
-    @ExcelProperty(value = "用法", order = 13)
+    @ExcelProperty(value = "用法", order = 14)
     private String use;
 
     @ApiModelProperty(value = "总量")
-    @ExcelProperty(value = "总量", order = 14)
+    @ExcelProperty(value = "总量", order = 15)
     private String totalDose;
 
     @ApiModelProperty(value = "剩余量")
-    @ExcelProperty(value = "剩余量", order = 15)
+    @ExcelProperty(value = "剩余量", order = 16)
     private String remainDose;
 
     @ApiModelProperty(value = "废液执行人")
-    @ExcelProperty(value = "废液执行人", order = 16)
+    @ExcelProperty(value = "废液执行人", order = 17)
     private String liquidExecutor;
 
     @ApiModelProperty(value = "废液检查人")
-    @ExcelProperty(value = "废液检查人", order = 17)
+    @ExcelProperty(value = "废液检查人", order = 18)
     private String liquidChecker;
 
     @ApiModelProperty(value = "废液处理方式")
-    @ExcelProperty(value = "废液处理方式", order = 18)
+    @ExcelProperty(value = "废液处理方式", order = 19)
     private String liquidMethod;
 
     @ApiModelProperty(value = "废液核对时间")
-    @ExcelProperty(value = "废液核对时间", order = 19)
+    @ExcelProperty(value = "废液核对时间", order = 20)
     private String liquidTime;
 
     @ApiModelProperty(value = "废液核对备注")
-    @ExcelProperty(value = "废液核对备注", order = 20)
+    @ExcelProperty(value = "废液核对备注", order = 21)
     private String liquidRemark;
 }