Merge remote-tracking branch 'origin/master'

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

@@ -86,16 +86,20 @@ public class CommonFacade {
             standConvert.setPacsList(pacss_unique);
         }
 
-        //所有药品
+        //所有药品(现病史、既往史)
         List<String> drugList = new ArrayList<>();
         //1、现病史中的药品
         drugList.addAll(CoreUtil.getPropertyList(presentLabel.getMedicines()));
+        //2、既往史(药物过敏)
+        drugList.addAll(CoreUtil.getPropertyList(pastLabel.getAllergyMedicines()));
         standConvert.setDrugList(drugList);
 
-        //所有手术
+        //所有手术(现病史、既往史)
         List<String> operationList = new ArrayList<>();
         //1、现病史中的手术
         operationList.addAll(CoreUtil.getPropertyList(presentLabel.getOperations()));
+        //2、既往史中的手术
+        operationList.addAll(CoreUtil.getPropertyList(pastLabel.getOperations()));
         standConvert.setOperationList(operationList);
 
         //所有体征
@@ -114,6 +118,7 @@ public class CommonFacade {
     public void dataTypeSet(WordCrfDTO wordCrfDTO, Map<Integer, Map<String, String>> map){
         ChiefLabel chiefLabel = wordCrfDTO.getChiefLabel();
         PresentLabel presentLabel = wordCrfDTO.getPresentLabel();
+        PastLabel pastLabel = wordCrfDTO.getPastLabel();
         DiagLabel diagLabel = wordCrfDTO.getDiagLabel();
         List<Lis> lis = wordCrfDTO.getLis();
         List<Pacs> pacs = wordCrfDTO.getPacs();
@@ -126,6 +131,7 @@ public class CommonFacade {
         CoreUtil.setPropertyList(diagLabel.getDiags(),map.get(StandConvertEnum.disease.getKey()));
         //药品回填
         CoreUtil.setPropertyList(presentLabel.getMedicines(),map.get(StandConvertEnum.drug.getKey()));
+        CoreUtil.setPropertyList(pastLabel.getAllergyMedicines(),map.get(StandConvertEnum.drug.getKey()));
         // TODO: 2020/8/5 化验回填
         CoreUtil.setPropertyList(lis,"name","detailName","uniqueName",map.get(StandConvertEnum.lis.getKey()));
         // TODO: 2020/8/5 辅助检查回填
@@ -134,6 +140,7 @@ public class CommonFacade {
         CoreUtil.setPropertyList(vitalLabel.getVitals(),map.get(StandConvertEnum.vital.getKey()));
         //手术回填
         CoreUtil.setPropertyList(presentLabel.getOperations(),map.get(StandConvertEnum.operation.getKey()));
+        CoreUtil.setPropertyList(pastLabel.getOperations(),map.get(StandConvertEnum.operation.getKey()));
     }
 
 }

src/main/java/com/diagbot/model/ai/process/EntityProcessPast.java

@@ -80,6 +80,7 @@ public class EntityProcessPast extends EntityProcess {
             for (Lemma lemma : operationHistoryLemmas) {
                 Operation operation = new Operation();
                 operation.setName(lemma.getText().replaceAll("[“”]",""));
+                operation.setStandName(lemma.getText().replaceAll("[“”]",""));
                 if (lemma.isHaveChildren()) {
                     operation.setNegative(findNegative(lemma));//阴性
                 }