手术解析、首次病程录诊疗计划

trans/src/main/java/com/lantone/qc/trans/changshaxy/FirstCourseRecordDocTrans.java

@@ -56,6 +56,17 @@ public class FirstCourseRecordDocTrans extends ModelDocTrans {
             if (structureMap.containsKey("诊疗计划") && structureMap.get("诊疗计划").contains("1.2.3.4.")) {
                 structureMap.put("诊疗计划", "");
             }
+            if (structureMap.containsKey("诊疗计划") && !structureMap.containsKey("记录医生")) {
+                String plan = structureMap.get("诊疗计划");
+                if(plan.contains("。")){
+                    String sign = plan.substring(plan.lastIndexOf("。") + 1).replace("　","").replace(" ","");
+                    if(StringUtil.isNotBlank(sign)){
+                        structureMap.put("记录医生",sign);
+                        structureMap.put("诊疗计划",structureMap.get("诊疗计划").split(sign)[0]);
+                    }
+                }
+            }
+
 
             if (StringUtil.isBlank(structureMap.get("诊断依据")) && StringUtil.isBlank(structureMap.get("鉴别诊断")) &&
                     StringUtil.isBlank(structureMap.get("初步诊断")) && StringUtil.isBlank(structureMap.get("病例分型"))) {

trans/src/main/java/com/lantone/qc/trans/changshaxy/util/XyFirstCourseRecordHtmlAnalysis.java

@@ -55,6 +55,9 @@ public class XyFirstCourseRecordHtmlAnalysis implements XyHtmlAnalysis {
             titles = CommonAnalysisUtil.sortTitles(titles, htmlContent);
             XyCommonAnalysisUtil.extractWardInfo(recTitle, htmlContent, structureMap);
             if (StringUtil.isNotBlank(htmlContent)) {
+                if(htmlContent.contains(" : ") || htmlContent.contains(" :") || htmlContent.contains("诊疗计划1")){
+                    htmlContent= htmlContent.replace("诊疗计划1", "诊疗计划：1").replace(" : ", "：").replace(" :", "：");
+                }
                 titles = XyCommonAnalysisUtil.sortTitles(titles, htmlContent);
                 XyCommonAnalysisUtil.cutByTitles(htmlContent, titles, 0, structureMap);
             }

trans/src/main/java/com/lantone/qc/trans/changshaxy/util/XyOperationRecordHtmlAnalysis.java

@@ -80,7 +80,7 @@ public class XyOperationRecordHtmlAnalysis implements XyHtmlAnalysis {
         }
 
         boolean symbol = false;
-        if(map.containsKey("实施手术") && map.containsKey(cutStr)){
+        if(map.containsKey("实施手术") && !map.containsKey("手术过程") &&  map.containsKey(cutStr)){
             String opStr = text.split("实施手术")[1];
             String substring = opStr.substring(opStr.indexOf(cutStr),opStr.indexOf(cutStr)+15);
             if(substring.contains("\n")){