1、新增返回体征指标推送项

nlp/src/test/java/org/diagbot/nlp/test/ConceptTest.java

@@ -42,13 +42,14 @@ public class ConceptTest {
     private static final String zdyjqd_path = "E:\\git\\docs\\医学知识库\\诊断依据\\全部依据\\其他有问题的词\\诊断依据问题词0701.xlsx";
     private static final String pacsresult_path = "E:\\git\\docs\\医学知识库\\诊断依据\\全部依据\\其他有问题的词\\诊断依据问题词0702.xlsx";
     private static final String lisresult_path = "E:\\git\\docs\\医学知识库\\化验\\化验结果_诊断依据0702.xlsx";
+    private static final String vital_result_index_path = "E:\\git\\docs\\医学知识库\\体征\\体征结果映射关系.xlsx";
 
     public static void main(String[] args) {
         try {
 //            insertSymptom();
 //            insertPushSymptom();
 //            insertPart();
-            insertVital();
+//            insertVital();
 //            insertLis();
 //            insertLisResult();
 //            insertPacs();
@@ -65,6 +66,7 @@ public class ConceptTest {
 //            insertZdyjQt();
 
 //            insertRelationSymptom();
+            insertVitalResultIndex();
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -186,6 +188,10 @@ public class ConceptTest {
         insertOneColumn(lisresult_path, 4, "14", "化验结果");
     }
 
+    public static void insertVitalResultIndex() throws Exception {
+        insertOneColumn(vital_result_index_path, 1, "33", "体征指标");
+    }
+
     public static void insertOneColumn(String path, int columnIndex, String typeId, String typeName) throws Exception {
         insertOneColumn(0, path, columnIndex, typeId, typeName);
     }

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -122,10 +122,7 @@ public class AlgorithmController extends BaseController {
         Response<ResponseData> response = new Response();
         AlgorithmCore core = new AlgorithmCore();
         ResponseData bigDataResponseData = core.algorithm(request, searchData);
-        Map<String, String> vitalCache = CacheUtil.getVitalCache();
-        LisPacsCalculate lisPacsCalculate = new LisPacsCalculate();
-        String[] featureArray = StringUtils.split(searchData.getFeatureType(), ",");
-        List<String> featureList = Arrays.asList(featureArray);
+
         GraphCalculate graphCalculate = new GraphCalculate();
         ResponseData graphResponseData = graphCalculate.calculate(request, searchData);
         if (graphResponseData.getDis().size() > 0) {
@@ -178,18 +175,23 @@ public class AlgorithmController extends BaseController {
         bigDataResponseData.setManagementEvaluation(graphResponseData.getManagementEvaluation());
         //知识图谱直接替换大数据中的检验检查数据
 //        if(searchData.getDiag() !=null || searchData.getPushDiags() != null){
+        LisPacsCalculate lisPacsCalculate = new LisPacsCalculate();
         graphResponseData = lisPacsCalculate.getLisPacs(request, searchData);
+
+        bigDataResponseData.setLabs(graphResponseData.getLabs());
+        bigDataResponseData.setPacs(graphResponseData.getPacs());
+//        }
+        //体征结果和指标推送
+        Map<String, String> vitalCache = CacheUtil.getVitalCache();
+        List<String> featureList = Arrays.asList(searchData.getFeatureTypes());
         List<FeatureRate> vitals = graphResponseData.getVitals();
-        if(featureList.contains("42")){
+        if(featureList.contains(Constants.feature_type_vital_index)){
             bigDataResponseData.setVitals(this.getVital(vitalCache,vitals));
 
         }
-        if(featureList.contains("3")){
+        if(featureList.contains(Constants.feature_type_vital)){
             bigDataResponseData.setVitals(vitals);
         }
-        bigDataResponseData.setLabs(graphResponseData.getLabs());
-        bigDataResponseData.setPacs(graphResponseData.getPacs());
-//        }
         response.setData(bigDataResponseData);
         return response;
     }