Merge branch 'master' into digital-receipt

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>SiMzFeeOprnSystm</artifactId>
-    <version>2.3.9</version>
+    <version>2.4.0</version>
     <name>SiMzFeeOprnSystm</name>
     <description>SiMzFeeOprnSystm</description>
     <properties>

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

@@ -78,7 +78,10 @@ public class SiMzFeeService {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "省外异地的患者请读社保卡或医保电子凭证登记！");
         }
 
-        checkSettledButNotPay(p.getPatNo(), p.getTimes());
+        if (existSettledButNotPay(p.getPatNo(), p.getTimes())) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR,
+                    "有HIS未缴费的医保结算，无法办理医保登记。请先完成门诊缴费再重新办理。");
+        }
 
         if (StringUtil.notBlank(p.getMedType())) {
             mzDao.updateMedtype(p.getMedType(), p.getPatNo(), p.getTimes());
@@ -822,16 +825,18 @@ public class SiMzFeeService {
         }
     }
 
-    private void checkSettledButNotPay(String patNo, int times) {
+    private boolean existSettledButNotPay(String patNo, int times) {
         List<SiSetlinfo> setlinfos = scheduledDao.selectSettleInfosByPatient(patNo, times);
         for (SiSetlinfo item : setlinfos) {
             if (null != item.getPayCount() && item.getPayCount() > 0) {
                 scheduledDao.updateMzSaved(item.getSetlId());
             } else {
-                log.info("【结算ID: {}】有未支付的医保结算，发起撤销结算。", item.getSetlId());
-                revokeOutpatientSettlementForTask(item);
+//                log.info("【结算ID: {}】有未支付的医保结算，发起撤销结算。", item.getSetlId());
+//                revokeOutpatientSettlementForTask(item);
+                return true;
             }
         }
+        return false;
     }
 
     public void test() {