优化

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>SiMzFeeOprnSystm</artifactId>
-    <version>1.0</version>
+    <version>1.5</version>
     <name>SiMzFeeOprnSystm</name>
     <description>SiMzFeeOprnSystm</description>
     <properties>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <scope>runtime</scope>
+            <version>8.2.2.jre8</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.jtds</groupId>

src/main/java/thyyxxk/simzfeeoprnsystm/dicts/MdtrtCertType.java

@@ -1,5 +1,6 @@
 package thyyxxk.simzfeeoprnsystm.dicts;
 
+import lombok.Getter;
 import thyyxxk.simzfeeoprnsystm.utils.StringUtil;
 
 /**
@@ -7,6 +8,7 @@ import thyyxxk.simzfeeoprnsystm.utils.StringUtil;
  * @author: DingJie
  * @create: 2021/7/129:17
  */
+@Getter
 public enum MdtrtCertType {
 
     ELECTRONIC_VOUCHER("01", "医保电子凭证", "qrcode"),
@@ -27,18 +29,6 @@ public enum MdtrtCertType {
         this.label = label;
     }
 
-    public String getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
     public static MdtrtCertType get(String code) {
         if (StringUtil.isBlank(code)) {
             return OTHER;

src/main/java/thyyxxk/simzfeeoprnsystm/dicts/ReadCardBizType.java

@@ -7,7 +7,8 @@ public enum ReadCardBizType {
     CONSULTATION("01201"),
     EXAMINATION("01203"),
     TREATMENT("01204"),
-    SETTLEMENT("01301");
+    SETTLEMENT("01301"),
+    NULL_VALUE("");
 
     private final String code;
 
@@ -21,13 +22,13 @@ public enum ReadCardBizType {
 
     public static ReadCardBizType get(String code) {
         if (StringUtil.isBlank(code)) {
-            return null;
+            return NULL_VALUE;
         }
         for (ReadCardBizType readCardBizType : ReadCardBizType.values()) {
             if (code.trim().equals(readCardBizType.getCode())) {
                 return readCardBizType;
             }
         }
-        return null;
+        return NULL_VALUE;
     }
 }

src/main/java/thyyxxk/simzfeeoprnsystm/service/SiMzFeeService.java

@@ -76,7 +76,7 @@ public class SiMzFeeService {
                 String[] out = p.getReadCardResult().split("\\|");
                 regstrtn.setMdtrtCertNo(out[2]);
                 regstrtn.setCardSn(out[3]);
-            } else if (mdtrtCertType == MdtrtCertType.ELECTRONIC_VOUCHER) {
+            } else if (mdtrtCertType.getCode().equals(MdtrtCertType.ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject qrinfo = JSONObject.parseObject(p.getReadCardResult());
                 regstrtn.setMdtrtCertNo(qrinfo.getString("ecToken"));
             }
@@ -335,7 +335,7 @@ public class SiMzFeeService {
                 String[] out = p.getReadCardResult().split("\\|");
                 mzPreSetlmt.setMdtrtCertNo(out[2]);
                 mzPreSetlmt.setCardSn(out[3]);
-            } else if (mdtrtCertType == MdtrtCertType.ELECTRONIC_VOUCHER) {
+            } else if (mdtrtCertType.getCode().equals(MdtrtCertType.ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject qrinfo = JSONObject.parseObject(p.getReadCardResult());
                 if (!p.getSocialNo().trim().equals(qrinfo.getString("idNo").trim())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "电子医保凭证身份证与HIS身份证不一致，请确认是否人证相符。");
@@ -432,11 +432,11 @@ public class SiMzFeeService {
         if (readCardBizType == ReadCardBizType.SETTLEMENT) {
             MdtrtCertType mdtrtCertType = MdtrtCertType.getByLabel(p.getMdtrtCertType());
             setlmt.setMdtrtCertType(mdtrtCertType.getCode());
-            if (mdtrtCertType == MdtrtCertType.SOCIAL_SECURITY_CARD) {
+            if (mdtrtCertType.getCode().equals(MdtrtCertType.SOCIAL_SECURITY_CARD.getCode())) {
                 String[] out = p.getReadCardResult().split("\\|");
                 setlmt.setMdtrtCertNo(out[2]);
                 setlmt.setCardSn(out[3]);
-            } else if (mdtrtCertType == MdtrtCertType.ELECTRONIC_VOUCHER) {
+            } else if (mdtrtCertType.getCode().equals(MdtrtCertType.ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject qrinfo = JSONObject.parseObject(p.getReadCardResult());
                 if (!p.getSocialNo().trim().equals(qrinfo.getString("idNo").trim())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "电子医保凭证身份证与HIS身份证不一致，请确认是否人证相符。");
@@ -505,6 +505,7 @@ public class SiMzFeeService {
     }
 
     public ResultVo<FundDetail> revokeOutpatientSettlement(MzPatientInfo p) {
+        log.info("请求撤销门诊医保结算：{}", JSONObject.toJSON(p));
         if (null == p.getTimes()) {
             p.setTimes(mzDao.selectMaxTimes(p.getPatNo()));
         }
@@ -623,7 +624,8 @@ public class SiMzFeeService {
             int update = mzDao.updateMzTimes(param.getPatientId(), param.getTimes());
             if (update == 0) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR,
-                        "不存在此患者第[" + param.getTimes() + "]次的就诊信息，请重新查询。");
+                        "[t_si_pat_info]不存在患者[" + param.getPatientId()
+                                + "]第[" + param.getTimes() + "]次的就诊信息，请重新查询。");
             }
         }
         mzDao.deleteTempPatinfo(param.getPatientId(), param.getTimes());
@@ -645,7 +647,7 @@ public class SiMzFeeService {
             mzptnt.setReadCardBizType(ReadCardBizType.REGISTRATION.getCode());
             mzptnt.setReadCardResult(param.getReadCardResult());
 
-            if (mdtrtCertType == MdtrtCertType.ELECTRONIC_VOUCHER) {
+            if (mdtrtCertType.getCode().equals(MdtrtCertType.ELECTRONIC_VOUCHER.getCode())) {
                 JSONObject obj = JSONObject.parseObject(param.getReadCardResult());
                 String admdvs = obj.getString("insuOrg");
                 if (StringUtil.isBlank(mzptnt.getInsuplcAdmdvs())) {
@@ -714,8 +716,9 @@ public class SiMzFeeService {
         }
         // 上传完成之后试算并返回试算结果
         mzptnt.setReadCardBizType(ReadCardBizType.SETTLEMENT.getCode());
-        mzptnt.setSavePreSettleResult(true);
-        return outpatientPreSettlement(mzptnt);
+//        mzptnt.setSavePreSettleResult(true);
+//        return outpatientPreSettlement(mzptnt);
+        return outpatientSettlement(mzptnt);
     }
 
     private ResultVo<String> mzChargeFee(String patientId, int times, String totalFee) {

src/main/resources/application.yml

@@ -13,7 +13,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: dev
+      primary: his
       strict: false
       datasource:
         his:
@@ -67,4 +67,4 @@ si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
 #si-access-key: Zgs5jfxaKb86XbCuUzLK9EhFjiQfHR1vydaPzp
 #si-secret-key: SKT2ETMT3XkAYApqh79DCnN9ZjfbQEBMPU0GyLz9
 web-his-url: http://172.16.30.26:8706
-thmz-url: http://172.16.30.22:8089/thmz/api/v1
+thmz-url: http://172.16.30.119:8089/thmz/api/v1

src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
     <!-- 日志根目录-->
     <springProperty scope="context" name="LOG_HOME" source="logging.path"
-                    defaultValue="D:\logs\SiFeeOprnSystm\mz"/>
+                    defaultValue="serverlog"/>
 
     <!-- 日志级别 -->
     <springProperty scope="context" name="LOG_ROOT_LEVEL" source="logging.level.root" defaultValue="INFO"/>