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

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

@@ -54,11 +54,14 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             //妇科日间出院医嘱部分特殊处理
-            List<String> titles1 = Lists.newArrayList("注意事项","随访安排","活动能力与生活自理情况"
+            List<String> titles1 = Lists.newArrayList("注意事项","医生办公室电话","随访安排","活动能力与生活自理情况"
                     ,"出院带药","出院去向");
-            String text1=(sourceMap.get("出院医嘱")).replaceAll("[0-9,、]","");
-            List<String> sortTitles1 = CommonAnalysisUtil.sortTitles(titles1, text1);
-            CommonAnalysisUtil.cutByTitles(text1, sortTitles1, 0, sourceMap);
+            String text1=sourceMap.get("出院医嘱");
+            if(text1!=null){
+                text1.replaceAll("[0-9,、]","");
+                List<String> sortTitles1 = CommonAnalysisUtil.sortTitles(titles1, text1);
+                CommonAnalysisUtil.cutByTitles(text1, sortTitles1, 0, sourceMap);
+            }
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);