wangsy пре 4 година
родитељ
комит
601b926f89
28 измењених фајлова са 103 додато и 683 уклоњено
  1. 1 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0504.java
  2. 1 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0250.java
  3. 5 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02883.java
  4. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02885.java
  5. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02886.java
  6. 0 33
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstcourserecord/FIRC0504.java
  7. 0 77
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstpagerecord/FIRP0250.java
  8. 0 37
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstpagerecord/FIRP02883.java
  9. 0 40
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstpagerecord/FIRP02885.java
  10. 0 40
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstpagerecord/FIRP02886.java
  11. 0 64
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/operationdiscussion/OPE0353.java
  12. 0 38
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0329.java
  13. 0 42
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0330.java
  14. 0 36
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0331.java
  15. 0 36
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0332.java
  16. 0 36
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0333.java
  17. 0 36
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0334.java
  18. 0 90
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/threelevelward/THR0140.java
  19. 0 61
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/threelevelward/THR0682.java
  20. 1 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0353.java
  21. 12 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0329.java
  22. 13 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0330.java
  23. 13 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0331.java
  24. 13 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0332.java
  25. 12 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0333.java
  26. 12 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0334.java
  27. 1 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0140.java
  28. 13 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0682.java

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0504.java

@@ -36,6 +36,7 @@ public class FIRC0504 extends QCCatalogue {
         switch (Content.hospital_Id)
         {
             case "1":               //长兴
+            case "2":
                 return "治疗计划";
             default:
                 return "诊疗计划";

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0250.java

@@ -83,6 +83,7 @@ public class FIRP0250 extends QCCatalogue {
         switch (Content.hospital_Id)
         {
             case "1":               //长兴
+            case "2":
                 return "抢救措施";
             default:
                 return "抢救内容";

+ 5 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02883.java

@@ -1,10 +1,10 @@
 package com.lantone.qc.kernel.catalogue.firstpagerecord;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -22,7 +22,10 @@ public class FIRP02883 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String zipcode = firstpageStructureMap.get(Content.current_address_zipcode);
-            if (!CatalogueUtil.isEmpty(zipcode)) {
+            if (StringUtils.isNotBlank(zipcode)) {
+                if ("-".equals(zipcode) || "/".equals(zipcode)) {
+                    return;
+                }
                 String regex = "^\\d{6}$";
                 if (!zipcode.matches(regex)) {
                     status.set("-1");

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02885.java

@@ -5,7 +5,7 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -23,8 +23,8 @@ public class FIRP02885 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String zipcode = firstpageStructureMap.get(Content.household_address_zipcode);
-            if (StringUtil.isNotBlank(zipcode)) {
-                if ("-".equals(zipcode)) {
+            if (StringUtils.isNotBlank(zipcode)) {
+                if ("-".equals(zipcode) || "/".equals(zipcode)) {
                     return;
                 }
                 if (CatalogueUtil.numbersOnly(zipcode)) {

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02886.java

@@ -5,7 +5,7 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -23,8 +23,8 @@ public class FIRP02886 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String zipcode = firstpageStructureMap.get(Content.work_unit_zipcode);
-            if (StringUtil.isNotBlank(zipcode)) {
-                if ("-".equals(zipcode)) {
+            if (StringUtils.isNotBlank(zipcode)) {
+                if ("-".equals(zipcode) || "/".equals(zipcode)) {
                     return;
                 }
                 if (CatalogueUtil.numbersOnly(zipcode)) {

+ 0 - 33
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstcourserecord/FIRC0504.java

@@ -1,33 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.firstcourserecord;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * @ClassName : FIRC0504
- * @Description : 检查计划未填写
- * @Author : 楼辉荣
- * @Date: 2020-03-06 17:28
- */
-@Component
-public class FIRC0504 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
-        if (firstCourseRecordDoc != null) {
-            Map<String, String> firstRecordMap = firstCourseRecordDoc.getStructureMap();
-            if (firstRecordMap != null) {
-                String treatPlan = firstRecordMap.get("治疗计划");
-                if (StringUtil.isBlank(treatPlan)) {
-                    status.set("-1");
-                }
-            }
-        }
-    }
-}

+ 0 - 77
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstpagerecord/FIRP0250.java

@@ -1,77 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.firstpagerecord;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.pub.Content;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.RescueDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @ClassName : FIRP0250
- * @Description : 抢救成功次数填写错误
- * @Author : 楼辉荣
- * @Date: 2020-03-06 17:28ss
- */
-@Component
-public class FIRP0250 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getRescueDocs().size() > 0) {
-            List<RescueDoc> rescueDocs = inputInfo.getRescueDocs();
-            int rescueNum = getRescueNum(rescueDocs);/* 抢救记录中抢救成功次数 */
-            boolean match = false;
-
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String successfulRescueTimes = firstpageStructureMap.get("病人抢救成功次数");
-            int successfulRescueTimesTZ = 0;
-            if (StringUtil.isNotBlank(successfulRescueTimes) && CatalogueUtil.numbersOnly(successfulRescueTimes)) {
-                successfulRescueTimesTZ = Integer.parseInt(successfulRescueTimes);
-            }
-            if (rescueNum == successfulRescueTimesTZ) {
-                match = true;
-            }
-            String name = firstpageStructureMap.get(Content.rescue_condition);
-            if (StringUtil.isNotBlank(name)) {
-                String[] split = name.split("\\s+");
-                Pattern compile = Pattern.compile("(?<=成功).*(?=次)");
-                Matcher matcher = compile.matcher(split[0]);
-                while (matcher.find()) {
-                    try {
-                        String number = matcher.group(0);
-                        int num = Integer.parseInt(number);
-                        if (num == rescueNum) {
-                            match = true;
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-
-            if (!match){
-                status.set("-1");
-            }
-        }
-    }
-
-    private int getRescueNum(List<RescueDoc> rescueDocs) {
-        int i = 0;
-        for (RescueDoc re : rescueDocs) {
-            Map<String, String> structureMap = re.getStructureMap();
-            // 跟医学部确认,从抢救措施中读取数据
-            String qjgc = structureMap.get("抢救措施");
-            if (StringUtil.isNotBlank(qjgc) && !qjgc.contains("死亡")) {
-                i++;
-            }
-        }
-        return i;
-    }
-}

+ 0 - 37
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstpagerecord/FIRP02883.java

@@ -1,37 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.firstpagerecord;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.pub.Content;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * @ClassName : FIRP0737
- * @Description : 现住址邮编信息错误
- * @Author : 胡敬
- * @Date: 2020-05-08 16:00
- */
-@Component
-public class FIRP02883 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String zipcode = firstpageStructureMap.get(Content.current_address_zipcode);
-            if (StringUtils.isNotBlank(zipcode)) {
-                if ("-".equals(zipcode) || "/".equals(zipcode)) {
-                    return;
-                }
-                String regex = "^\\d{6}$";
-                if (!zipcode.matches(regex)) {
-                    status.set("-1");
-                }
-            }
-        }
-    }
-}

+ 0 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstpagerecord/FIRP02885.java

@@ -1,40 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.firstpagerecord;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.pub.Content;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.util.StringUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * @ClassName : FIRP02885
- * @Description : 户口地址邮编信息错误
- * @Author : 胡敬
- * @Date: 2020-05-08 16:00
- */
-@Component
-public class FIRP02885 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String zipcode = firstpageStructureMap.get(Content.household_address_zipcode);
-            if (StringUtils.isNotBlank(zipcode)) {
-                if ("-".equals(zipcode) || "/".equals(zipcode)) {
-                    return;
-                }
-                if (CatalogueUtil.numbersOnly(zipcode)) {
-                    String regex = "^\\d{6}$";
-                    if (!zipcode.matches(regex)) {
-                        status.set("-1");
-                    }
-                }
-            }
-        }
-    }
-}

+ 0 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/firstpagerecord/FIRP02886.java

@@ -1,40 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.firstpagerecord;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.pub.Content;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.util.StringUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * @ClassName : FIRP02886
- * @Description : 工作单位邮编信息错误
- * @Author : 胡敬
- * @Date: 2020-05-08 16:00
- */
-@Component
-public class FIRP02886 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String zipcode = firstpageStructureMap.get(Content.work_unit_zipcode);
-            if (StringUtils.isNotBlank(zipcode)) {
-                if ("-".equals(zipcode) || "/".equals(zipcode)) {
-                    return;
-                }
-                if (CatalogueUtil.numbersOnly(zipcode)) {
-                    String regex = "^\\d{6}$";
-                    if (!zipcode.matches(regex)) {
-                        status.set("-1");
-                    }
-                }
-            }
-        }
-    }
-}

+ 0 - 64
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/operationdiscussion/OPE0353.java

@@ -1,64 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.operationdiscussion;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
-import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.model.label.OperationDiscussionLabel;
-import com.lantone.qc.pub.util.ListUtil;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description: 术后首次病程记录未记录处理及注意事项
- * @author: 胡敬
- * @time: 2020/3/24 13:28
- */
-@Component
-public class OPE0353 extends QCCatalogue {
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        //医嘱
-        //        List<DoctorAdviceDoc> doctorAdviceDocs = inputInfo.getDoctorAdviceDocs();
-        //        if (ListUtil.isEmpty(doctorAdviceDocs)) {
-        //            return;
-        //        }
-        //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        //        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        //        if (isOperativePatient) {
-        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if (operationDocs == null || operationDocs.size() == 0) {
-            status.set("0");
-            return;
-        }
-        if (ListUtil.isEmpty(operationDocs)) {
-            return;
-        }
-        for (OperationDoc operationDoc : operationDocs) {
-            OperationDiscussionDoc operationDiscussionDoc = operationDoc.getOperationDiscussionDoc();
-            if (operationDiscussionDoc == null) {
-                continue;
-            }
-            //结构化读取手术术后处理措施和注意事项
-            if (operationDiscussionDoc.getStructureMap().get("术后处理措施") != null
-                    || operationDiscussionDoc.getStructureMap().get("术后注意事项") != null) {
-                continue;
-            }
-            String treatPlan = operationDiscussionDoc.getStructureMap().get("治疗计划和措施");
-            OperationDiscussionLabel operationDiscussionLabel = operationDiscussionDoc.getOperationDiscussionLabel();
-            String measuresAfterOp = operationDiscussionLabel.getMeasuresAfterOp();
-            String attentionAfterOp = operationDiscussionLabel.getAttentionAfterOp();
-            if ((StringUtil.isBlank(measuresAfterOp) || measuresAfterOp.length() < 10 || StringUtil.isBlank(attentionAfterOp) || attentionAfterOp.length() < 10)
-                    && StringUtil.isBlank(treatPlan)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
-    //    }
-
-}

+ 0 - 38
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0329.java

@@ -1,38 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.preoperativediscussion;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.util.List;
-
-/**
- * @Description: 术前讨论记录无手术指征
- * @author: rengb
- * @time: 2020/3/23 15:09
- */
-@Component
-public class PRE0329 extends QCCatalogue {
-
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-        status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size()== 0){
-            return;
-        }
-        for (OperationDoc operationDoc : operationDocs) {
-            if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征"))) {
-                status.set("-1");
-            }
-        }
-
-    }
-
-}

+ 0 - 42
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0330.java

@@ -1,42 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.preoperativediscussion;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 术前讨论记录无拟行术式
- * @author: rengb
- * @time: 2020/3/23 15:09
- */
-@Component
-public class PRE0330 extends QCCatalogue {
-
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-        status.set("0");
-        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if (operationDocs == null || operationDocs.size() == 0) {
-            return;
-        }
-        for (OperationDoc operationDoc : operationDocs) {
-            if (operationDoc.getPreoperativeDiscussionDoc() != null) {
-                Map<String, String> structureMap = operationDoc.getPreoperativeDiscussionDoc().getStructureMap();
-                if(structureMap != null
-                        && structureMap.get("拟施手术方式名称及可能的变更与禁忌症") != null){
-                    return;
-                }
-                if (StringUtil.isEmpty(structureMap.get("拟行术式")) && StringUtil.isEmpty(structureMap.get("可能的变更"))) {
-                    status.set("-1");
-                }
-            }
-        }
-    }
-}

+ 0 - 36
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0331.java

@@ -1,36 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.preoperativediscussion;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.util.List;
-
-/**
- * @Description: 术前讨论记录无麻醉方式
- * @author: rengb
- * @time: 2020/3/23 15:09
- */
-@Component
-public class PRE0331 extends QCCatalogue {
-
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-        status.set("0");
-        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size()== 0){
-            return;
-        }
-        for (OperationDoc operationDoc : operationDocs) {
-            if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("麻醉方式"))) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
-}

+ 0 - 36
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0332.java

@@ -1,36 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.preoperativediscussion;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.util.List;
-
-/**
- * @Description: 术前讨论记录无术前准备内容
- * @author: rengb
- * @time: 2020/3/23 15:09
- */
-@Component
-public class PRE0332 extends QCCatalogue {
-
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-        status.set("0");
-        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size()== 0){
-            return;
-        }
-        for (OperationDoc operationDoc : operationDocs) {
-            if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备内容"))) {
-                status.set("-1");
-            }
-        }
-    }
-
-}

+ 0 - 36
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0333.java

@@ -1,36 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.preoperativediscussion;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.util.List;
-
-/**
- * @Description: 术前讨论记录未记录可能意外和防范措施
- * @author: rengb
- * @time: 2020/3/23 15:09
- */
-@Component
-public class PRE0333 extends QCCatalogue {
-
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-        status.set("0");
-        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size()== 0){
-            return;
-        }
-        for (OperationDoc operationDoc : operationDocs) {
-            if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("可能意外和防范措施"))) {
-                status.set("-1");
-            }
-        }
-    }
-
-}

+ 0 - 36
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/preoperativediscussion/PRE0334.java

@@ -1,36 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.preoperativediscussion;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.util.List;
-
-/**
- * @Description: 术前讨论记录未记录术前术后注意事项
- * @author: rengb
- * @time: 2020/3/23 15:09
- */
-@Component
-public class PRE0334 extends QCCatalogue {
-
-    @Override
-    protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-        status.set("0");
-        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size()== 0){
-            return;
-        }
-        for (OperationDoc operationDoc : operationDocs) {
-            if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前术后注意事项"))) {
-                status.set("-1");
-            }
-        }
-    }
-
-}

+ 0 - 90
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/threelevelward/THR0140.java

@@ -1,90 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.threelevelward;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.pub.Content;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName : THR0140
- * @Description : 查房记录无医师签名
- * @Author : 胡敬
- * @Date: 2020-03-19 19:20
- */
-@Component
-public class THR0140 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-        if (threeLevelWardDocs.size() == 0) {
-            status.set("0");
-            return;
-        }
-        List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
-        if (allDoctorWradDocs.size() == 0) {
-            status.set("0");
-            return;
-        }
-        List<ThreeLevelWardDoc> recordDoctorList = allDoctorWradDocs
-                .stream()
-                .filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("记录医师")))
-                .collect(Collectors.toList());
-        if (recordDoctorList.size() == 0) {
-            status.set("0");
-        }
-
-        StringBuffer message = new StringBuffer();
-        //长兴:返回所有医师未签名的记录日期
-        int i = 0;
-        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
-            if (StringUtil.isBlank(threeLevelWardDoc.getStructureMap().get("记录医师"))) {
-                if (threeLevelWardDoc.getStructureMap() != null && threeLevelWardDoc.getStructureMap().get("记录时间") != null) {
-                    if (i > 1) {
-                        break;
-                    }
-                    if (message.toString().length() == 0) {
-                        message.append(threeLevelWardDoc.getStructureMap().get("记录时间"));
-                    } else {
-                        message.append(",").append(threeLevelWardDoc.getStructureMap().get("记录时间"));
-                    }
-                    i++;
-                }
-            }
-        }
-        info.set(message.append("...").toString());
-        //        if (inputInfo.getDifficultCaseDiscussDocs().size() > 0) {
-        //            processSign(inputInfo, "疑难患者");
-        //        }
-        //        if (inputInfo.getRescueDocs().size() > 0) {
-        //            processSign(inputInfo, "抢救患者");
-        //        }
-    }
-
-    private void processSign(InputInfo inputInfo, String message) {
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-            Map<String, String> threeLevelWardDocStructureMap = threeLevelWardDoc.getStructureMap();
-            String title = threeLevelWardDocStructureMap.get("查房标题");
-            String recordDoctor = threeLevelWardDocStructureMap.get("记录医师");
-            if (CatalogueUtil.isEmpty(title)) {
-                continue;
-            }
-            if (CatalogueUtil.subTitle(title).contains(Content.director) && CatalogueUtil.isEmpty(recordDoctor)) {
-                status.set("-1");
-                if (StringUtil.isBlank(message)) {
-                    info.set(message);
-                } else {
-                    info.set(info.get() + "," + message);
-                }
-                break;
-            }
-        }
-    }
-}

+ 0 - 61
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/shaoyf/threelevelward/THR0682.java

@@ -1,61 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.shaoyf.threelevelward;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.RescueDoc;
-import com.lantone.qc.pub.util.ListUtil;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : THR0682
- * @Description : 抢救记录无病情变化情况
- * @Author : 胡敬
- * @Date: 2020-03-30 13:14
- */
-@Component
-public class THR0682 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<RescueDoc> rescueDocs = inputInfo.getRescueDocs();
-        if (ListUtil.isEmpty(rescueDocs)) {
-            return;
-        }
-        for (RescueDoc rescueDoc : rescueDocs) {
-            Map<String, String> rescueStructureMap = rescueDoc.getStructureMap();
-            if (CatalogueUtil.isEmpty(rescueStructureMap.get("抢救措施"))) {
-                status.set("-1");
-                return;
-            }
-        }
-        /*
-        status.set("0");
-        List<RescueDoc> rescueDocs = inputInfo.getRescueDocs();
-        if (ListUtil.isEmpty(rescueDocs)) {
-            return;
-        }
-        for (RescueDoc rescueDoc : rescueDocs) {
-            Map<String, String> rescueStructureMap = rescueDoc.getStructureMap();
-            String rescueDateStr = rescueStructureMap.get("抢救时间");
-            String doctorSognDateStr = rescueStructureMap.get("医师签名-时间");
-            if (CatalogueUtil.isEmpty(rescueDateStr) || CatalogueUtil.isEmpty(doctorSognDateStr)) {
-                continue;
-            }
-            rescueDateStr = rescueDateStr.split("[-—]")[1];
-            boolean compareTime = CatalogueUtil.compareTime(StringUtil.parseDateTime(rescueDateStr),
-                    StringUtil.parseDateTime(doctorSognDateStr),
-                    (long) (6 * 60));
-            if (compareTime) {
-                status.set("-1");
-                return;
-            }
-        }
-
-         */
-    }
-}

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0353.java

@@ -66,6 +66,7 @@ public class OPE0353 extends QCCatalogue {
             switch (Content.hospital_Id)
             {
                 case "1":               //长兴
+                case "2":
                     return "术后注意事项";
                 default:
                     return "术后应当特别注意观察的事项:";

+ 12 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0329.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.preoperativediscussion;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
@@ -26,13 +27,23 @@ public class PRE0329 extends QCCatalogue {
         if(operationDocs == null || operationDocs.size()== 0){
             return;
         }
+        String key = getKeyByHospitalId();
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征与禁忌"))) {
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get(key))) {
                 status.set("-1");
             }
         }
+    }
 
+    private String getKeyByHospitalId() {
+        switch (Content.hospital_Id)
+        {
+            case "2":
+                return "手术指征";
+            default:
+                return "手术指征与禁忌";
+        }
     }
 
 }

+ 13 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0330.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.preoperativediscussion;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
@@ -26,11 +27,12 @@ public class PRE0330 extends QCCatalogue {
         if (operationDocs == null || operationDocs.size() == 0) {
             return;
         }
+        String key = getKeyByHospitalId();
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null) {
                 Map<String, String> structureMap = operationDoc.getPreoperativeDiscussionDoc().getStructureMap();
                 if(structureMap != null
-                        && structureMap.get("拟施手术方式、名称及可能的变更与禁忌症") != null){
+                        && structureMap.get(key) != null){
                     return;
                 }
                 if (StringUtil.isEmpty(structureMap.get("拟行术式")) && StringUtil.isEmpty(structureMap.get("可能的变更"))) {
@@ -39,4 +41,14 @@ public class PRE0330 extends QCCatalogue {
             }
         }
     }
+
+    private String getKeyByHospitalId() {
+        switch (Content.hospital_Id)
+        {
+            case "2":
+                return "拟施手术方式名称及可能的变更与禁忌症";
+            default:
+                return "拟施手术方式、名称及可能的变更与禁忌症";
+        }
+    }
 }

+ 13 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0331.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.preoperativediscussion;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
@@ -25,12 +26,23 @@ public class PRE0331 extends QCCatalogue {
         if(operationDocs == null || operationDocs.size()== 0){
             return;
         }
+        String key = getKeyByHospitalId();
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("拟施麻醉方式"))) {
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get(key))) {
                 status.set("-1");
                 return;
             }
         }
     }
+
+    private String getKeyByHospitalId() {
+        switch (Content.hospital_Id)
+        {
+            case "2":
+                return "麻醉方式";
+            default:
+                return "拟施麻醉方式";
+        }
+    }
 }

+ 13 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0332.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.preoperativediscussion;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
@@ -25,12 +26,23 @@ public class PRE0332 extends QCCatalogue {
         if(operationDocs == null || operationDocs.size()== 0){
             return;
         }
+        String key = getKeyByHospitalId();
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备"))) {
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get(key))) {
                 status.set("-1");
             }
         }
     }
 
+    private String getKeyByHospitalId() {
+        switch (Content.hospital_Id)
+        {
+            case "2":
+                return "术前准备内容";
+            default:
+                return "术前准备";
+        }
+    }
+
 }

+ 12 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0333.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.preoperativediscussion;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
@@ -25,12 +26,21 @@ public class PRE0333 extends QCCatalogue {
         if(operationDocs == null || operationDocs.size()== 0){
             return;
         }
+        String key = getKeyByHospitalId();
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("风险及防范措施"))) {
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get(key))) {
                 status.set("-1");
             }
         }
     }
-
+    private String getKeyByHospitalId() {
+        switch (Content.hospital_Id)
+        {
+            case "2":
+                return "可能意外和防范措施";
+            default:
+                return "风险及防范措施";
+        }
+    }
 }

+ 12 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0334.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.preoperativediscussion;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
@@ -25,12 +26,21 @@ public class PRE0334 extends QCCatalogue {
         if(operationDocs == null || operationDocs.size()== 0){
             return;
         }
+        String key = getKeyByHospitalId();
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术中术后注意事项"))) {
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get(key))) {
                 status.set("-1");
             }
         }
     }
-
+    private String getKeyByHospitalId() {
+        switch (Content.hospital_Id)
+        {
+            case "2":
+                return "术前术后注意事项";
+            default:
+                return "术中术后注意事项";
+        }
+    }
 }

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0140.java

@@ -96,6 +96,7 @@ public class THR0140 extends QCCatalogue {
         switch (Content.hospital_Id)
         {
             case "1":               //长兴
+            case "2":
                 keyList.add("记录医师");
                 keyList.add("记录时间");
                 break;

+ 13 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0682.java

@@ -2,6 +2,7 @@ package com.lantone.qc.kernel.catalogue.threelevelward;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.RescueDoc;
@@ -25,9 +26,10 @@ public class THR0682 extends QCCatalogue {
         if (ListUtil.isEmpty(rescueDocs)) {
             return;
         }
+        String key = getKeyByHospitalId();
         for (RescueDoc rescueDoc : rescueDocs) {
             Map<String, String> rescueStructureMap = rescueDoc.getStructureMap();
-            if (CatalogueUtil.isEmpty(rescueStructureMap.get("病情变化"))) {
+            if (CatalogueUtil.isEmpty(rescueStructureMap.get(key))) {
                 status.set("-1");
                 return;
             }
@@ -57,4 +59,14 @@ public class THR0682 extends QCCatalogue {
 
          */
     }
+
+    private String getKeyByHospitalId() {
+        switch (Content.hospital_Id)
+        {
+            case "2":
+                return "抢救措施";
+            default:
+                return "病情变化";
+        }
+    }
 }