Merge remote-tracking branch 'origin/debug' into debug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0061.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.entity.Menses;
 import com.lantone.qc.pub.model.label.MenstrualLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -35,6 +36,9 @@ public class BEH0061 extends QCCatalogue {
                 if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                     MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                     List<Menses> mensesList = menstrualLabel.getMensesList();
+                    if (ListUtil.isEmpty(mensesList)) {
+                        return;
+                    }
                     for (Menses menses : mensesList) {
                         if (menses.getMenstrualCycle() != null && StringUtil.isNotBlank(menses.getMenstrualCycle().getName())) {
                             status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0062.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.entity.Menses;
 import com.lantone.qc.pub.model.label.MenstrualLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -35,6 +36,9 @@ public class BEH0062 extends QCCatalogue {
                 if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                     MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                     List<Menses> mensesList = menstrualLabel.getMensesList();
+                    if (ListUtil.isEmpty(mensesList)) {
+                        return;
+                    }
                     for (Menses menses : mensesList) {
                         if (menses.getMensesDuration() != null && StringUtil.isNotBlank(menses.getMensesDuration().getName())) {
                             status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0063.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.entity.Menses;
 import com.lantone.qc.pub.model.label.MenstrualLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -36,6 +37,9 @@ public class BEH0063 extends QCCatalogue {
                 if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                     MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                     List<Menses> mensesList = menstrualLabel.getMensesList();
+                    if (ListUtil.isEmpty(mensesList)) {
+                        return;
+                    }
                     boolean isFindLastMenstrual = false, isFindMenopauseTime = false, isFindMenopauseAge = false;
                     for (Menses menses : mensesList) {
                         if (menses.getLastMenstrual() != null && StringUtil.isNotBlank(menses.getLastMenstrual().getName())) { //末次月经时间

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Menses;
 import com.lantone.qc.pub.model.label.MenstrualLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -36,6 +37,9 @@ public class BEH0064 extends QCCatalogue {
                 if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                     MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                     List<Menses> mensesList = menstrualLabel.getMensesList();
+                    if (ListUtil.isEmpty(mensesList)) {
+                        return;
+                    }
                     for (Menses menses : mensesList) {
                         if (menses.getClinicals() == null) {
                             continue;

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Menses;
 import com.lantone.qc.pub.model.label.MenstrualLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -28,6 +29,9 @@ public class BEH0065 extends QCCatalogue {
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
+                if (ListUtil.isEmpty(mensesList)) {
+                    return;
+                }
                 for (Menses menses : mensesList) {
                     if (menses.getClinicals() == null) {
                         continue;

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Menses;
 import com.lantone.qc.pub.model.label.MenstrualLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -28,6 +29,9 @@ public class BEH0066 extends QCCatalogue {
             } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 List<Menses> mensesList = menstrualLabel.getMensesList();
+                if (ListUtil.isEmpty(mensesList)) {
+                    return;
+                }
                 for (Menses menses : mensesList) {
                     if (menses.getClinicals() == null) {
                         continue;

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

@@ -40,6 +40,9 @@ public class BEH0067 extends QCCatalogue {
                         return;
                     }
                     List<Menses> mensesList = menstrualLabel.getMensesList();
+                    if (ListUtil.isEmpty(mensesList)) {
+                        return;
+                    }
                     for (Menses menses : mensesList) {
                         if (menses.getClinicals() == null) {
                             continue;

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

@@ -4,8 +4,11 @@ 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @ClassName : BEH0069
  * @Description : 家族史未填写
@@ -16,6 +19,14 @@ import org.springframework.stereotype.Component;
 public class BEH0069 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        //台州结构化
+        if(inputInfo.getBeHospitalizedDoc() != null){
+            Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+            if(StringUtils.isNotEmpty(structureMap.get("家庭成员类似病史"))){
+                status.set("0");
+            }
+        }
+
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             if (!CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getFamilyLabel().getText())) {
                 status.set("0");

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

@@ -23,7 +23,8 @@ public class BEH0409 extends QCCatalogue {
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("关系");
-            if(CatalogueUtil.isEmpty(name)){
+            String historyPresenter = structureMap.get("病史陈述者");
+            if(CatalogueUtil.isEmpty(name) && CatalogueUtil.isEmpty(historyPresenter)){
                 status.set("-1");
             }
         }

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

@@ -23,7 +23,7 @@ public class BEH0441 extends QCCatalogue {
         List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
         if(generals.size() > 0 || generals != null){
             for (GeneralDesc general:generals) {
-                if(general.getName().contains("纳")|| general.getName().contains("饮食")){
+                if(general.getName().contains("纳")|| general.getName().contains("饮食") || general.getName().contains("进食")){
                     status.set("0");
                     break;
                 }
@@ -32,7 +32,7 @@ public class BEH0441 extends QCCatalogue {
         List<General> gens = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGens();
         if(gens.size() > 0 || gens != null){
             for (General general:gens) {
-                if(general.getName().contains("纳") || general.getName().contains("饮食")){
+                if(general.getName().contains("纳") || general.getName().contains("饮食") || general.getName().contains("进食")){
                     status.set("0");
                     break;
                 }

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

@@ -3,8 +3,12 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 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.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.entity.General;
 import com.lantone.qc.pub.model.entity.GeneralDesc;
+import com.lantone.qc.pub.model.label.PresentLabel;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -19,25 +23,36 @@ import java.util.List;
 @Component
 public class BEH0444 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-
-        List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
-        if(generals.size() > 0 || generals != null){
-            for (GeneralDesc general:generals) {
-                if(general.getName().contains("精神") || general.getName().contains("神志")){
-                    status.set("0");
-                    break;
+        BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
+        if (beHospitalizedDoc == null) {
+            status.set("0");
+            return;
+        }
+        PresentLabel presentLabel = beHospitalizedDoc.getPresentLabel();
+        if (presentLabel != null) {
+            String presentLabelText = presentLabel.getText();
+            if (StringUtil.isNotBlank(presentLabelText) && presentLabelText.contains("精神")) {
+                status.set("0");
+                return;
+            }
+            List<GeneralDesc> generals = presentLabel.getGenerals();
+            if (ListUtil.isNotEmpty(generals)) {
+                for (GeneralDesc general : generals) {
+                    if (general.getName().contains("精神") || general.getName().contains("神志")) {
+                        status.set("0");
+                        break;
+                    }
                 }
             }
-        }
-        List<General> gens = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGens();
-        if(gens.size() > 0 || gens != null){
-            for (General general:gens) {
-                if(general.getName().contains("精神") || general.getName().contains("神志")){
-                    status.set("0");
-                    break;
+            List<General> gens = presentLabel.getGens();
+            if (ListUtil.isNotEmpty(gens)) {
+                for (General general : gens) {
+                    if (general.getName().contains("精神") || general.getName().contains("神志")) {
+                        status.set("0");
+                        break;
+                    }
                 }
             }
         }
-
     }
 }

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

@@ -17,15 +17,17 @@ import org.springframework.stereotype.Component;
 public class FIRC0092 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
-        if (firstCourseRecordDoc != null) {
-            TreatPlanLabel treatPlanLabel = firstCourseRecordDoc.getTreatPlanLabel();
-            if (treatPlanLabel == null){
-                return;
-            }
-            if (treatPlanLabel.getNursingLevel() != null &&
-                    (treatPlanLabel.getMedicine() != null || treatPlanLabel.getTreat().size() > 0)) {
-                status.set("0");
-            }
+        if (firstCourseRecordDoc == null) {
+            status.set("0");
+            return;
+        }
+        TreatPlanLabel treatPlanLabel = firstCourseRecordDoc.getTreatPlanLabel();
+        if (treatPlanLabel == null) {
+            return;
+        }
+        if (treatPlanLabel.getNursingLevel() != null &&
+                (treatPlanLabel.getMedicine() != null || treatPlanLabel.getTreat().size() > 0)) {
+            status.set("0");
         }
     }
 }

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

@@ -1,7 +1,6 @@
 package com.lantone.qc.kernel.catalogue.firstcourserecord;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.KernelConstants;
 import com.lantone.qc.kernel.util.RedisUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
@@ -15,7 +14,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ClassName : FIRC0095
@@ -28,30 +26,33 @@ import java.util.Map;
 public class FIRC0095 extends QCCatalogue {
     @Autowired
     private RedisUtil redisUtil;
+
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
-        if(firstCourseRecordDoc != null && beHospitalizedDoc != null){
-            DiagLabel initialDiagLabel = firstCourseRecordDoc.getInitialDiagLabel();
-            DiagLabel initialDiagLabel1 = beHospitalizedDoc.getInitialDiagLabel();
-            if(initialDiagLabel != null && initialDiagLabel1 != null){
-                List<Diag> diags = initialDiagLabel.getDiags();
-                List<Diag> diags1 = initialDiagLabel1.getDiags();
-                List<String> firstDiags = new ArrayList<>();
-                List<String> bhDiags = new ArrayList<>();
-                if(diags != null && diags.size()>0){
-                    for (Diag firdiag:diags) {
-                        firstDiags.add(firdiag.getHospitalDiagName());
-                    }
-                    for (Diag bhDig:diags1) {
-                        bhDiags.add(bhDig.getHospitalDiagName());
-                    }
-                    if(ListUtil.equals(firstDiags,bhDiags)){
-                        status.set("0");
-                    }
+        if (firstCourseRecordDoc == null && beHospitalizedDoc == null) {
+            status.set("0");
+            return;
+        }
+        DiagLabel initialDiagLabel = firstCourseRecordDoc.getInitialDiagLabel();
+        DiagLabel initialDiagLabel1 = beHospitalizedDoc.getInitialDiagLabel();
+        if (initialDiagLabel != null && initialDiagLabel1 != null) {
+            List<Diag> diags = initialDiagLabel.getDiags();
+            List<Diag> diags1 = initialDiagLabel1.getDiags();
+            List<String> firstDiags = new ArrayList<>();
+            List<String> bhDiags = new ArrayList<>();
+            if (diags != null && diags.size() > 0) {
+                for (Diag firdiag : diags) {
+                    firstDiags.add(firdiag.getHospitalDiagName());
+                }
+                for (Diag bhDig : diags1) {
+                    bhDiags.add(bhDig.getHospitalDiagName());
+                }
+                if (ListUtil.equals(firstDiags, bhDiags)) {
+                    status.set("0");
                 }
-            }
             }
         }
     }
+}

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

@@ -23,7 +23,7 @@ public class FIRP0174 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureExtMap() != null) {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> outpatientEmergencyDiag = (List) firstpageStructureMap.get(Content.dischargeDiag);
-            if (outpatientEmergencyDiag == null && outpatientEmergencyDiag.size() == 0) {
+            if (outpatientEmergencyDiag == null || outpatientEmergencyDiag.size() == 0) {
                 status.set("-1");
             }
         }

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

@@ -21,8 +21,8 @@ public class FIRP0184 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String drugAllergy = firstpageStructureMap.get(Content.drugAllergy);
-            String allergyDrug = firstpageStructureMap.get(Content.drugAllergy);
-            if (!CatalogueUtil.isEmpty(drugAllergy) && !CatalogueUtil.isEmpty(allergyDrug)) {
+//            String allergyDrug = firstpageStructureMap.get(Content.allergyDrug);
+            if (!CatalogueUtil.isEmpty(drugAllergy)) {
                 status.set("0");
             }
         }

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

@@ -5,6 +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.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -23,8 +24,8 @@ public class FIRP0187 extends QCCatalogue {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String outWay = firstpageStructureMap.get(Content.outWay);
             String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy);
-            if (!CatalogueUtil.isEmpty(outWay) && !outWay.contains("死亡")
-                    && !CatalogueUtil.isEmpty(deadAutopsy) && !deadAutopsy.trim().equals("-")){
+            if (StringUtil.isNotEmpty(outWay) && !outWay.contains("死亡")
+                    && StringUtil.isNotEmpty(deadAutopsy)){
                 status.set("-1");
             }
         }

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

@@ -20,18 +20,22 @@ import java.util.Map;
 @Component
 public class FIRP0220 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String firstAdmissionDate = firstpageStructureMap.get(Content.admisTime);
             String admissionDate = beHospitalStructureMap.get(Content.admisDate);
+            if (StringUtil.isEmpty(firstAdmissionDate) || StringUtil.isEmpty(admissionDate)){
+                return;
+            }
             Date firstDate = StringUtil.parseDateTime(firstAdmissionDate);
             Date admisDate = StringUtil.parseDateTime(admissionDate);
             if(firstDate != null && admisDate != null){
-                if(firstDate.getTime() != admisDate.getTime()){
-                    status.set("-1");
+                if(firstDate.getYear() == admisDate.getYear() &&
+                firstDate.getMonth() == admisDate.getMonth() &&
+                firstDate.getDay() == admisDate.getDay()){
+                    status.set("0");
                 }
             }
         }

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

@@ -5,6 +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.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -21,10 +22,10 @@ public class FIRP0275 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
-            String firstDischargeTime = firstpageStructureMap.get(Content.actualStay).toString();//病案首页出院时间
-            String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength).replace("天","");//出院小结出院时间
+            String firstDischargeTime = firstpageStructureMap.get(Content.actualStay);//病案首页出院时间
+            String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength);//出院小结出院时间
             if (!CatalogueUtil.compareToken(firstDischargeTime, dischargeTime)) {
                 status.set("-1");
             }

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

@@ -28,10 +28,12 @@ public class THR0125 extends QCCatalogue {
             String admisTime = leaveHospitalStructureMap.get(Content.admisTime);
             String dischargeTime = leaveHospitalStructureMap.get(Content.dischargeTime);
             if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
+                status.set("0");
                 return;
             }
             //如果住院天数小于3天则不判断该条规则
             if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(dischargeTime), (long) (72 * 60))) {
+                status.set("0");
                 return;
             }
             ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);

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

@@ -29,10 +29,12 @@ public class THR0126 extends QCCatalogue {
             String admisTime = getLeaveHospitalStructureMap.get(Content.admisTime);
             String dischargeTime = getLeaveHospitalStructureMap.get(Content.dischargeTime);
             if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
+                status.set("0");
                 return;
             }
             //如果住院天数小于2天则不判断该条规则
             if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(dischargeTime), (long) (48 * 60))) {
+                status.set("0");
                 return;
             }
             ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);

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

@@ -27,7 +27,10 @@ public class THR0140 extends QCCatalogue {
             return;
         }
         List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
-        List<ThreeLevelWardDoc> recordDoctorList = allDoctorWradDocs.stream().filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("记录医师"))).collect(Collectors.toList());
+        List<ThreeLevelWardDoc> recordDoctorList = allDoctorWradDocs
+                .stream()
+                .filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("记录医师")))
+                .collect(Collectors.toList());
         if (recordDoctorList.size() == 0) {
             status.set("0");
         }

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

@@ -9,7 +9,6 @@ import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -28,8 +27,10 @@ public class THR0144 extends QCCatalogue {
                 ThreeLevelWardDoc lastWardDoc = allDoctorWradDocs.get(allDoctorWradDocs.size() - 1);
                 Map<String, String> structureMap = lastWardDoc.getStructureMap();
                 String conditionRecord = structureMap.get("病情记录");
+                String treatmentPlan = structureMap.get("治疗计划和措施");
                 String title = structureMap.get("查房标题");
-                if (conditionRecord.contains("出院") && StringUtil.isNotBlank(title)
+                if ((conditionRecord.contains("出院") || treatmentPlan.contains("出院"))
+                        && StringUtil.isNotBlank(title)
                         && (CatalogueUtil.subTitle(title).contains(Content.attend) || CatalogueUtil.subTitle(title).contains(Content.director))) {
                     status.set("0");
                 }

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

@@ -304,5 +304,6 @@ public class Content {
             "yyyy/M/dH:m",
             "yyyy/MM/dd",
             "yyyy.MM.dd",
+            "yyyy-MM-ddHH:mm:ss.000",
     };
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouFirstPageRecordDocTrans.java

@@ -117,6 +117,10 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
             "血型=",
             "并发症=",
             "临床路径管理=",
+            "临床路径管理 1.完成 2.变异 3.退出 4.未入=临床路径管理",
+            "有无药物过敏=药物过敏",
+            "单病种管理 1.是 2.否=单病种管理",
+            "病人联系电话=现住址电话",
             "拟接收医疗机构名称=",
             "科主任=",
             "中成药费=",