Merge remote-tracking branch 'origin/his/chongqingshizhu_dev' into his/chongqingshizhu_dev

src/main/java/com/diagbot/facade/DataPageDockFacade.java

@@ -187,20 +187,19 @@ public class DataPageDockFacade {
         dataPageDockVO.setAge(sourceMap.get("年龄"));
         dataPageDockVO.setPatientId(sourceMap.get("门诊号"));
         dataPageDockVO.setChief(sourceMap.get("主诉"));
-        dataPageDockVO.setPasts(sourceMap.get("既往史"));
-        dataPageDockVO.setFamily(sourceMap.get("家族史"));
-        dataPageDockVO.setAllergy(sourceMap.get("过敏史"));
+        dataPageDockVO.setPasts(sourceMap.get("过去史"));
         dataPageDockVO.setSymptom(sourceMap.get("现病史"));
         dataPageDockVO.setVital(sourceMap.get("查体"));
         dataPageDockVO.setDiag(getItem(sourceMap.get("诊断")));
         dataPageDockVO.setDrug(getDrug(sourceMap.get("药品")));
+        dataPageDockVO.setDiseaseName(getDisease(sourceMap.get("诊断")));
     }
 
     private List<Drug> getDrug(String value) {
         Drug drug = new Drug();
         List<Drug> drugList = new ArrayList<>();
         drug.setName(value);
-        drug.setUniqueName(value);
+ //       drug.setUniqueName(value);
         drugList.add(drug);
         return drugList;
     }
@@ -209,12 +208,21 @@ public class DataPageDockFacade {
         Item item = new Item();
         List<Item> itemList = new ArrayList<>();
         item.setName(value);
-        item.setUniqueName(value);
+    //    item.setUniqueName(value);
         itemList.add(item);
         return itemList;
     }
 
 
+    private Item getDisease(String value) {
+        Item item = new Item();
+        item.setName(value);
+        // item.setUniqueName(value);
+ //       item.add(item);
+        return item;
+    }
+
+
     /**
      * @Description:病历推理
      * @Author:liuqq

src/main/java/com/diagbot/util/XmlUtil.java

@@ -166,9 +166,9 @@ public class XmlUtil {
         if (retMap.containsKey("性别")) {
             retMap.put("性别", retMap.get("性别").substring(retMap.get("性别").length() - 1));
         }
-        //过去史分解
-        List<String> pastTitles = Lists.newArrayList("既往史", "家族史", "过敏史");
-        structureMap(pastTitles, "既往史" + retMap.get("过去史"), retMap);
+       //过去史分解
+//        List<String> pastTitles = Lists.newArrayList("既往史", "家族史", "过敏史");
+//        structureMap(pastTitles, "既往史" + retMap.get("过去史"), retMap);
 
         //查体分解
         List<String> vitalTitles = Lists.newArrayList("查体", "诊断", "建议", "科室", "医师签名", "就诊时间", "处置");