推送诊断代码迁移

graph-web/src/main/java/org/diagbot/graphWeb/work/DiseaseCalculate.java

@@ -9,9 +9,13 @@ import org.diagbot.pub.utils.http.HttpApi;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 推送诊断和治疗方案
+ */
 public class DiseaseCalculate {
     public ResponseData getDisease(HttpServletRequest request, SearchData searchData) throws Exception {
         ResponseData responseData = new ResponseData();
@@ -20,6 +24,7 @@ public class DiseaseCalculate {
         HttpApi<ResponseData> api = new HttpApi<>();
         ResponseData diseaseResponse = api.doPost(propertiesUtil.getProperty("disease.http.url"), searchData,
                 ResponseData.class);
+        //走诊断推送
         List<FeatureRate> dis = (List<FeatureRate>)diseaseResponse.getDis();
         List<FeatureRate> diseaseName = new ArrayList<>();
         for (FeatureRate d:dis) {
@@ -29,6 +34,11 @@ public class DiseaseCalculate {
             featureRate.setDesc(d.getDesc());
             featureRate.setRate(d.getRate());
             diseaseName.add(featureRate);
+        }
+        //走治疗推送
+        String webDiag = searchData.getDiag();
+        if(webDiag.trim()!=null && Arrays.asList(searchData.getFeatureTypes()).contains("8")){
+
         }
         responseData.setDis(diseaseName);
         return responseData;

graph-web/src/main/resources/url.properties

@@ -1,5 +1,5 @@
-highrisk.http.url=http://192.168.3.112:5004/knowledge/getHighRisk
+#highrisk.http.url=http://192.168.3.112:5004/knowledge/getHighRisk
 lisPacs.http.url=http://192.168.2.234:5004/knowledge/getLisPacs
-disease.http.url=http://192.168.3.112:5004/knowledge/getDisease
+#disease.http.url=http://192.168.3.112:5004/knowledge/getDisease
 #lisPacs.http.url=http://192.168.3.9:5004/knowledge/getLisPacs
 #highrisk.http.url=http://192.168.3.9:5004/knowledge/getHighRisk

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -22,6 +22,8 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import java.math.RoundingMode;
+import java.text.NumberFormat;
 import java.util.*;
 
 
@@ -261,11 +263,19 @@ public class KnowledgeServiceImpl implements KnowledgeService {
                 FeatureRate featureRate = new FeatureRate();
                 featureRate.setFeatureName(quezhen);
                 featureRate.setExtraProperty("");
+                if("低血糖反应".equals(quezhen) || "胃肠道不良反应".equals(quezhen)){
+                    featureRate.setDesc("不良反应");
+                }
                 featureRate.setDesc("");
                 featureRate.setRate("neo4j");
                 featureRates.add(featureRate);
             }
         }
+        String webDiag = searchData.getDiag();
+        if(webDiag.trim()!=null && Arrays.asList(searchData.getFeatureTypes()).contains("8")){
+            processTreat(featureRates,webDiag,ss);
+        }
+
         responseData.setDis(featureRates);
         return responseData;
     }
@@ -296,7 +306,6 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             }
         }
         logger.info("界面诊断为: " + webDiagList);
-        logger.info("推出的诊断合并为: " + bigdataDiagList);
         Map<String, Set<String>> weblisPacs =null;
         Map<String, Set<String>> biglisPacs =null;
         if(webDiagList !=null && webDiagList.size()>0){
@@ -367,6 +376,24 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         return lisPacsMap;
     }
 
+    /**
+     * 处理治疗
+     * @param featureRateList
+     */
+    public void processTreat(List<FeatureRate> featureRateList,String webDisease,Set inputFilds){
+        NumberFormat nf = NumberFormat.getPercentInstance();
+        nf.setMinimumFractionDigits(0);//设置该百分比数字，保留2位小数;
+        nf.setRoundingMode(RoundingMode.HALF_UP); //设置满5向上进位，即四舍五入;
+        String[] diseaseArray = webDisease.split(",|，|、|;|:|；");
+        List<String> diseaseList = Arrays.asList(diseaseArray);
+        Map<String, ArrayList> diseFilds = new HashMap<>();
+        for(int i=0;i<diseaseList.size();i++){
+            List<String> fildsList = new ArrayList<>();//其他条件数组
+
+        }
+
+    }
+
     @Override
     public List<Map<String, Object>> getRecommendItem(QueryVo queryVo) {
         List<Map<String, Object>> list = relationRepository.getRecommendItem(queryVo.getDiseaselist());