1.入院记录-入院记录（心内含系统回顾）-1模板修改映射

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -55,8 +55,10 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "婚姻状况++++婚姻=婚姻",
             "联系电话=电话",
             "供史者++++病史叙述者=病史陈述者",
+            "++++病史叙述者=病史陈述者",
             "婚育史:=婚育史",
             "外生殖器++++外生殖器文本框=",
+            "户口地址=联系地址",
             "职业++++首页职业新=职业"
     );
 

trans/src/main/java/com/lantone/qc/trans/comsis/ModelDocGenerate.java

@@ -171,10 +171,13 @@ public class ModelDocGenerate {
 //        structureMap.remove("婚育史");
 
         MenstrualLabel menstrualLabel = new MenstrualLabel();
-        if(structureMap != null && structureMap.get("月经史") != null){
+        if(structureMap.get("月经史") != null){
             if(structureMap.get("月经史").contains("月 经 史")){
-                String text = structureMap.get("月经史");
-                structureMap.put("月经史",text.replace("月 经 史","").replace(":","").replace("：",""));
+                String text = structureMap.get("月经史").replaceAll("月 经 史|:|：","");
+                if (text.startsWith("，")){
+                    text = text.substring(1);
+                }
+                structureMap.put("月经史",text);
             }
 
         }