Merge branch 'beilun/dev-fqw' into beilun/dev

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuFirstCourseRecordDocTrans.java

@@ -81,20 +81,20 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
                 structureMap.put("主诊医师",temp);
                 structureMap.put("诊疗计划",structureMap.get("诊疗计划").split("诊疗方案")[0]);
             }
-            if(structureMap.get("诊疗计划").contains("诊疗计划")){
+            if(structureMap.get("诊疗计划").contains("诊疗计划") || structureMap.get("诊疗计划").contains("治疗计划")){
                 String temp=structureMap.get("诊疗计划");
                 List<String> titles = Lists.newArrayList("。","；","：");
                 for (String str: titles) {
                     String[] s=temp.split(str);
                     temp=s[0];
                 }
-                List<String> titles1 = Lists.newArrayList("经","主诊","同意","医师","确定","以下","诊疗计划","后","如下","审核");
+                List<String> titles1 = Lists.newArrayList("经","主诊","同意","医师","确定","以下","诊疗计划","后","如下","审核","治疗计划","医","确认");
                 for (String str:titles1) {
                     temp=temp.replaceAll(str,"");
                 }
                 structureMap.put("主诊医师",temp);
-                if(structureMap.get("诊疗计划").split("：").length>1){
-                    structureMap.put("诊疗计划",structureMap.get("诊疗计划").split("：")[1]);
+                if(structureMap.get("诊疗计划").split("1").length>1){
+                    structureMap.put("诊疗计划","1"+structureMap.get("诊疗计划").split("1")[1]);
                 }
             }
         }