宁波中医院：规则变动

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

@@ -37,7 +37,7 @@ public class BEH0372 extends QCCatalogue {
             return;
         }
 
-        if (bhbasicInfoStatus.equals("未婚") && basicInfoStatus.contains("未婚")) {
+        if (bhbasicInfoStatus.equals("未婚") && (basicInfoStatus.contains("未婚") || basicInfoStatus.contains("未结婚"))) {
             status.set("0");
             return;
         }
@@ -55,12 +55,12 @@ public class BEH0372 extends QCCatalogue {
         }
 
         if ((bhbasicInfoStatus.equals("离婚") || bhbasicInfoStatus.equals("离异")) &&
-                (basicInfoStatus.contains("离异") || bhbasicInfoStatus.equals("离婚"))) {
+                (basicInfoStatus.contains("离异") || basicInfoStatus.equals("离婚"))) {
             status.set("0");
             return;
         }
 
-        if (bhbasicInfoStatus.equals("已婚") && (basicInfoStatus.contains("结婚") || basicInfoStatus.contains("再婚") || basicInfoStatus.contains("已婚") )) {
+        if (bhbasicInfoStatus.equals("已婚") && (basicInfoStatus.contains("结婚") || basicInfoStatus.contains("再婚") || basicInfoStatus.contains("已婚"))) {
             status.set("0");
             return;
         }

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

@@ -56,7 +56,7 @@ public class BEH0376 extends QCCatalogue {
         String maritalText = maritalLabel.getText();
         if (StringUtil.isNotBlank(maritalText)) {
             List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女", "详见原病历",
-                    "无子女","见旧病历","见既往病历");
+                    "无子女", "见旧病历", "见既往病历", "子女体健");
             for (String word : words) {
                 if (maritalText.contains(word)) {
                     status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/medicalwriting/MEDI03118.java

@@ -20,7 +20,7 @@ public class MEDI03118 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<InformedConsentDoc> informedConsentDocList = inputInfo.getInformedConsentDoc();
-        if (informedConsentDocList.size() == 0) {
+        if (informedConsentDocList == null || informedConsentDocList.size() == 0) {
             return;
         }
 

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

@@ -198,9 +198,6 @@ public class THR0127 extends QCCatalogue {
                 String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "一助");
                 title = title.replace("一助", doctorTitle);
             }
-            if(!"7".equals(Content.hospital_Id)){
-                recordDate = DateUtil.dateZeroClear(recordDate);
-            }
             if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {
                 recordTitle += title + ",";
                 dateList.add(recordDate);