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

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

@@ -23,24 +23,15 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
         Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
-        String tgjc = sourceMap.get("一般情况") + "。"
-                + sourceMap.get("皮肤情况") + "。"
-                + sourceMap.get("淋巴") + "。"
-                + sourceMap.get("头部检查") + "。"
-                + sourceMap.get("颈部") + "。"
-                + sourceMap.get("胸部检查") + "。"
-                + sourceMap.get("肺部检查") + "。"
-                + sourceMap.get("心脏检查") + "。"
-                + sourceMap.get("血管") + "。"
-                + sourceMap.get("腹部检查") + "。"
-                + sourceMap.get("外生殖器") + "。"
-                + sourceMap.get("直肠肛门") + "。"
-                + sourceMap.get("四肢脊柱检查") + "。"
-                + sourceMap.get("神经系统检查") + "。"
-                + sourceMap.get("其他说明") + "。";
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        if (StringUtil.isNotBlank(tgjc)) {
-            structureMap.put("专科体格检查", tgjc);
+        String specialCheck = structureMap.get("专科检查");
+        if (StringUtil.isNotBlank(specialCheck)) {
+            structureMap.put("专科体格检查", specialCheck);
+        } else {
+            String tgjc = concatSpecialCheck(sourceMap);
+            if (StringUtil.isNotBlank(tgjc)) {
+                structureMap.put("专科体格检查", tgjc);
+            }
         }
         BeHospitalizedDoc beHospitalizedDoc = ModelDocGenerate.beHospitalizedDocGen(structureMap);
         beHospitalizedDoc.setText(content);
@@ -48,6 +39,25 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
         return beHospitalizedDoc;
     }
 
+
+    private String concatSpecialCheck(Map<String, String> sourceMap) {
+        return concatString(sourceMap.get("一般情况")) +
+                concatString(sourceMap.get("皮肤情况")) +
+                concatString(sourceMap.get("淋巴")) +
+                concatString(sourceMap.get("头部检查")) +
+                concatString(sourceMap.get("颈部")) +
+                concatString(sourceMap.get("胸部检查")) +
+                concatString(sourceMap.get("肺部检查")) +
+                concatString(sourceMap.get("心脏检查")) +
+                concatString(sourceMap.get("血管")) +
+                concatString(sourceMap.get("腹部检查")) +
+                concatString(sourceMap.get("外生殖器")) +
+                concatString(sourceMap.get("直肠肛门")) +
+                concatString(sourceMap.get("四肢脊柱检查")) +
+                concatString(sourceMap.get("神经系统检查")) +
+                concatString(sourceMap.get("其他说明"));
+    }
+
     private List<String> keyContrasts = Lists.newArrayList(
             "姓名++++患者姓名=姓名",
             "出生地++++出生地（住院）=出生地",
@@ -56,10 +66,21 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "联系电话=电话",
             "供史者++++病史叙述者=病史陈述者",
             "++++病史叙述者=病史陈述者",
+            "病史叙述者=病史陈述者",
             "婚育史:=婚育史",
             "外生殖器++++外生殖器文本框=",
             "户口地址=联系地址",
+            "家庭住址++++现住址=现住址",
+            "产次++++产=产次",
             "职业++++首页职业新=职业"
     );
 
+    private String concatString(String item) {
+        if (StringUtil.isBlank(item)) {
+            return "";
+        } else {
+            return item + "。";
+        }
+    }
+
 }

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

@@ -40,7 +40,9 @@ public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
         }
         Map<String, String> cutWordMap = Preproc.getCutWordMap(true, sourceTitles, text);
         cutWordMap.putAll(structureMap);
-
+        if(StringUtil.isNotBlank(structureMap.get("输注种类、血型、数量"))){
+            cutWordMap.put("输血成分及数量",structureMap.get("输注种类、血型、数量"));
+        }
 
         ClinicalBloodDoc clinicalBloodDoc = ModelDocGenerate.clinicalBloodDocGen(cutWordMap);
         clinicalBloodDoc.setText(text);

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

@@ -62,6 +62,12 @@ public class ChangxDifficultCaseDiscussDocTrans extends ModelDocTrans {
             "结论"
     );
 
-    private List<String> keyContrasts = Lists.newArrayList();
+    private List<String> keyContrasts = Lists.newArrayList(
+          "讨论日期=讨论时间",
+          "人员及专业技术职务++++专业技术职务=参加人员及职称医生",
+          "患者病情汇报=简要病情",
+          "讨论结果++++主持人小结意见=结论",
+          "签名++++=签名"
+    );
 
 }

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

@@ -384,12 +384,10 @@ public class ModelDocGenerate {
         DiagLabel beDiagLabel = new DiagLabel();
         beDiagLabel.setText(structureMap.get("入院诊断"));
         leaveHospitalDoc.setBeHospitalizedLabel(beDiagLabel);
-        structureMap.remove("入院诊断");
 
         DiagLabel leaveDiagLabel = new DiagLabel();
         leaveDiagLabel.setText(structureMap.get("出院诊断"));
         leaveHospitalDoc.setLeaveDiagLabel(leaveDiagLabel);
-        structureMap.remove("出院诊断");
 
         leaveHospitalDoc.setStructureMap(structureMap);