|
@@ -1,7 +1,5 @@
|
|
package com.diagbot.facade;
|
|
package com.diagbot.facade;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSONArray;
|
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.diagbot.client.TreatServiceClient;
|
|
import com.diagbot.client.TreatServiceClient;
|
|
import com.diagbot.client.bean.GdbResponse;
|
|
import com.diagbot.client.bean.GdbResponse;
|
|
@@ -19,6 +17,7 @@ import com.diagbot.enums.QuestionTypeEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.util.EntityUtil;
|
|
import com.diagbot.util.EntityUtil;
|
|
|
|
+import com.diagbot.util.FastJsonUtils;
|
|
import com.diagbot.util.StringUtil;
|
|
import com.diagbot.util.StringUtil;
|
|
import com.diagbot.vo.TreatmentVO;
|
|
import com.diagbot.vo.TreatmentVO;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -85,13 +84,8 @@ public class TreatmentFacade {
|
|
treatmentDTO.setMap(retMap);
|
|
treatmentDTO.setMap(retMap);
|
|
return treatmentDTO;
|
|
return treatmentDTO;
|
|
}
|
|
}
|
|
- JSONObject jsonObject = JSONObject.parseObject(resultDes);
|
|
|
|
- JSONArray treatJsonArray = jsonObject.getJSONArray("treatment");
|
|
|
|
- if (treatJsonArray.size() == 0) {
|
|
|
|
- treatmentDTO.setMap(retMap);
|
|
|
|
- return treatmentDTO;
|
|
|
|
- }
|
|
|
|
- List<MedicitionClass> drugsList = JSONObject.parseArray(treatJsonArray.toJSONString(), MedicitionClass.class);
|
|
|
|
|
|
+
|
|
|
|
+ List<MedicitionClass> drugsList = FastJsonUtils.getJsonToListByKey(resultDes, "treatment", MedicitionClass.class);
|
|
|
|
|
|
List<String> classNameList = drugsList.stream().map(drugs -> drugs.getDrugsName()).collect(Collectors.toList());
|
|
List<String> classNameList = drugsList.stream().map(drugs -> drugs.getDrugsName()).collect(Collectors.toList());
|
|
List<QuestionInfo> drugClassList = getTopQuestionList(classNameList, QuestionTypeEnum.DrugClass.getKey());
|
|
List<QuestionInfo> drugClassList = getTopQuestionList(classNameList, QuestionTypeEnum.DrugClass.getKey());
|