//诊断类别

Integer disType

common-service/src/main/java/org/diagbot/common/work/SearchData.java

@@ -16,7 +16,7 @@ public class SearchData {
     //特征类别
     protected String featureType;
     //诊断类别
-    protected String diseaseType; //0:复诊,1:急诊
+    protected Integer disType; //0:复诊,1:急诊
     //特征类别对","进行分割后数据
     protected String[] featureTypes;
     //门诊 住院分类
@@ -44,12 +44,12 @@ public class SearchData {
     //阴性 页面录入数据需要对结果过滤的集合
     private Map<String, Map<String, String>> filters = new HashMap<>(10, 0.8f);
 
-    public String getDiseaseType() {
-        return diseaseType;
+    public Integer getDisType() {
+        return disType;
     }
 
-    public void setDiseaseType(String diseaseType) {
-        this.diseaseType = diseaseType;
+    public void setDisType(Integer disType) {
+        this.disType = disType;
     }
 
     public List<LisDetail> getLisArr() {

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

@@ -72,7 +72,7 @@ public class GraphCalculate {
 
         String webDiag = searchData.getDiag();
         Set<String> diseaseSet = condition.keySet();
-        String diseaseType = searchData.getDiseaseType();
+        Integer diseaseType = searchData.getDisType();
         //走治疗
         if(webDiag.trim()!=null && Arrays.asList(searchData.getFeatureTypes()).contains("8")){
             //走平常诊断治疗
@@ -80,7 +80,7 @@ public class GraphCalculate {
             responseData.setTreat(mulDiseaseTreat);
         }
 
-        responseData.setGraphWords(graphWordfeatureRates);
+//        responseData.setGraphWords(graphWordfeatureRates);
         responseData.setDis(featureRates);
         responseData.setInputs(searchData.getInputs());
         return responseData;

graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -960,7 +960,7 @@ public class Neo4jAPI {
      * @param filds   //     * @param sign 标志,2是平常诊断的治疗,0是复诊诊断的治疗,1是急诊
      * @return
      */
-    public Map<String, Filnlly> getMulDiseaseTreat_2(String disease,String diseaseType,Set<String> disSet, String filds) {
+    public Map<String, Filnlly> getMulDiseaseTreat_2(String disease,Integer diseaseType,Set<String> disSet, String filds) {
         Map<String, Filnlly> diagTreat = new HashMap<>();
         Session session = null;
         NumberFormat nf = NumberFormat.getPercentInstance();
@@ -1155,7 +1155,7 @@ public class Neo4jAPI {
                         }
                         Filnlly filnlly = new Filnlly();
                         //显示不良反应
-                        if("1".equals(diseaseType)){
+                        if(1 == diseaseType){
                             List<Indicators> indicatorsList1 = new ArrayList<>();
                             Indicators indicators1 = getAdverse(disSet, "低血糖反应");
                             Indicators indicators2 = getAdverse(disSet, "胃肠道不良反应");