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

# Conflicts:
#	trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

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

@@ -27,6 +27,7 @@ public class BEH02902 extends QCCatalogue {
         }
 
         String pacsText = inputInfo.getBeHospitalizedDoc().getStructureMap().get("辅助检查");
+        String pacsText1 = inputInfo.getBeHospitalizedDoc().getStructureMap().get("特殊检查");
         if (StringUtil.isBlank(pacsText)) {
             status.set("0");
             return;
@@ -36,6 +37,10 @@ public class BEH02902 extends QCCatalogue {
             status.set("0");
             return;
         }
+        if (StringUtil.isNotBlank(pacsText1) && (pacsText1.contains("医院") )) {
+            status.set("0");
+            return;
+        }
 
         PacsLabel pacsLabel = inputInfo.getBeHospitalizedDoc().getPacsLabel();
         if (pacsLabel == null || StringUtil.isBlank(pacsLabel.getText())) {

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

@@ -26,6 +26,7 @@ public class BEH02903 extends QCCatalogue {
         }
 
         String pacsText = inputInfo.getBeHospitalizedDoc().getStructureMap().get("辅助检查");
+        String pacsText1 = inputInfo.getBeHospitalizedDoc().getStructureMap().get("特殊检查");
         if (StringUtil.isBlank(pacsText)) {
             status.set("0");
             return;
@@ -35,6 +36,10 @@ public class BEH02903 extends QCCatalogue {
             status.set("0");
             return;
         }
+        if (StringUtil.isNotBlank(pacsText1) && (pacsText1.contains("20") )) {
+            status.set("0");
+            return;
+        }
 
         PacsLabel pacsLabel = inputInfo.getBeHospitalizedDoc().getPacsLabel();
         if (pacsLabel == null) {

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

@@ -288,8 +288,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
                     "术前特殊准备", "心理状态", "经济评估", "主要术中、术后风险及防范措施", "术中、术后注意事项（含护理事项）",
                     "一：经治医师汇报病史", "二：讨论目的", "三：讨论");
             String text = sourceMap.get("原始文本").replaceAll("[0-9:.]", "");
-            List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
-            CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
+            List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
+            CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts, modeId);