Merge remote-tracking branch 'origin/push-dev'

bigdata-web/src/main/java/org/diagbot/bigdata/work/ResultDataProxy.java

@@ -68,11 +68,11 @@ public class ResultDataProxy {
                 }
             }
             featureList.add(featureRate);
-                if (cursor < searchData.getLength()) {
-                    cursor++;
-                } else {
-                    break;
-                }
+//                if (cursor < searchData.getLength()) {
+//                    cursor++;
+//                } else {
+//                    break;
+//                }
         }
 
         return featureList;

common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -173,6 +173,7 @@ public class PretreatmentRule {
             List<PreResult> preResults = searchData.getOperationOrder();
             for (PreResult result : preResults) {
                 result.setValue(result.getUniqueName());
+                result.setHisName(result.getName());
                 result.setUniqueName("开单--");
             }
             add2PreResultList(searchData.getOperationOrder(), "", "operationOrder", searchData);

common-push/src/main/java/org/diagbot/common/push/work/ParamsDataProxy.java

@@ -256,6 +256,12 @@ public class ParamsDataProxy {
      * @throws Exception
      */
     private void paramFeatureInit(SearchData searchData, List<Map<String, Object>> featuresList) throws Exception {
+//        if (featuresList != null && featuresList.size() == 1) {
+//            Map<String, Object> featureMap = featuresList.get(0);
+//            if (exclude_feature_list.contains(String.valueOf(featureMap.get("feature_name")))) {
+//                return;
+//            }
+//        }
         if (featuresList != null && featuresList.size() > 0) {
             Map<String, Object> featureMap = null;
             for (int i = 0; i < featuresList.size(); i++) {
@@ -285,4 +291,68 @@ public class ParamsDataProxy {
             }
         }
     }
+
+    private List<String> exclude_feature_list = Arrays.asList("虹视",
+            "谵妄",
+            "头皮发麻",
+            "脓血便",
+            "寡言",
+            "肌无力",
+            "胸胀",
+            "寡言",
+            "妄想",
+            "白发",
+            "打哈欠",
+            "舌麻",
+            "失忆",
+            "幻视",
+            "幻听",
+            "猜疑",
+            "自卑",
+            "视物闪光",
+            "肩痛",
+            "睁眼无力",
+            "脱肛",
+            "站立不稳",
+            "腿酸",
+            "瘫痪",
+            "气短",
+            "擦伤",
+            "多食",
+            "感觉异常",
+            "面部呆滞",
+            "摔伤",
+            "流涎",
+            "怕声",
+            "胼胝",
+            "粘稠痰",
+            "头闷",
+            "肢体震颤",
+            "昏迷",
+            "不自主运动",
+            "不适感",
+            "张口呼吸",
+            "自慰",
+            "眼出血",
+            "晨僵",
+            "夜游症",
+            "乳头溢液",
+            "复现",
+            "乳头痛",
+            "休克",
+            "乳头皲裂",
+            "便溏",
+            "健忘",
+            "多疑",
+            "喉咙发紧",
+            "压抑心理",
+            "噤声",
+            "发育不良",
+            "厌油",
+            "厌食",
+            "皮肤发紫",
+            "呼吸骤停",
+            "坠痛",
+            "口唇麻木",
+            "口渴");
 }

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

@@ -334,7 +334,8 @@ public class GraphCalculate {
             for (PreResult pre:lisArr) {
                 if("化验--肾功能测定--肌酐(Cr)".equals(pre.getUniqueName()) && StringUtils.isNotEmpty(pre.getValue())){
                     try {
-                        sc = String.format("%.2f",Double.parseDouble(pre.getValue().trim())*0.01131);
+//                        sc = String.format("%.2f",Double.parseDouble(pre.getValue().trim())*0.01131);
+                        sc = pre.getValue().trim();
                     }catch (Exception e){e.printStackTrace();}
 
                 }

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

@@ -228,6 +228,12 @@ public class AlgorithmController extends BaseController {
         List<FeatureRate> upfes = classifyDiag.filterDiag(graphResponseData, pushDiags);
         List<FeatureRate> classify = classifyDiag.diagClassify(upfes);
         List<FeatureRate> featureRates = classifyDiag.sortDiag(classify);
+        if (featureRates.size() > searchData.getLength()) {
+            featureRates = featureRates.subList(0, searchData.getLength());
+        }
+        if (bigDataResponseData.getSymptom().size() > searchData.getLength()) {
+            bigDataResponseData.setSymptom(bigDataResponseData.getSymptom().subList(0, searchData.getLength()));
+        }
         bigDataResponseData.setDis(featureRates);
         //返回结果化验、辅检、体征、进行性别年龄过滤
         ResultDataProxy resultDataProxy = new ResultDataProxy();

push-web/src/main/resources/static/pages/algorithm/list.html

@@ -405,30 +405,17 @@
             startDiag('/algorithm/page_neural', '#pacs_list', '5,2,7', resourceType, '151', '5');
 
         } else {
-//            startDiag('/algorithm/page_neural', '#symptom_list', '1', resourceType, '11', '1');
-//            startDiag('/algorithm/page_neural', '#vital_list', '3,2,7,42', resourceType, '31', '3');
-//            startDiag('/algorithm/page_neural', '#lis_list', '4,2,7', resourceType, '41', '4');
-//            startDiag('/algorithm/page_neural', '#pacs_list', '5,2,7', resourceType, '51', '5');
-//
-//            startDiagMapping('/algorithm/page_neural', '#diag_list', '2', resourceType, '21', '2');
-            startDiagMapping('/algorithm/neural', '#before_combine_diag_list', '2', resourceType, '21', '6');
+            startDiag('/algorithm/page_neural', '#symptom_list', '1', resourceType, '11', '1');
+            startDiag('/algorithm/page_neural', '#vital_list', '3,2,7,42', resourceType, '31', '3');
+            startDiag('/algorithm/page_neural', '#lis_list', '4,2,7', resourceType, '41', '4');
+            startDiag('/algorithm/page_neural', '#pacs_list', '5,2,7', resourceType, '51', '5');
+
+            startDiagMapping('/algorithm/page_neural', '#diag_list', '2', resourceType, '21', '2');
+            startDiagMapping('/algorithm/page_neural', '#before_combine_diag_list', '2', resourceType, '21', '6');
         }
     }
 
     function startDiagMapping(url, obj, featureType, resourceType, algorithmClassify, tp) {
-        var t = {
-            "sysCode":1,"disType":"1",
-            "age":28,
-            "diagOrder":[
-                {
-                    "name":"糖尿病",
-                    "uniqueName":"糖尿病"
-                },
-                {
-                    "name":"糖尿病肾病",
-                    "uniqueName":"糖尿病肾病"
-                }
-            ]};
         $(obj).DataTable({
             "paging": false,
             "bPaginate" : true,
@@ -448,45 +435,44 @@
             "ajax": {
                 "url": push_web_url + url,
                 "type": "POST",
-                "data":t,
-//                "data": function ( d ) {
-//                    d.featureType = featureType;
-//                    d.resourceType = resourceType;
-//                    d.algorithmClassifyValue =  algorithmClassify;
-//                    var symptom = $("#symptom_id").val();
-//                    var vital = $("#vital_id").val();
-//                    var pasts = $("#past_id").val();
-//                    var other = $("#other_id").val();
-//                    var lisString = $("#lis_id").val();
-//                    var pacsString = $("#pacs_id").val();
+                "data": function ( d ) {
+                    d.featureType = featureType;
+                    d.resourceType = resourceType;
+                    d.algorithmClassifyValue =  algorithmClassify;
+                    var symptom = $("#symptom_id").val();
+                    var vital = $("#vital_id").val();
+                    var pasts = $("#past_id").val();
+                    var other = $("#other_id").val();
+                    var lisString = $("#lis_id").val();
+                    var pacsString = $("#pacs_id").val();
 //                    var lisOrder = $("#lis_order").val();
 //                    var pacsOrder = $("#pacs_order").val();
 //                    var diagOrder = $("#diag_id").val();
-//                    var length = $("#length").val();
-//                    var sex = $("#sex").val();
-//                    var age = $("#age").val();
-//                    var age_start = $("#age_start").val();
-//                    var age_end = $("#age_end").val();
-//                    d.sysCode = "2";
-//                    //添加额外的参数传给服务器
-//                    if (symptom != null && symptom != undefined) {
-//                        d.symptom = symptom;
-//                    }
-//                    if (vital != null && vital != undefined) {
-//                        d.vital = vital;
-//                    }
-//                    if (pasts != null && pasts != undefined) {
-//                        d.pasts = pasts;
-//                    }
-//                    if (other != null && other != undefined) {
-//                        d.other = other;
-//                    }
-//                    if (lisString != null && lisString != undefined) {
-//                        d.lisString = lisString;
-//                    }
-//                    if (pacsString != null && pacsString != undefined) {
-//                        d.pacsString = pacsString;
-//                    }
+                    var length = $("#length").val();
+                    var sex = $("#sex").val();
+                    var age = $("#age").val();
+                    var age_start = $("#age_start").val();
+                    var age_end = $("#age_end").val();
+                    d.sysCode = "2";
+                    //添加额外的参数传给服务器
+                    if (symptom != null && symptom != undefined) {
+                        d.symptom = symptom;
+                    }
+                    if (vital != null && vital != undefined) {
+                        d.vital = vital;
+                    }
+                    if (pasts != null && pasts != undefined) {
+                        d.pasts = pasts;
+                    }
+                    if (other != null && other != undefined) {
+                        d.other = other;
+                    }
+                    if (lisString != null && lisString != undefined) {
+                        d.lisString = lisString;
+                    }
+                    if (pacsString != null && pacsString != undefined) {
+                        d.pacsString = pacsString;
+                    }
 //                    var lisOrderJson = "";
 //                    if (lisOrder != null && lisOrder != undefined) {
 //                        var arr = lisOrder.split(",");
@@ -524,22 +510,22 @@
 //                        }
 //                        d.diagOrder = JSON.stringify(diagOrderJson).toString();
 //                    }
-//                    if (length != null && length != undefined) {
-//                        d.length = length;
-//                    }
-//                    if (sex != null && sex != undefined) {
-//                        d.sex = sex;
-//                    }
-//                    if (age != '' && age_start != age && age != undefined) {
-//                        d.age = age;
-//                    }
-//                    if (age_start != '' && age_start != null && age_start != undefined) {
-//                        d.age_start = age_start;
-//                    }
-//                    if (age_end != '' && age_end != null && age_end != undefined) {
-//                        d.age_end = age_end;
-//                    }
-//                },
+                    if (length != null && length != undefined) {
+                        d.length = length;
+                    }
+                    if (sex != null && sex != undefined) {
+                        d.sex = sex;
+                    }
+                    if (age != '' && age_start != age && age != undefined) {
+                        d.age = age;
+                    }
+                    if (age_start != '' && age_start != null && age_start != undefined) {
+                        d.age_start = age_start;
+                    }
+                    if (age_end != '' && age_end != null && age_end != undefined) {
+                        d.age_end = age_end;
+                    }
+                },
                 "dataSrc": function (json) {
                     var inputs = json.data.inputs;
                     var h = "";
@@ -608,9 +594,9 @@
                     var other = $("#other_id").val();
                     var lisString = $("#lis_id").val();
                     var pacsString = $("#pacs_id").val();
-                    var lisOrder = $("#lis_order").val();
-                    var pacsOrder = $("#pacs_order").val();
-                    var diagOrder = $("#diag_id").val();
+//                    var lisOrder = $("#lis_order").val();
+//                    var pacsOrder = $("#pacs_order").val();
+//                    var diagOrder = $("#diag_id").val();
                     var length = $("#length").val();
                     var sex = $("#sex").val();
                     var age = $("#age").val();
@@ -636,47 +622,47 @@
                     if (pacsString != null && pacsString != undefined) {
                         d.pacsString = pacsString;
                     }
-                    var lisOrderJson = [];
-                    if (lisOrder != null && lisOrder != undefined) {
-                        var arr = lisOrder.split(",");
-                        for (i = 0; i < arr.length; i++) {
-                            var json_val  =
-                                {
-                                    "uniqueName" : arr[i],
-                                    "name" : "",
-                                    "dateValue" : ""
-                                };
-                            d.lisOrder.push(json_val);
-                        }
-                    }
-                    var pacsOrderJson = [];
-                    if (pacsOrder != null && pacsOrder != undefined) {
-                        var arr = pacsOrder.split(",");
-                        for (i = 0; i < arr.length; i++) {
-                            var json_val  =
-                                {
-                                    "uniqueName" : arr[i],
-                                    "name" : "",
-                                    "dateValue" : ""
-                                };
-                            pacsOrderJson.push(json_val);
-                        }
-                        d.pacsOrder = JSON.stringify(pacsOrderJson).toString();
-                    }
-                    var diagOrderJson = [];
-                    if (diagOrder != null && diagOrder != undefined) {
-                        var arr = diagOrder.split(",");
-                        for (i = 0; i < arr.length; i++) {
-                            var json_val  =
-                                {
-                                    "uniqueName" : arr[i],
-                                    "name" : "",
-                                    "dateValue" : ""
-                                };
-                            diagOrderJson.push(json_val);
-                        }
-                        d.diagOrder = JSON.stringify(diagOrderJson).toString();
-                    }
+//                    var lisOrderJson = [];
+//                    if (lisOrder != null && lisOrder != undefined) {
+//                        var arr = lisOrder.split(",");
+//                        for (i = 0; i < arr.length; i++) {
+//                            var json_val  =
+//                                {
+//                                    "uniqueName" : arr[i],
+//                                    "name" : "",
+//                                    "dateValue" : ""
+//                                };
+//                            d.lisOrder.push(json_val);
+//                        }
+//                    }
+//                    var pacsOrderJson = [];
+//                    if (pacsOrder != null && pacsOrder != undefined) {
+//                        var arr = pacsOrder.split(",");
+//                        for (i = 0; i < arr.length; i++) {
+//                            var json_val  =
+//                                {
+//                                    "uniqueName" : arr[i],
+//                                    "name" : "",
+//                                    "dateValue" : ""
+//                                };
+//                            pacsOrderJson.push(json_val);
+//                        }
+//                        d.pacsOrder = JSON.stringify(pacsOrderJson).toString();
+//                    }
+//                    var diagOrderJson = [];
+//                    if (diagOrder != null && diagOrder != undefined) {
+//                        var arr = diagOrder.split(",");
+//                        for (i = 0; i < arr.length; i++) {
+//                            var json_val  =
+//                                {
+//                                    "uniqueName" : arr[i],
+//                                    "name" : "",
+//                                    "dateValue" : ""
+//                                };
+//                            diagOrderJson.push(json_val);
+//                        }
+//                        d.diagOrder = JSON.stringify(diagOrderJson).toString();
+//                    }
                     if (length != null && length != undefined) {
                         d.length = length;
                     }