|
@@ -188,8 +188,8 @@ public class PushFacade {
|
|
|
*/
|
|
|
public PushDTO pushInner(PushVO pushVO, Integer mode) {
|
|
|
PushDTO pushDTO = new PushDTO();
|
|
|
- //SearchData searchData = assembleData(pushVO);
|
|
|
- ResponseData data = pushAI(pushVO);
|
|
|
+ SearchData aiSearchData = assembleData(pushVO);
|
|
|
+ ResponseData data = pushAipt(aiSearchData);
|
|
|
|
|
|
//大数据返回内容
|
|
|
List<FeatureRate> dis = data.getDis();
|
|
@@ -490,7 +490,7 @@ public class PushFacade {
|
|
|
pushVO.setLis(lisResultVOList);
|
|
|
|
|
|
SearchData searchData = assembleData(pushVO);
|
|
|
- ResponseData responseData = pushAI(pushVO);
|
|
|
+ ResponseData responseData = pushAipt(searchData);
|
|
|
PushKYJDTO pushKYJDTO = new PushKYJDTO();
|
|
|
pushKYJDTO.setLabs(responseData.getLabs());
|
|
|
pushKYJDTO.setDis(responseData.getDis());
|
|
@@ -649,7 +649,7 @@ public class PushFacade {
|
|
|
}
|
|
|
|
|
|
SearchData searchData = assembleData(pushVO);
|
|
|
- ResponseData data = pushAI(pushVO);
|
|
|
+ ResponseData data = pushAipt(searchData);
|
|
|
String featureType = pushVO.getFeatureType();
|
|
|
String[] featureTypes = featureType.split(",|,");
|
|
|
Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
|
|
@@ -772,7 +772,8 @@ public class PushFacade {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- ResponseData data = pushAI(pushVO);
|
|
|
+ SearchData searchData = assembleData(pushVO);
|
|
|
+ ResponseData data = pushAipt(searchData);
|
|
|
Map<String, JSONObject> scale = data.getScale();
|
|
|
if (scale == null) {
|
|
|
String scaleStr = "{\"type\":\"checkbox\",\"details\":[{\"name\":\"轻度\",\"isSelected\":0}," +
|
|
@@ -807,7 +808,8 @@ public class PushFacade {
|
|
|
throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "非慢病,不能获取管理评估内容");
|
|
|
}
|
|
|
|
|
|
- ResponseData data = pushAI(pushVO);
|
|
|
+ SearchData searchData = assembleData(pushVO);
|
|
|
+ ResponseData data = pushAipt(searchData);
|
|
|
Map<String, JSONObject> managementEvaluationMap = data.getManagementEvaluation();
|
|
|
if (managementEvaluationMap == null) {
|
|
|
managementEvaluationMap = new LinkedHashMap<>();
|