|
@@ -2,9 +2,11 @@ package com.diagbot.repository;
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.alibaba.fastjson.TypeReference;
|
|
|
import com.diagbot.biz.push.entity.Item;
|
|
|
import com.diagbot.dto.*;
|
|
|
import com.diagbot.entity.node.*;
|
|
|
+import com.diagbot.model.label.PacsLabel;
|
|
|
import com.diagbot.model.label.VitalLabel;
|
|
|
import com.diagbot.util.CoreUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
@@ -271,6 +273,19 @@ public class YiBaoOperationNameNode {
|
|
|
}
|
|
|
|
|
|
// 判断辅检结果
|
|
|
+ PacsLabel pacs1bl = wordCrfDTO.getPacsLabel();
|
|
|
+ JSONObject pacsobj = jobj.getJSONObject("辅检结果描述");
|
|
|
+ Map<String, String> keywords = JSONObject.parseObject(pacsobj.toJSONString(), new TypeReference<Map<String, String>>(){});
|
|
|
+ for (String key : pacsobj.keySet()) {
|
|
|
+
|
|
|
+ for (Item item : pacs1bl.getRes()) {
|
|
|
+ if (item.getDateValue().contains(key)) {
|
|
|
+ nodeNeoDTO = new NodeNeoDTO();
|
|
|
+ nodeNeoDTO.setName(item.getDateValue());
|
|
|
+ highRiskNeoDTO.getFactor().add(nodeNeoDTO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
catch (Exception ex) {
|
|
|
ex.printStackTrace();
|