Browse Source

手术词转换

zhoutg 4 years ago
parent
commit
a779ea8e74

+ 12 - 3
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -6,8 +6,11 @@ import com.diagbot.client.CRFServiceClient;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.StandConvertEnum;
 import com.diagbot.model.ai.AIAnalyze;
-import com.diagbot.model.entity.Medicine;
-import com.diagbot.model.label.*;
+import com.diagbot.model.label.ChiefLabel;
+import com.diagbot.model.label.DiagLabel;
+import com.diagbot.model.label.PastLabel;
+import com.diagbot.model.label.PresentLabel;
+import com.diagbot.model.label.VitalLabel;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.SearchData;
@@ -80,7 +83,7 @@ public class CommonFacade {
         if(ListUtil.isNotEmpty(pacs)){
             List<String> pacss_unique = pacs.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
                     .map(x ->x.getName()).collect(Collectors.toList());
-            standConvert.setLisList(pacss_unique);
+            standConvert.setPacsList(pacss_unique);
         }
 
         //所有药品
@@ -89,6 +92,12 @@ public class CommonFacade {
         drugList.addAll(CoreUtil.getPropertyList(presentLabel.getMedicines()));
         standConvert.setDrugList(drugList);
 
+        //所有手术
+        List<String> operationList = new ArrayList<>();
+        //1、现病史中的手术
+        operationList.addAll(CoreUtil.getPropertyList(presentLabel.getOperations()));
+        standConvert.setOperationList(operationList);
+
         //所有体征
         List<String> vitalList = new ArrayList<>();
         VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();

+ 1 - 0
src/main/java/com/diagbot/vo/StandConvert.java

@@ -19,4 +19,5 @@ public class StandConvert {
     private List<String> pacsList;
     private List<String> drugList;
     private List<String> vitalList;
+    private List<String> operationList;
 }