Merge branch 'beilun/dev-fqw' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0025.java

@@ -63,14 +63,16 @@ public class BEH0025 extends QCCatalogue {
         //规则硬匹配
         String pastLabelText = pastLabel.getText();
         if (pastLabelText.contains("手术") || pastLabelText.contains("详见原病历")
-                || pastLabelText.contains("体外碎石") || pastLabelText.contains("术后")) {
+                || pastLabelText.contains("体外碎石") || pastLabelText.contains("术后")
+                || pastLabelText.matches(".*行.*术.*")) {
             status.set("0");
         }
         //现病史里出现手术记录也不报
         PresentLabel presentLabel=inputInfo.getBeHospitalizedDoc().getPresentLabel();
         String presentText=presentLabel.getText();
         if(presentText.contains("手术") || presentText.contains("详见原病历")
-                || presentText.contains("体外碎石") || presentText.contains("术后")){
+                || presentText.contains("体外碎石") || presentText.contains("术后")
+                || presentText.matches(".*行.*术.*")){
             status.set("0");
         }
     }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -55,13 +55,14 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
             CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
-            Map<String, String> addEntry = Maps.newHashMap();
+            //产科生的孩子的性别
+            /*Map<String, String> addEntry = Maps.newHashMap();
             sourceMap.forEach((k, v) -> {
                 if (("男").equals(v) || ("男性").equals(v) || ("女").equals(v) || ("女性").equals(v)) {
                     addEntry.put("性别", v);
                 }
             });
-            sourceMap.putAll(addEntry);
+            sourceMap.putAll(addEntry);*/
             //妇科日间出院医嘱部分特殊处理
             List<String> titles1 = Lists.newArrayList("注意事项", "医生办公室电话", "随访安排", "活动能力与生活自理情况"
                     , "出院带药", "出院去向");
@@ -128,10 +129,6 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                 String value = sourceMap.get("个人史").split("月经史")[0];
                 sourceMap.put("个人史", value);
             }
-            //小儿外科(住)现病史去除多余字段
-            if (sourceMap.containsKey("现病史")) {
-                sourceMap.put("现病史", sourceMap.get("现病史").replace("以上病史确认无误，家属签字：　　　　　签字时间：　　　年　　　月　　　日", ""));
-            }
 
             //入院记录标题部分解析不出的  婚姻和民族处理
             //注意中间的空格是什么字符