瀏覽代碼

结算清单质控不做强制。

lighter 2 年之前
父節點
當前提交
c1e10ff2d5

+ 5 - 7
src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetMainService.java

@@ -492,7 +492,7 @@ public class CaseFrontSheetMainService {
         Integer status = dao.getSignApplyStatus(sheet.getBah(), sheet.getAdmissTimes());
         if (null == status) {
             sheet.setAddressMember(getStandardAddress(sheet.getStandardAddress()));
-            List<CodeName> message = printVerification(sheet, 1);
+            List<CodeName> message = VerifyCaseFrontSheet.getInstance().printVerify(sheet, 1);
             if (message.isEmpty()) {
                 dao.insertNewSignApply(sheet.getBah(), sheet.getAdmissTimes(),
                         sheet.getName(), sheet.getSex(), TokenUtil.getTokenUserId());
@@ -635,9 +635,10 @@ public class CaseFrontSheetMainService {
         }
         sheet.setAddressMember(getStandardAddress(sheet.getStandardAddress()));
         sheet.setIsDoctorPrint(true);
-        List<CodeName> force = printVerification(sheet, param.getOpType());
+        List<CodeName> force = VerifyCaseFrontSheet.getInstance().printVerify(sheet, param.getOpType());
         CaseFrontsheetDisdiag disdiag = sheet.getDisdiagList().get(0);
         List<CodeName> advice = VerifyCaseFrontSheet.getInstance().adviseVerification(sheet.getSocialNo(), disdiag.getCode());
+        setlQualityControlPass(sheet, advice);
         surgeryChargesVerify(sheet, advice);
         JSONObject powersi = qualityControl(sheet);
         if (null != powersi) {
@@ -674,7 +675,7 @@ public class CaseFrontSheetMainService {
         int optype = info.getOpType();
         sheet.setAddressMember(getStandardAddress(sheet.getStandardAddress()));
         List<CodeName> message = optype == 1 ? VerifyCaseFrontSheet.getInstance().saveVerify(sheet) :
-                printVerification(sheet, optype);
+                VerifyCaseFrontSheet.getInstance().printVerify(sheet, optype);
         if (message.isEmpty()) {
             final String bah = sheet.getBah();
             final int times = sheet.getAdmissTimes();
@@ -811,8 +812,7 @@ public class CaseFrontSheetMainService {
         return dao.selectStandardAddressMember2(addrs[0], addrs[1], addrs[2]);
     }
 
-    private List<CodeName> printVerification(CaseFrontsheetMain sheet, int opType) {
-        List<CodeName> messages = VerifyCaseFrontSheet.getInstance().printVerify(sheet, opType);
+    private void setlQualityControlPass(CaseFrontsheetMain sheet, List<CodeName> messages) {
         String patNo = sheet.getBah();
         int times = sheet.getAdmissTimes();
         String admdvs = dao.selectSetlInsuplcAdmdvs(patNo, times);
@@ -822,8 +822,6 @@ public class CaseFrontSheetMainService {
                 messages.add(new CodeName("", "此患者医保结算清单质控未通过!"));
             }
         }
-//        surgeryChargesVerify(sheet, messages);
-        return messages;
     }
 
     private void surgeryChargesVerify(CaseFrontsheetMain sheet, List<CodeName> messages) {