上级医师查房记录补充

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

@@ -48,15 +48,15 @@ public class PreoperativeDiscussionTran extends TargetTran {
                 text
         );
         CommonAnalysisUtil.cutByTitles(text, titles, 0, sourceMap);
-        if(sourceMap.containsKey("手术方式") ){
+        if(sourceMap.containsKey("手术方式") || sourceMap.containsKey("术前诊断") ){
             sourceMap.remove("手术方式");
+            sourceMap.remove("术前诊断");
         }
         return sourceMap;
     }
 
 
     private List<String> stagesContrasts = Lists.newArrayList(
-            "简要病情=诊断依据",
             "手术指征=手术指征",
             "手术指征=手术适应证",
             "手术禁忌=手术禁忌症",
@@ -77,6 +77,7 @@ public class PreoperativeDiscussionTran extends TargetTran {
         if(StringUtil.isNotEmpty(retMap.get("简要病情"))) {
             String simCaseRet = retMap.get("简要病情");
             retMap.put("病历摘要",simCaseRet);
+            retMap.put("诊断依据",simCaseRet);
             if(StringUtil.isNotEmpty(retMap.get("入院后辅助检查"))) {
                 retMap.put("病历摘要",simCaseRet+" "+"入院后辅助检查:"+retMap.get("入院后辅助检查"));
             }
@@ -144,9 +145,16 @@ public class PreoperativeDiscussionTran extends TargetTran {
             }else{
                 trim = oprationDoc.split("\n")[0].trim();
             }
-            if(StringUtil.isNotEmpty(trim)){
-                retMap.put("手术审批医师",trim);
+            if(StringUtil.isNotEmpty(trim) && (trim.contains("年") || trim.contains("-"))){
+                String trimDate = extractDate(trim);
+                if(StringUtil.isNotEmpty(trimDate)){
+                    trim = oprationDoc.substring(0, oprationDoc.indexOf(trim)).trim();
+                }else{
+                    trim = oprationDoc.substring(0, oprationDoc.indexOf("年")).trim();
+                }
             }
+                retMap.put("手术审批医师",trim);
+
             if(StringUtil.isEmpty(retMap.get("手术审批医师").trim())){
                 retMap.remove("手术审批医师");
             }