完善

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

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