|
|
@@ -1573,8 +1573,8 @@ public class Neo4jAPI {
|
|
|
result = session.run(query);
|
|
|
while (result.hasNext()) {
|
|
|
Record next = result.next();
|
|
|
- String eff = next.get("eff").toString().replace("\"","");//疗效评估名
|
|
|
- String res = next.get("res").toString().replace("\"","");//疗效评估结果
|
|
|
+ String eff = next.get("eff").toString().replace("\"","");//血压控制情况
|
|
|
+ String res = next.get("res").toString().replace("\"","");//正常
|
|
|
// System.out.println(eff + "\t" + res);
|
|
|
if (effCollect.keySet().contains(eff)) {
|
|
|
if (!effCollect.get(eff).contains(res)) {
|
|
|
@@ -1604,14 +1604,15 @@ public class Neo4jAPI {
|
|
|
iJson.put("state", 0);
|
|
|
bloodPressureLevelList.add(iJson);
|
|
|
}
|
|
|
-
|
|
|
bloodPressure.put("details", bloodPressureLevelList);
|
|
|
+
|
|
|
if (bloodPressure.get("name").equals("血脂控制情况")) {
|
|
|
List<JSONObject> details = (List<JSONObject>) bloodPressure.get("details");
|
|
|
Map<String,String> idnRes = new HashMap<>();
|
|
|
//化验计算
|
|
|
String query1 = "match(e:Effect)-[r:指标]->(l:LIS)-[r1:计算结果]->(k:Result) where e.name='血脂控制情况'\n" +
|
|
|
"return l.name as name,r1.between as between ,k.name as res";
|
|
|
+ System.out.println(query1);
|
|
|
StatementResult result1 = session.run(query1);
|
|
|
while (result1.hasNext()) {
|
|
|
Record next = result1.next();
|
|
|
@@ -1631,7 +1632,24 @@ public class Neo4jAPI {
|
|
|
}
|
|
|
}
|
|
|
Collection<String> values = idnRes.keySet();
|
|
|
- for (String s:values) {
|
|
|
+ List<String> newValues = new ArrayList<>();
|
|
|
+ if(values.contains("重度")){
|
|
|
+ newValues.clear();
|
|
|
+ newValues.add("重度");
|
|
|
+ }else if(!values.contains("重度") && values.contains("中度")){
|
|
|
+ newValues.clear();
|
|
|
+ newValues.add("中度");
|
|
|
+ }else if(!values.contains("重度") && !values.contains("中度") && values.contains("轻度")){
|
|
|
+ newValues.clear();
|
|
|
+ newValues.add("轻度");
|
|
|
+ }else if(!values.contains("重度") && !values.contains("中度") && !values.contains("轻度") && values.contains("正常")){
|
|
|
+ newValues.clear();
|
|
|
+ newValues.add("正常");
|
|
|
+ }else {
|
|
|
+ newValues.clear();
|
|
|
+ newValues.add("");
|
|
|
+ }
|
|
|
+ for (String s:newValues) {
|
|
|
int i =0;
|
|
|
if(!"".equals(s)){
|
|
|
for (i =0;i<details.size();i++) {
|
kongwz