add

输注列表新增输注标识

nb-service/web-service/src/main/java/com/nb/web/service/bus/YiXinQian/YixinqianConfig.java

@@ -18,5 +18,5 @@ public class YixinqianConfig {
     /** 应用密钥 */
     private String appKey;
     /** AccessToken有效期（毫秒） */
-    private Long tokenExpire;
+    private Long tokenExpire=100L;
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/YiXinQian/YixinqianService.java

@@ -16,11 +16,11 @@ import java.util.Map;
 /**
  * 医信签核心服务（实现4.1.1获取Token、4.2.3查询用户信息）
  */
-@Service
+//@Service
 @RequiredArgsConstructor // 构造器注入配置类
 public class YixinqianService {
     // 注入医信签配置
-    private final YixinqianConfig yixinqianConfig;
+    private final YixinqianConfig yixinqianConfig=new YixinqianConfig();
 
     // 本地缓存：存储AccessToken（key=固定值，value=accessToken），有效期=配置的tokenExpire
     private final Cache<String, String> accessTokenCache = CacheUtil.newTimedCache(yixinqianConfig.getTokenExpire());

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());
@@ -124,7 +126,6 @@ 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");
@@ -132,6 +133,7 @@ public class BusLiquidController {
             excelVO.setLiquidExecutor(record.getLiquidExecutor());
             excelVO.setLiquidChecker(record.getLiquidChecker());
             excelVO.setLiquidRemark(record.getLiquidRemark());
+            excelVO.setLiquidMethod(record.getLiquidMethod());
             excelVO.setLiquidTime(DateUtil.formatDateTime(record.getLiquidTime()));
             result.add(excelVO);
         }

nb-service/web-service/src/main/java/com/nb/web/service/bus/enums/ConstantMixEnum.java

@@ -32,7 +32,9 @@ public enum ConstantMixEnum  implements IEnum<Integer> {
     @ApiModelProperty("药品分类")
     drugCate(5,"药品分类"),
     @ApiModelProperty("医嘱")
-    entrust(6,"医嘱");
+    entrust(6,"医嘱"),
+    @ApiModelProperty("废液处置")
+    liquid(7,"废液处置"),;
 
     private Integer value;
     private String text;

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

@@ -428,14 +428,10 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
                             if(StrUtil.isEmpty(drug.getDose())|| !NumberUtil.isNumber(drug.getDose()) ||ObjectUtil.equals(record.getRemainDose(), BigDecimal.ZERO)){
                                 drug.setRemainDose("0"+drug.getUnit());
                             }else {
-                                if(ObjectUtil.isNull(record.getRemainDose())||ObjectUtil.isNull(record.getTotalDose())){
-                                    drug.setRemainDose("0"+drug.getUnit());
-                                }else {
-                                    BigDecimal divide = record.getRemainDose().divide(record.getTotalDose(), 2, RoundingMode.CEILING);
-                                    BigDecimal totalDose = BigDecimal.valueOf(Double.valueOf(drug.getDose()));
-                                    BigDecimal multiply = totalDose.multiply(divide);
-                                    drug.setRemainDose(multiply+drug.getUnit());
-                                }
+                                BigDecimal divide = record.getRemainDose().divide(record.getTotalDose(), 2, RoundingMode.CEILING);
+                                BigDecimal totalDose = BigDecimal.valueOf(Double.valueOf(drug.getDose()));
+                                BigDecimal multiply = totalDose.multiply(divide);
+                                drug.setRemainDose(multiply+drug.getUnit());
                             }
                             drug.setDose(drug.getDose()+drug.getUnit());
                         }
@@ -456,7 +452,7 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
                 .set(BusClinicEntity::getLiquidExecutor,source.getLiquidExecutor())
                 .set(BusClinicEntity::getLiquidChecker,source.getLiquidChecker())
                 .set(BusClinicEntity::getLiquidTime,source.getLiquidTime())
-                .set(BusClinicEntity::getLiquidChecker,source.getLiquidMethod())
+                .set(BusClinicEntity::getLiquidMethod,source.getLiquidMethod())
                 .set(BusClinicEntity::getLiquidRemark,source.getLiquidRemark()));
     }
 

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

@@ -309,7 +309,7 @@
         join bus_patient as p on c.patient_id = p.id
         join bus_infusion_history as i on p.infusion_id = i.id
         <where>
-            c.finished = 1 and  i.undo_time is not null
+            c.finished = 1
             <if test="query.undoTime != null and query.undoTime.size ==1">
                 and undo_time &gt; #{query.undoTime[0]}
             </if>
@@ -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