1.修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0056.java

@@ -42,14 +42,18 @@ public class BEH0056 extends QCCatalogue {
         //硬规则 匹配未婚
         String marry = structureMap.get(Content.marry);
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
-        if ((maritalLabel != null && maritalLabel.getText().contains("未婚")) || "未婚".equals(marry)) {
-            status.set("0");
-            return;
+        if (maritalLabel != null) {
+            String text = maritalLabel.getText();
+            if (StringUtil.isNotBlank(text)) {
+                if (text.contains("未婚") || text.contains("离异") || text.contains("离婚") || text.contains("丧偶") || "未婚".equals(marry)) {
+                    status.set("0");
+                    return;
+                }
+            }
         }
         ConjugalRelation conjugalRelation = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getConjugalRelation();
-
         if (conjugalRelation != null) {
-            if(StringUtil.isNotBlank(conjugalRelation.getName())){
+            if (StringUtil.isNotBlank(conjugalRelation.getName())) {
                 status.set("0");
                 return;
             }
@@ -63,10 +67,6 @@ public class BEH0056 extends QCCatalogue {
                 return;
             }
         }
-        //硬规则 匹配离婚
-        if (inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText().contains("离婚")) {
-            status.set("0");
-        }
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0065.java

@@ -29,7 +29,9 @@ public class BEH0065 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                 || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
             status.set("0"); //如果性别是男,就不报错
-        } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
+        } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() == null) {
+            status.set("0");
+        } else {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             String text = menstrualLabel.getText();
             if (StringUtil.isNotBlank(text) && (text.contains("未行经") || text.contains("颜色"))) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0068.java

@@ -35,7 +35,7 @@ public class BEH0068 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 String text = menstrualLabel.getText();
-                if (StringUtil.isNotBlank(text) && text.contains("未行经")){
+                if (StringUtil.isNotBlank(text) && text.contains("未行经")) {
                     status.set("0");
                     return;
                 }
@@ -45,6 +45,8 @@ public class BEH0068 extends QCCatalogue {
                 if (menstrualLabel.getLeukorrheas().size() > 0) {
                     status.set("0");
                 }
+            } else {
+                status.set("0");
             }
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java

@@ -39,6 +39,7 @@ public class BEH0375 extends QCCatalogue {
                 (StringUtil.isBlank(maritalLabel.getText())
                         || maritalLabel.getText().contains("未婚")
                         || maritalLabel.getText().contains("离婚")
+                        || maritalLabel.getText().contains("离异")
                         || maritalLabel.getText().contains("已故")
                 )
                 )

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0092.java

@@ -5,6 +5,7 @@ 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.model.label.TreatPlanLabel;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 /**
@@ -25,8 +26,14 @@ public class FIRC0092 extends QCCatalogue {
         if (treatPlanLabel == null) {
             return;
         }
-        if (treatPlanLabel.getNursingLevel() != null &&
-                (treatPlanLabel.getMedicine() != null || treatPlanLabel.getTreat().size() > 0)) {
+        String text = treatPlanLabel.getText();
+        boolean findText = false;
+        if (StringUtil.isNotBlank(text) && text.contains("护理")) {
+            findText = true;
+        }
+        if ((treatPlanLabel.getNursingLevel() != null || findText) &&
+                (treatPlanLabel.getMedicine() != null || treatPlanLabel.getTreat().size() > 0
+                        || treatPlanLabel.getPacs().size() > 0)) {
             status.set("0");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0190.java

@@ -32,6 +32,7 @@ public class FIRP0190 extends QCCatalogue {
         if (CatalogueUtil.isEmpty(rhFactor)) {
             return;
         }
+        int matchSum = 0;
         for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocList) {
             String bloodType = clinicalBloodDoc.getStructureMap().get("输注种类、血型、数量");
             if (StringUtils.isEmpty(bloodType)) {
@@ -42,11 +43,14 @@ public class FIRP0190 extends QCCatalogue {
             }
             bloodType = bloodType.toUpperCase();
             String rh = Content.rhFactor.toUpperCase();
-            if (!bloodType.contains(rh) ||
-                    !bloodType.contains(CatalogueUtil.removeSpecialChar(rhFactor))) {
-                status.set("-1");
-                return;
+            if (bloodType.contains(rh) ||
+                    bloodType.contains(CatalogueUtil.removeSpecialChar(rhFactor))) {
+                matchSum++;
+                break;
             }
         }
+        if (matchSum == 0){
+            status.set("-1");
+        }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0127.java

@@ -67,7 +67,7 @@ public class THR0127 extends QCCatalogue {
                 if (CatalogueUtil.isEmpty(roundRecordThisWeek)) {
                     break;
                 }
-                lastWardDateRange = DateUtil.formatDateTime(beginDate) + "    ->    " + DateUtil.formatDateTime(DateUtil.addDate(beginDate, 6));
+                lastWardDateRange = DateUtil.formatDate(beginDate) + "    ->    " + DateUtil.formatDate(DateUtil.addDate(beginDate, 6));
                 lastWardDateRangeList.add(lastWardDateRange);
                 roundRecordEveryWeek.add(roundRecordThisWeek);
                 beginDate = DateUtil.addDate(beginDate, 7);

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/model/EntityEnum.java

@@ -27,7 +27,8 @@ public enum EntityEnum {
     TITLE_FOR_DIFF("鉴别诊断标题"), TITLE_FOR_TREAT("诊疗计划标题"), TITLE("标题"), TREATMENT_PLAN("诊疗计划"),
     TITLE_OF_OPERATIVE_FINDINGS("手术经过标题"), TITLE_OF_MEASURES_AFTER_OP("术后处理措施标题"),
     TITLE_OF_RISK_AFTER_OP("术后风险标题"), TITLE_OF_ATTENTION_AFTER_OP("术后注意事项标题"), VITAL("生命体征"),
-    BETTER_FINDING("好转表现"),OUTCOME_TO_BETTER("转归情况-好转"),OUTCOME_CURE("转归情况-治愈"),POSITIVE_FINDING("阳性表现");
+    BETTER_FINDING("好转表现"),OUTCOME_TO_BETTER("转归情况-好转"),OUTCOME_CURE("转归情况-治愈"),POSITIVE_FINDING("阳性表现"),
+    INSPECTION_ITEMS("检查项目");
 
     private String value;
 
@@ -228,6 +229,9 @@ public enum EntityEnum {
             case "治疗目的":
                 entityEnum = EntityEnum.CURE_AIM;
                 break;
+            case "检查项目":
+                entityEnum = EntityEnum.INSPECTION_ITEMS;
+                break;
         }
         return entityEnum;
     }

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcessTreatPlan.java

@@ -41,24 +41,24 @@ public class EntityProcessTreatPlan extends EntityProcess {
             treats.add(treat);
         }
         treatPlanLabel.setTreat(treats);
-        //化验
-        List<Lemma> lisLemmas = createEntityTree(aiOut, EntityEnum.LABORATORY.toString());
-        List<Lis> lises = new ArrayList<>();
-        for (Lemma lemma :lisLemmas) {
-            Lis lis = new Lis();
-            lis.setName(lemma.getText());
-            lises.add(lis);
-        }
-        treatPlanLabel.setLis(lises);
+//        //化验
+//        List<Lemma> lisLemmas = createEntityTree(aiOut, EntityEnum.LABORATORY.toString());
+//        List<Lis> lises = new ArrayList<>();
+//        for (Lemma lemma :lisLemmas) {
+//            Lis lis = new Lis();
+//            lis.setName(lemma.getText());
+//            lises.add(lis);
+//        }
+//        treatPlanLabel.setLis(lises);
         //检查
-        List<Lemma> pacsLemmas = createEntityTree(aiOut, EntityEnum.AUXILIARY_EXAMINATION.toString());
+        List<Lemma> pacsLemmas = createEntityTree(aiOut, EntityEnum.INSPECTION_ITEMS.toString());
         List<Pacs> paces = new ArrayList<>();
         for (Lemma lemma :pacsLemmas) {
             Pacs pacs = new Pacs();
             pacs.setName(lemma.getText());
             paces.add(pacs);
         }
-        treatPlanLabel.setLis(lises);
+        treatPlanLabel.setPacs(paces);
         return treatPlanLabel;
     }
 }

public/src/main/java/com/lantone/qc/pub/Content.java

@@ -152,7 +152,7 @@ public class Content {
     public static final String contact_phone = "联系人电话";
 
     public static final String diagnose_cts = "诊断符合情况";
-    public static final String o_i = "门诊与出院";
+    public static final String o_i = "门诊与住院";
     public static final String i_o = "入院与出院";
     public static final String ob_oa = "术前与术后";
     public static final String clinical_pathology = "临床与病理";

trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -228,8 +228,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "++++深层组织手术=",
             "++++器官手术=",
             "++++空隙手术=",
-            "++++术中送检无=术中送检",
-            "++++术中送检有=术中送检",
+//            "++++术中送检无=术中送检",
+//            "++++术中送检有=术中送检",
             "冰冻切片结果=",
             "++++并发症无=手术并发症",
             "++++并发症有=手术并发症",