bug修改

structure-center/src/main/java/com/lantone/structure/facade/tran/FirstCourseRecordTran.java

@@ -35,8 +35,8 @@ public class FirstCourseRecordTran extends TargetTran {
     }
 
     private List<String> stagesContrasts = Lists.newArrayList(
-            "姓名=患者姓名"
-
+            "姓名=患者姓名",
+            "入院诊断=鉴别诊断-西医诊断名称"
     );
     private Map<String, String> cutWord(String text) {
         Map<String, String> sourceMap = Maps.newHashMap();
@@ -135,6 +135,8 @@ public class FirstCourseRecordTran extends TargetTran {
             }
 
          if(text.contains("诊疗计划：")){
+             String plan = retMap.get("诊疗计划");
+             plan = text.substring(text.lastIndexOf("诊疗计划：") + "诊疗计划：".length());
             String str = text.substring(text.lastIndexOf("诊疗计划：") + "诊疗计划：".length());
             String flagName = "";
              if(str.contains("\n")){
@@ -152,7 +154,6 @@ public class FirstCourseRecordTran extends TargetTran {
                              }
                          }
                      }
-                     String plan = retMap.get("诊疗计划");
                      if(StringUtil.isNotEmpty(flagName) && plan.contains(flagName)){
                           plan = plan.substring(0, plan.lastIndexOf(flagName));
                          retMap.put("诊疗计划",plan);
@@ -162,7 +163,7 @@ public class FirstCourseRecordTran extends TargetTran {
          }
 
          StringBuffer sb = new StringBuffer();
-            if(text.contains("鉴别诊断：")){
+            if(StringUtil.isEmpty(retMap.get("入院诊断")) && text.contains("鉴别诊断：")){
                 String str = text.substring(text.lastIndexOf("鉴别诊断：") + "鉴别诊断：".length());
                 if(str.contains("问题小结：")){
                     str = str.split("问题小结：")[0];
@@ -196,8 +197,8 @@ public class FirstCourseRecordTran extends TargetTran {
                     String firStr = retMap.get("鉴别诊断");
                     retMap.put("鉴别诊断-西医诊断名称",firStr);
                 }
-                retMap.remove("鉴别诊断");
             }
+            retMap.remove("鉴别诊断");
         }
     }
 

structure-center/src/main/java/com/lantone/structure/facade/tran/OperationDiscussionTran.java

@@ -89,14 +89,12 @@ public class OperationDiscussionTran extends TargetTran {
             flagTitle = "诊断为";
         }
 
-        String flagTitleFir = "探查：";
-        if(text.contains("分析病历特点：")){
-            flagTitleFir = "分析病历特点：";
-        }if(text.contains("查房：")){
+        String flagTitleFir = "分析病历特点：";
+         if(text.contains("查房：")){
             flagTitleFir = "查房：";
         }if(text.contains("查房后指出")){
             flagTitleFir = "查房后指出";
-        } if(text.contains("术中诊断")){
+        }if(text.contains("术中诊断")){
             flagTitleFir = "术中诊断";
         }
         String flagTitleSec = "诊疗计划";
@@ -124,6 +122,9 @@ public class OperationDiscussionTran extends TargetTran {
                 if(strSec.contains("/")){
                     strSec = strSec.substring(0,strSec.indexOf("/"));
                 }
+                if(strSec.contains("。今")){
+                    strSec = strSec.substring(0,strSec.indexOf("。今"));
+                }
                 if(StringUtil.isNotEmpty(strSec)){
                     retMap.put("注意事项",strSec);
                 }