|
|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import org.diagbot.common.javabean.MangementEvaluation;
|
|
|
import org.diagbot.common.work.FeatureRate;
|
|
|
import org.diagbot.common.javabean.Filnlly;
|
|
|
+import org.diagbot.common.work.LisDetail;
|
|
|
import org.diagbot.common.work.ResponseData;
|
|
|
import org.diagbot.common.work.SearchData;
|
|
|
import org.diagbot.graph.jdbc.DriverManager;
|
|
|
@@ -63,6 +64,15 @@ public class GraphCalculate {
|
|
|
Set<String> diseaseSet = condition.keySet();
|
|
|
logger.info("diseaseSet :" + diseaseSet);
|
|
|
Integer diseaseType = searchData.getDisType();
|
|
|
+ List<LisDetail> lisArr = searchData.getLisArr();
|
|
|
+ Set<String> lisSet = new HashSet<>();
|
|
|
+ if(lisArr != null && lisArr.size() > 0){
|
|
|
+ for (LisDetail lis:lisArr) {
|
|
|
+ String detailName = lis.getDetailName();
|
|
|
+ lisSet.add(detailName);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ logger.info("页面导入的所有化验项为 :" +lisSet);
|
|
|
//走治疗
|
|
|
if (webDiag.trim() != null && webDiag.trim() != "" && featureTypeList.contains("8")) {
|
|
|
//走平常诊断治疗
|
|
|
@@ -72,9 +82,11 @@ public class GraphCalculate {
|
|
|
//管理评估(慢病才有)
|
|
|
if (featureTypeList.contains("11") && diseaseType == 1 && diseaseType != null) {
|
|
|
logger.info("featureTypeList 包含11,走管理评估!!!");
|
|
|
- if(webDiag != null){
|
|
|
- String[] webDiagsplits = webDiag.split(",|，|、|;|:|；");
|
|
|
- }
|
|
|
+// if(webDiag != null){
|
|
|
+//// String[] webDiagsplits = webDiag.split(",|，|、|;|:|；");
|
|
|
+//// MangementEvaluation mangementEvaluation = neo4jAPI.pushMe(webDiagsplits);
|
|
|
+//// System.out.println();
|
|
|
+//// }
|
|
|
MangementEvaluation mangementEvaluation = this.getMangementEvaluation();
|
|
|
Map<String, JSONObject> mangementEvaluation1 = mangementEvaluation.getMangementEvaluation();
|
|
|
responseData.setManagementEvaluation(mangementEvaluation1);
|
kongwz