|
|
@@ -1,7 +1,9 @@
|
|
|
package com.diagbot.aggregate;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.diagbot.client.TranServiceClient;
|
|
|
+import com.diagbot.client.bean.CalculateData;
|
|
|
import com.diagbot.client.bean.FeatureRate;
|
|
|
import com.diagbot.client.bean.HosCodeVO;
|
|
|
import com.diagbot.client.bean.MedicalIndication;
|
|
|
@@ -14,6 +16,7 @@ import com.diagbot.entity.Concept;
|
|
|
import com.diagbot.enums.ConceptTypeEnum;
|
|
|
import com.diagbot.enums.FeatureTypeEnum;
|
|
|
import com.diagbot.enums.LexiconTypeEnum;
|
|
|
+import com.diagbot.facade.ClinicalFacade;
|
|
|
import com.diagbot.facade.ConceptFacade;
|
|
|
import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.FastJsonUtils;
|
|
|
@@ -49,6 +52,8 @@ public class PushItemAggregate {
|
|
|
private ConceptFacade conceptFacade;
|
|
|
@Autowired
|
|
|
private TranServiceClient tranServiceClient;
|
|
|
+ @Autowired
|
|
|
+ private ClinicalFacade clinicalFacade;
|
|
|
|
|
|
@DataProvider("setAll")
|
|
|
public PushDTO setAll(
|
|
|
@@ -317,6 +322,16 @@ public class PushItemAggregate {
|
|
|
}
|
|
|
detail.setContent(scaleJson);
|
|
|
}
|
|
|
+ } else if (detail.getType().equals(2)) {
|
|
|
+ JSONObject calcJson = detail.getContent();
|
|
|
+ CalculateData calcData = new CalculateData();
|
|
|
+ calcData.setData(JSON.parseObject(FastJsonUtils.getBeanToJson(detail)));
|
|
|
+ calcData.setType(2);
|
|
|
+ Map<String, Object> resultMap = clinicalFacade.scaleCalc(calcData);
|
|
|
+ if (resultMap.containsKey("result") && calcJson != null) {
|
|
|
+ calcJson.put("result", resultMap.get("result"));
|
|
|
+ detail.setContent(calcJson);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
zhaops