体征回填

src/main/java/com/diagbot/enums/StandConvertEnum.java

@@ -16,7 +16,9 @@ public enum StandConvertEnum implements KeyedNamed {
     disease(3, "诊断"),
     drug(4, "药品"),
     clinical(5, "临床表现"),
-    operation(6, "手术");
+    operation(6, "手术"),
+    vital(7, "体征")
+    ;
 
     @Setter
     private int key;

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

@@ -7,10 +7,7 @@ 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.ChiefLabel;
-import com.diagbot.model.label.DiagLabel;
-import com.diagbot.model.label.PastLabel;
-import com.diagbot.model.label.PresentLabel;
+import com.diagbot.model.label.*;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.SearchData;
@@ -92,6 +89,13 @@ public class CommonFacade {
         drugList.addAll(CoreUtil.getPropertyList(presentLabel.getMedicines()));
         standConvert.setDrugList(drugList);
 
+        //所有体征
+        List<String> vitalList = new ArrayList<>();
+        VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();
+        vitalList.addAll(CoreUtil.getPropertyList(vitalLabel.getVitals()));
+        standConvert.setVitalList(vitalList);
+
+
         standConvert.setClinicalList(clinicalList);
         standConvert.setDiaglList(diagList);
         return standConvert;
@@ -104,6 +108,7 @@ public class CommonFacade {
         DiagLabel diagLabel = wordCrfDTO.getDiagLabel();
         List<Lis> lis = wordCrfDTO.getLis();
         List<Pacs> pacs = wordCrfDTO.getPacs();
+        VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();
 
         //症状回填
         CoreUtil.setPropertyList(chiefLabel.getClinicals(),map.get(StandConvertEnum.clinical.getKey()));
@@ -116,6 +121,8 @@ public class CommonFacade {
         CoreUtil.setPropertyList(lis,"name","detailName","uniqueName",map.get(StandConvertEnum.lis.getKey()));
         // TODO: 2020/8/5 辅助检查回填
         CoreUtil.setPropertyList(pacs,"name","uniqueName",map.get(StandConvertEnum.pacs.getKey()));
+        //体征回填
+        CoreUtil.setPropertyList(vitalLabel.getVitals(),map.get(StandConvertEnum.vital.getKey()));
     }
 
 }

src/main/java/com/diagbot/model/entity/Vital.java

@@ -1,22 +1,22 @@
-package com.diagbot.model.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @ClassName com.lantone.util.module.Vital
- * @Description TODO
- * @Author Mark Huang
- * @Date 2019/1/21/021 11:38
- * @Version 1.0
- **/
-@Getter
-@Setter
-public class Vital {
-    private String vitalName;
-    private BodyPart bodyPart;
-    private Degree degree;
-    private Negative negative;
-    private String value;
-    private PD pd;
-}
+package com.diagbot.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName com.lantone.util.module.Vital
+ * @Description TODO
+ * @Author Mark Huang
+ * @Date 2019/1/21/021 11:38
+ * @Version 1.0
+ **/
+@Getter
+@Setter
+public class Vital extends General{
+//    private String vitalName;
+    private BodyPart bodyPart;
+    private Degree degree;
+    private Negative negative;
+    private String value;
+    private PD pd;
+}

src/main/java/com/diagbot/model/label/VitalLabel.java

@@ -1,6 +1,7 @@
 package com.diagbot.model.label;
 
 import com.diagbot.model.entity.Vital;
+import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
  * @Author : 楼辉荣
  * @Date: 2020-03-03 18:49
  */
+@Data
 public class VitalLabel extends GeneralLabel{
     private List<Vital> vitals = new ArrayList<>();
 }

src/main/java/com/diagbot/vo/StandConvert.java

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