Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanThreeLevelWardDocTrans.java

@@ -67,8 +67,7 @@ public class QiYuanThreeLevelWardDocTrans extends ModelDocTrans {
             }
             //病程内容未解析出来 则在原始文本中获取病程内容
             addContent(sourceMap);
-            String text=sourceMap.get("原始文本");
-            String text1=sourceMap.get("病程内容");
+            sourceMap.put("病程内容",sourceMap.get("病程内容")+sourceMap.get("诊疗计划"));
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
 
             if (StringUtils.isEmpty(structureMap.get("查房日期"))) {