项目录入新增获取麻醉药品费用的

src/main/java/thyyxxk/webserver/controller/TestController.java

@@ -2,6 +2,7 @@ package thyyxxk.webserver.controller;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.IService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -21,6 +22,7 @@ import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.dao.his.PublicDao;
+import thyyxxk.webserver.dao.his.dictionary.clinicalPathway.ClinicalPathwayDao;
 import thyyxxk.webserver.dao.his.xcTest.TestDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.dictionary.pathwayTemplates.dto.ClinicalPathwayTemplates;
@@ -45,11 +47,12 @@ import java.util.*;
 @RequestMapping("/test")
 @Slf4j
 @RequiredArgsConstructor
-public class TestController {
+public abstract class TestController {
     private final PublicDao dao;
     private final EmrUploadService emrUploadService;
     private final SiChargeLimitService siChargeLimitService;
     private final SocketV2 socketV2;
+    private final ClinicalPathwayDao cdao;
 
     @GetMapping("/test1")
     @PassToken
@@ -116,5 +119,21 @@ public class TestController {
         }
     }
 
+    @PassToken
+    @GetMapping("/test7")
+    public void test7() {
+        List<ClinicalPathwayTemplates> tmp = new ArrayList<>();
+        for (int i = 0; i < 4; i++) {
+            ClinicalPathwayTemplates build = ClinicalPathwayTemplates.builder()
+                    .id(SnowFlakeId.instance().nextId())
+                    .name("测试" + i)
+                    .deptCode("00000")
+                    .delFlag(true)
+                    .build();
+            tmp.add(build);
+        }
+        cdao.insert(tmp);
+    }
+
 }
 

src/main/java/thyyxxk/webserver/dao/his/inpatient/xmlr/XiangMuLuRuDao.java

@@ -295,10 +295,10 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "  , zy_serial_no, charge_code_mx, serial,ss_code,yb_self_flag,refer_physician,doctor_code,receipt_no)  " +
             "VALUES " +
             "<foreach collection='list' item='item' separator=','>" +
-            "(#{zyDetailCharge.inpatientNo}, #{zyDetailCharge.admissTimes}, #{ledgerSn}, #{item.detailSn}, '${chargeDate}'  " +
+            "(#{zyDetailCharge.inpatientNo}, #{zyDetailCharge.admissTimes}, #{ledgerSn}, #{item.detailSn}, #{zyDetailCharge.chargeDate}  " +
             "  , #{zyDetailCharge.opIdCode}, #{item.chargeCode}, #{infantFlag}, '2', cast(#{item.chargeAmount,jdbcType=DECIMAL} as decimal(14,5))  " +
             "  , '0', '0', NULL, #{zyDetailCharge.ward}, #{zyDetailCharge.dept}  " +
-            "  , #{item.orderNo}, '0', #{item.deptCode}, cast(#{item.amount,jdbcType=DECIMAL} as decimal(14,5)), '${chargeDate}'  " +
+            "  , #{item.orderNo}, '0', #{item.deptCode}, cast(#{item.amount,jdbcType=DECIMAL} as decimal(14,5)), getdate()  " +
             "  , #{zyDetailCharge.zySerialNo}, #{item.chargeCodeMx}, #{item.serial},#{zyDetailCharge.ssCode}" +
             "  ,#{item.ybSelfFlag} " +
             ",#{zyDetailCharge.referPhysician},null,#{receiptNo})" +

src/main/java/thyyxxk/webserver/service/inpatient/xmlr/XiangMuLuRuService.java

@@ -198,7 +198,6 @@ public class XiangMuLuRuService {
      */
     public PatientResult getHuanZheFeiYong(ZyDetailCharge param) {
         PatientResult patientResult = new PatientResult();
-
         Integer ledgerSn = publicServer.getLedgerSn(param.getInpatientNo(), param.getAdmissTimes());
         param.setLedgerSn(ledgerSn);
         param.setInfantFlag("0");
@@ -416,17 +415,8 @@ public class XiangMuLuRuService {
         if (dao.getHuanZheSFZaiYuan(param.getInpatientNo(), param.getAdmissTimes()) == 0) {
             errorStr.append("没有患者的在院信息 <br />");
         }
-
         if (publicServer.needRule(RuleId.财务.getId())) {
-            if (param.getChargeDate() == null) {
-                errorStr.append("请选择费用时间 <br />");
-            }
-            if (StrUtil.isBlank(param.getReceiptNo())) {
-                errorStr.append("请输入发票号 <br />");
-            }
             param.setOrderNo(new BigDecimal(6));
-        } else {
-            param.setChargeDate(new Date());
         }
 
         if (errorStr.length() > 0) {
@@ -460,6 +450,7 @@ public class XiangMuLuRuService {
         if (settlementFlag == null || settlementFlag != 0) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "该患者已经结算了");
         }
+        Date now = new Date();
         // 药品
         for (ZyDetailCharge zyDetailCharge : param.getList()) {
             if (zyDetailCharge.getSerial().equals("00")) {
@@ -470,7 +461,12 @@ public class XiangMuLuRuService {
                     zyDetailCharge.setChargeCode(zyBillItem.getChargeCode());
                 }
             }
-
+            if (param.getChargeDate() != null) {
+                zyDetailCharge.setChargeDate(param.getChargeDate());
+            }
+            if (zyDetailCharge.getChargeDate() == null) {
+                zyDetailCharge.setChargeDate(now);
+            }
             if (zyDetailCharge.getChargeAmount() == null || zyDetailCharge.getAmount() == null) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "数量或金额不能为空。");
             }

src/main/java/thyyxxk/webserver/service/medicalinsurance/EmrUploadService.java

@@ -404,8 +404,8 @@ public class EmrUploadService {
 
     public Dscginfo getDscginfo(SimpleEmrPatientData data) {
         JSONObject obj = JSONUtil.parseObj(data.getEmrDataElement());
-        JSONObject ryzd = getFirstObjInArray(obj,"入院诊断.value" );
-        JSONObject cyzd = getFirstObjInArray(obj,"出院诊断.value" );
+        JSONObject ryzd = getFirstObjInArray(obj, "入院诊断.value");
+        JSONObject cyzd = getFirstObjInArray(obj, "出院诊断.value");
         Dscginfo dscginfo = new Dscginfo();
         dscginfo.setDscgDate(obj.getByPath("出院时间.value", String.class));
         dscginfo.setAdmDiagDscr(ryzd.getStr("showExtraDisplay"));

src/main/java/thyyxxk/webserver/service/settings/MenuSettingsService.java

@@ -15,7 +15,6 @@ import thyyxxk.webserver.entity.settings.IntergrationPlatformRoleMenu;
 import thyyxxk.webserver.service.hutoolcache.CacheEnums;
 import thyyxxk.webserver.service.hutoolcache.ExtraCache;
 import thyyxxk.webserver.service.hutoolcache.UserCache;
-import thyyxxk.webserver.utils.ListUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 import thyyxxk.webserver.utils.TreeUtil;
@@ -106,11 +105,6 @@ public class MenuSettingsService {
 
         Map<Integer, List<IntergrationPlatformRoleMenu>> roleMap = extraCache.getValue(CacheEnums.ROLE_MENU, () -> {
             List<IntergrationPlatformRoleMenu> list = dao.selectPlatformRoleMenu();
-
-//            if (ListUtil.isBlank(list)) {
-//                return null;
-//            }
-
             return list.stream()
                     .collect(Collectors.groupingBy(IntergrationPlatformRoleMenu::getRoleId));
         });