|
|
@@ -57,7 +57,7 @@ public class GraphCalculate {
|
|
|
Set<String> diseaseSet = condition.keySet();
|
|
|
Integer diseaseType = searchData.getDisType();
|
|
|
//走治疗
|
|
|
- if(webDiag.trim()!=null && Arrays.asList(searchData.getFeatureTypes()).contains("8")){
|
|
|
+ if(webDiag.trim()!=null && "8".equals(searchData.getFeatureType())){
|
|
|
//走平常诊断治疗
|
|
|
Map<String, Filnlly> mulDiseaseTreat = neo4jAPI.getMulDiseaseTreat_2(webDiag,diseaseType,diseaseSet,String.join(",", inputList));
|
|
|
responseData.setTreat(mulDiseaseTreat);
|
|
|
@@ -162,7 +162,6 @@ public class GraphCalculate {
|
|
|
Map<String, String> sortval = new HashMap<>();
|
|
|
Map<String, String> items = new HashMap<>();
|
|
|
String name;
|
|
|
-
|
|
|
try {
|
|
|
if (set != null && set.size() > 0) {
|
|
|
for (String item : set) {
|
|
|
@@ -172,9 +171,7 @@ public class GraphCalculate {
|
|
|
sortval.put(item, String.valueOf(Integer.parseInt(sortval.get(item)) + 1));
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
sortval = sortMapByValue(sortval);
|
|
|
-
|
|
|
for (String key : sortval.keySet()) {
|
|
|
frlist.add(items.get(key));
|
|
|
}
|
|
|
@@ -202,7 +199,6 @@ public class GraphCalculate {
|
|
|
List<Map.Entry<String, String>> entryList = new ArrayList<Map.Entry<String, String>>(
|
|
|
oriMap.entrySet());
|
|
|
Collections.sort(entryList, new MapValueComparator());
|
|
|
-
|
|
|
Iterator<Map.Entry<String, String>> iter = entryList.iterator();
|
|
|
Map.Entry<String, String> tmpEntry = null;
|
|
|
while (iter.hasNext()) {
|
|
|
@@ -233,13 +229,13 @@ public class GraphCalculate {
|
|
|
JSONObject ageJsonObject = new JSONObject();
|
|
|
ageJsonObject.put("controlType",2);
|
|
|
ageJsonObject.put("name","年龄");
|
|
|
- ageJsonObject.put("value","20");
|
|
|
+ ageJsonObject.put("value","");
|
|
|
ageJsonObject.put("uint","");
|
|
|
ageJsonObject.put("details",new ArrayList<>());
|
|
|
JSONObject indicationJsonObject = new JSONObject();
|
|
|
indicationJsonObject.put("controlType",2);
|
|
|
indicationJsonObject.put("name","血肌酐");
|
|
|
- indicationJsonObject.put("value","2.26");
|
|
|
+ indicationJsonObject.put("value","");
|
|
|
indicationJsonObject.put("uint","mg/dL");
|
|
|
indicationJsonObject.put("details",new ArrayList<>());
|
|
|
JSONObject sexJson = new JSONObject();
|
|
|
@@ -264,9 +260,9 @@ public class GraphCalculate {
|
|
|
detailList.add(sexJson);
|
|
|
gongshiJson.put("details",detailList);
|
|
|
JSONObject resultJson = new JSONObject();
|
|
|
- resultJson.put("value",10);
|
|
|
+ resultJson.put("value","");
|
|
|
resultJson.put("unit","ml/min•1.73m2");
|
|
|
- resultJson.put("text","肾功能衰竭");
|
|
|
+ resultJson.put("text","");
|
|
|
gongshiJson.put("result",resultJson);
|
|
|
medicalIndicationDetail2.setContent(gongshiJson);
|
|
|
//其他
|
kongwz