chengyao %!s(int64=4) %!d(string=hai) anos
pai
achega
e606e7abac

+ 13 - 4
structure-center/src/main/java/com/lantone/structure/facade/tran/DailyCourseRecordTran.java

@@ -79,26 +79,35 @@ public class DailyCourseRecordTran extends TargetTran {
         if(!file.contains(flagStr) && file.contains("查房指出")){
             flagStr = "查房指出";
         }
+        if(!file.contains(flagStr) && file.contains("查房后指出:")){
+            flagStr = "查房后指出:";
+        }
+        if(!file.contains(flagStr) && file.contains("拟今予")){
+            flagStr = "拟今予";
+        }
         if(!file.contains(flagStr) && file.contains("今予")){
             flagStr = "今予";
         }
         if(!file.contains(flagStr) && file.contains("拟今日")){
-            flagStr = "拟今";
-        }
-        if(!file.contains(flagStr) && file.contains("拟今予")){
-            flagStr = "拟今予";
+            flagStr = "拟今日";
         }
         if(!file.contains(flagStr) && file.contains("继续予")){
             flagStr = "继续予";
         }
         if(file.contains(flagStr)){
             String doctorAdvice = file.substring(file.lastIndexOf(flagStr)+flagStr.length());
+            if(file.contains("拟今日")||file.contains("拟今予")){
+                 doctorAdvice = file.substring(file.lastIndexOf(flagStr));
+            }
             if(StringUtil.isNotEmpty(retMap.get("医师签名")) && doctorAdvice.contains(retMap.get("医师签名"))){
                 doctorAdvice = doctorAdvice.substring(0, doctorAdvice.lastIndexOf(retMap.get("医师签名")));
             }
                 if(doctorAdvice.endsWith(flag)){
                     doctorAdvice =  doctorAdvice.substring(0,doctorAdvice.lastIndexOf(flag));
                 }
+                if(doctorAdvice.contains("修正诊断")){
+                    doctorAdvice =  doctorAdvice.substring(0,doctorAdvice.lastIndexOf("修正诊断"));
+                }
                 if(doctorAdvice.contains("补充诊断")){
                     doctorAdvice =  doctorAdvice.substring(0,doctorAdvice.lastIndexOf("补充诊断"));
                 }