1.长兴入院记录structureMap不移除主诉、现病史等

2.长兴入院记录映射工作单位

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

@@ -51,6 +51,7 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "姓名++++患者姓名=姓名",
             "出生地++++出生地（住院）=出生地",
+            "工作单位++++工作单位地址=工作单位",
             "婚姻状况++++婚姻=婚姻",
             "联系电话=电话",
             "供史者++++病史叙述者=病史陈述者",

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

@@ -146,29 +146,29 @@ public class ModelDocGenerate {
         ChiefLabel chiefLabel = new ChiefLabel();
         chiefLabel.setText(structureMap.get("主诉"));
         beHospitalizedDoc.setChiefLabel(chiefLabel);
-        structureMap.remove("主诉");
+//        structureMap.remove("主诉");
 
         PresentLabel presentLabel = new PresentLabel();
         presentLabel.setText(structureMap.get("现病史"));
         beHospitalizedDoc.setPresentLabel(presentLabel);
-        structureMap.remove("现病史");
+//        structureMap.remove("现病史");
 
         PastLabel pastLabel = new PastLabel();
         pastLabel.setText(structureMap.get("既往史"));
         beHospitalizedDoc.setPastLabel(pastLabel);
-        structureMap.remove("既往史");
+//        structureMap.remove("既往史");
 
         PersonalLabel personalLabel = new PersonalLabel();
         personalLabel.setText(structureMap.get("个人史"));
         beHospitalizedDoc.setPersonalLabel(personalLabel);
-        structureMap.remove("个人史");
+//        structureMap.remove("个人史");
 
         MaritalLabel maritalLabel = new MaritalLabel();
         if (structureMap.get("婚育史") != null) {
             maritalLabel.setText("婚育史：" + structureMap.get("婚育史"));
         }
         beHospitalizedDoc.setMaritalLabel(maritalLabel);
-        structureMap.remove("婚育史");
+//        structureMap.remove("婚育史");
 
         MenstrualLabel menstrualLabel = new MenstrualLabel();
         if(structureMap != null && structureMap.get("月经史") != null){
@@ -180,42 +180,42 @@ public class ModelDocGenerate {
         }
         menstrualLabel.setText("月经史：" + structureMap.get("月经史"));
         beHospitalizedDoc.setMenstrualLabel(menstrualLabel);
-        structureMap.remove("月经史");
+//        structureMap.remove("月经史");
 
         FamilyLabel familyLabel = new FamilyLabel();
         familyLabel.setText(structureMap.get("家族史"));
         beHospitalizedDoc.setFamilyLabel(familyLabel);
-        structureMap.remove("家族史");
+//        structureMap.remove("家族史");
 
         VitalLabel vitalLabel = new VitalLabel();
         vitalLabel.setText(structureMap.get("体格检查"));
         beHospitalizedDoc.setVitalLabel(vitalLabel);
-        structureMap.remove("体格检查");
+//        structureMap.remove("体格检查");
 
         VitalLabelSpecial vitalLabelSpecial = new VitalLabelSpecial();
         vitalLabelSpecial.setText(structureMap.get("专科体格检查"));
         beHospitalizedDoc.setVitalLabelSpecial(vitalLabelSpecial);
-        structureMap.remove("专科体格检查");
+//        structureMap.remove("专科体格检查");
 
         PacsLabel pacsLabel = new PacsLabel();
         pacsLabel.setText(structureMap.get("辅助检查"));
         beHospitalizedDoc.setPacsLabel(pacsLabel);
-        structureMap.remove("辅助检查");
+//        structureMap.remove("辅助检查");
 
         DiagLabel initialDiagLabel = new DiagLabel();
         initialDiagLabel.setText(structureMap.get("初步诊断"));
         beHospitalizedDoc.setInitialDiagLabel(initialDiagLabel);
-        structureMap.remove("初步诊断");
+//        structureMap.remove("初步诊断");
 
         DiagLabel revisedDiagLabel = new DiagLabel();
         revisedDiagLabel.setText(structureMap.get("修正诊断"));
         beHospitalizedDoc.setRevisedDiagLabel(revisedDiagLabel);
-        structureMap.remove("修正诊断");
+//        structureMap.remove("修正诊断");
 
         DiagLabel suppleDiagLabel = new DiagLabel();
         suppleDiagLabel.setText(structureMap.get("补充诊断"));
         beHospitalizedDoc.setSuppleDiagLabel(suppleDiagLabel);
-        structureMap.remove("补充诊断");
+//        structureMap.remove("补充诊断");
 
         beHospitalizedDoc.setStructureMap(structureMap);