北仑修改禅道bug

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

@@ -32,13 +32,13 @@ public class BEH0046 extends QCCatalogue {
             return;
         }
         PersonalLabel personalLabel = inputInfo.getBeHospitalizedDoc().getPersonalLabel();
-        String personalText = personalLabel.getText();
-        if (personalLabel == null || StringUtil.isBlank(personalText)) {
+        if (personalLabel == null) {
             status.set("0");
             return;
         }
-        if (StringUtil.isNotBlank(personalText) && (personalText.contains("偶有") || personalText.contains("烟")
-                || personalText.contains("详见原病历"))) {
+        String personalText = personalLabel.getText();
+        if (StringUtil.isBlank(personalText) || personalText.contains("偶有") || personalText.contains("烟")
+                || personalText.contains("详见原病历")) {
             status.set("0");
             return;
         }

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

@@ -36,7 +36,7 @@ public class BEH0053 extends QCCatalogue {
         }
         //硬规则 匹配未婚
         String marry = beHospitalizedDoc.getStructureMap().get(Content.marry);
-        if(StringUtil.isBlank(marry)){
+        if (StringUtil.isBlank(marry)) {
             marry = beHospitalizedDoc.getStructureMap().get("婚姻状况");
         }
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
@@ -45,7 +45,8 @@ public class BEH0053 extends QCCatalogue {
             return;
         }
         String maritalText = maritalLabel.getText();
-        if ("未婚".equals(marry) || maritalText.contains("未婚") || maritalText.contains("详见原病历")) {
+        if ("未婚".equals(marry) || maritalText.contains("未婚") || maritalText.contains("详见原病历")
+                || maritalText.contains("离婚") || maritalText.contains("离异") || maritalText.contains("适龄结婚")) {
             status.set("0");
             return;
         }

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

@@ -34,9 +34,13 @@ public class FIRC0092 extends QCCatalogue {
             findText = true;
         }
 
-        Map<String,String> structureMap = firstCourseRecordDoc.getStructureMap();
-        String structureV= structureMap.get("诊疗计划");
-        if(StringUtil.isNotBlank(structureV) && structureV.contains("护理")){
+        Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
+        String structureV = structureMap.get("诊疗计划");
+        if (StringUtil.isBlank(structureV) && StringUtil.isBlank(text)) {
+            status.set("0");
+            return;
+        }
+        if (StringUtil.isNotBlank(structureV) && structureV.contains("护理")) {
             findText = true;
         }
         if ((treatPlanLabel.getNursingLevel() != null || findText) &&

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunFirstCourseRecordHtmlAnalysis.java

@@ -25,8 +25,8 @@ public class BeiLunFirstCourseRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
         try {
             List<String> titles = Lists.newArrayList("（一）病历特点", "（二）诊断依据", "（三）鉴别诊断",
-                    "（四）初步诊断", "（五）诊疗计划", "（二）拟诊讨论", "（三）诊疗计划", "心理治疗",
-                    "疼痛治疗", "营养治疗", "康复治疗", "VTE预防", "医生签名");
+                    "（四）初步诊断", "（五）诊疗计划", "（二）拟诊讨论", "（三）诊疗计划", "心理治疗", "（五）疼痛评估",
+                    "疼痛治疗", "营养治疗", "康复治疗", "VTE预防", "医生签名", "（六）诊疗计划");
             String html = args[0];
             String recTitle = args[1];
             Document doc = Jsoup.parse(html);