查体推理分查体指标和查体结果，不能同时取

aipt-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -10,9 +10,10 @@ import lombok.Setter;
  */
 public enum FeatureTypeEnum implements KeyedNamed {
     Feature_Type_Symptom(1, "症状"),
-    Feature_Type_Past(1,"既往史"),
+    Feature_Type_Past(1, "既往史"),
     Feature_Type_Other(3, "其他史"),
-    Feature_Type_Vital(4, "查体"),
+    Feature_Type_Vital_Result(4, "查体结果"),
+    Feature_Type_Vital_Index(42, "查体指标"),
     Feature_Type_Lis(5, "化验"),
     Feature_Type_Pacs(6, "辅检"),
     Feature_Type_Disease(7, "诊断"),
@@ -55,4 +56,4 @@ public enum FeatureTypeEnum implements KeyedNamed {
     public String getName() {
         return name;
     }
-}
+}

aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -124,7 +124,8 @@ public class PushFacade {
             }
         }
         //查体 概念列表
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Result.getKey())) ||
+                featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Index.getKey()))) {
             List<FeatureRate> vital = data.getVitals();
             if (ListUtil.isNotEmpty(vital)) {
                 List<String> nameList = vital.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());

aipt-service/src/main/java/com/diagbot/web/PushController.java

@@ -77,7 +77,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
+                    "featureType：类型(必填)，1：症状，3：其他史，4：查体结果，42：查体指标，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果,String<br>" +
                     "adverseReactions：不良反应,List<不良反应明细><br>")

data-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -11,7 +11,8 @@ import lombok.Setter;
 public enum FeatureTypeEnum implements KeyedNamed {
     Symptom(1, "症状"),
     Other(3, "其他史"),
-    Vital(4, "查体"),
+    VitalResult(4, "查体结果"),
+    VitalIndex(42, "查体指标"),
     Lis(5, "化验"),
     Pacs(6, "辅检"),
     Disease(7, "诊断"),

data-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -56,7 +56,8 @@ public class PushFacade {
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Other.getKey()))) {
         }
         //查体
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Vital.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalResult.getKey())) ||
+                featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalIndex.getKey()))) {
             List<ConceptPushDTO> vitals = data.getVital();
             pushDTO.setVital(vitals);
         }

data-service/src/main/java/com/diagbot/web/PushController.java

@@ -47,7 +47,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
+                    "featureType：类型(必填)，1：症状，3：其他史，4：查体结果，42：查体指标，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
                     "diseaseName：取治疗方案的诊断,String<br>" +
                     "scaleName：量表名称,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +

icss-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -11,8 +11,9 @@ import lombok.Setter;
 public enum FeatureTypeEnum implements KeyedNamed {
     Symptom(1, "症状"),
     Other(3, "其他史"),
-    Vital(4, "查体"),
-    ModuleVital(41, "查体模板"),
+    VitalResult(4, "查体结果"),
+    VitalModule(41, "查体模板"),
+    VitalIndex(42, "查体指标"),
     Lis(5, "化验"),
     Pacs(6, "辅检"),
     Disease(7, "诊断"),

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -129,7 +129,8 @@ public class PushFacade {
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Other.getKey()))) {
         }
         //查体标记项
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Vital.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalResult.getKey())) ||
+                featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalIndex.getKey()))) {
             List<ConceptPushDTO> vitals = data.getVital();
             if (ListUtil.isNotEmpty(vitals)) {
                 List<ConceptPushDTO> vitalDTOList = addQuestionId(vitals, QuestionTypeEnum.Vital.getKey());
@@ -141,7 +142,7 @@ public class PushFacade {
             }
         }
         //查体模板
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.ModuleVital.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalModule.getKey()))) {
             ConceptPushDTO dept = data.getDept();
             List<QuestionPushDTO> moduleVitalDTO = getVitalModule(dept, pushVO);
             pushDTO.setModuleVital(moduleVitalDTO);

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -54,7 +54,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，41：查体模板，5：化验，6：辅检，7：诊断，22-指标,String<br>" +
+                    "featureType：类型(必填)，1：症状，3：其他史，4：查体结果，41：查体模板，42：查体指标（查体结果和查体指标不能同时取），5：化验，6：辅检，7：诊断，22-指标,String<br>" +
                     "patientId：病人id,Long<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果（预留字段，暂不用）,String<br>" +

ltapi-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -11,7 +11,8 @@ import lombok.Setter;
 public enum FeatureTypeEnum implements KeyedNamed {
     Symptom(1, "症状"),
     Other(3, "其他史"),
-    Vital(4, "查体"),
+    VitalResult(4, "查体结果"),
+    VitalIndex(42, "查体指标"),
     Lis(5, "化验"),
     Pacs(6, "辅检"),
     Disease(7, "诊断"),
@@ -54,4 +55,4 @@ public enum FeatureTypeEnum implements KeyedNamed {
     public String getName() {
         return name;
     }
-}
+}

ltapi-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -56,7 +56,8 @@ public class PushFacade {
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Other.getKey()))) {
         }
         //查体
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Vital.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalResult.getKey())) ||
+                featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalIndex.getKey()))) {
             List<ConceptPushDTO> vitals = data.getVital();
             pushDTO.setVital(vitals);
         }

ltapi-service/src/main/java/com/diagbot/web/PushController.java

@@ -47,7 +47,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
+                    "featureType：类型(必填)，1：症状，3：其他史，4：查体结果，42：查体指标，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
                     "diseaseName：取治疗方案的诊断,String<br>" +
                     "scaleName：量表名称,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +