Kaynağa Gözat

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

fangqw 4 yıl önce
ebeveyn
işleme
e66175a381

+ 3 - 3
trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuFirstCourseRecordDocTrans.java

@@ -67,14 +67,14 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
         //经主诊医师XXX同意后确定以下诊疗计划:......
         //......。以下诊疗方案由主诊医师/诊疗组长XXX确认
         if(StringUtils.isNotEmpty(structureMap.get("诊疗计划"))){
-            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[s.length-1];
                 }
-                List<String> titles1 = Lists.newArrayList("方案","由","组长","医师","主诊","诊疗","确认","审核");
+                List<String> titles1 = Lists.newArrayList("方案","由","组长","医师","主诊","诊疗","确认","审核","医生","规范","以上","经","审核","、","同意","1","2","3","4","副主任");
                 for (String str:titles1) {
                     temp=temp.replaceAll(str,"");
                 }
@@ -88,7 +88,7 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
                     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,"");
                 }