日常病程记录医嘱内容扩充

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

@@ -68,6 +68,16 @@ public class DailyCourseRecordTran extends TargetTran {
             if(ret.endsWith("//")){
                 flag = "//";
             }
+        if(file.contains("处理意见：")){
+            String doctorAdvice = file.substring(file.lastIndexOf("处理意见："));
+            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));
+                    retMap.put("医嘱内容",doctorAdvice);
+                }
+        }
             if(ret.endsWith(flag)){
                 ret =  ret.substring(0,ret.lastIndexOf(flag));
             }
@@ -82,7 +92,12 @@ public class DailyCourseRecordTran extends TargetTran {
             DailyCourseRecordLabel dailyCourseRecordLabel = dailyCourseRecordDocs.get(0).getDailyCourseRecordLabel();
             String doctorAdviceRecord = dailyCourseRecordLabel.getDoctorAdviceRecord();
             if(StringUtil.isNotEmpty(doctorAdviceRecord)){
-                rep.put("医嘱内容",doctorAdviceRecord);
+                if(StringUtil.isNotEmpty(rep.get("医嘱内容"))){
+                    String doctorAdvice = doctorAdviceRecord+" "+rep.get("医嘱内容");
+                    rep.put("医嘱内容",doctorAdvice);
+                }else{
+                    rep.put("医嘱内容",doctorAdviceRecord);
+                }
             }
         }
     }