|
|
@@ -8,6 +8,7 @@ import com.diagbot.dto.PushDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.enums.FeatureTypeEnum;
|
|
|
import com.diagbot.util.RespDTOUtil;
|
|
|
+import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.PushVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
@@ -40,7 +41,7 @@ public class PushFacade {
|
|
|
PushDTO pushDTO = new PushDTO();
|
|
|
SearchData searchData = assembleFacade.assembleData(pushVO);
|
|
|
RespDTO<PushDTO> respDTO = aiptServiceClient.pushInner(searchData);
|
|
|
- RespDTOUtil.respNGDeal(respDTO, "中间层没有返回结果");
|
|
|
+ RespDTOUtil.respNGDeal(respDTO, StringUtil.isNotBlank(respDTO.msg) ? respDTO.msg : "中间层没有返回结果");
|
|
|
PushDTO data = respDTO.data;
|
|
|
|
|
|
String featureType = searchData.getFeatureType();
|
|
|
@@ -90,7 +91,7 @@ public class PushFacade {
|
|
|
public Map<String, Object> pushTreatment(PushVO pushVO) {
|
|
|
SearchData searchData = assembleFacade.assembleData(pushVO);
|
|
|
RespDTO<Map<String, Object>> res = aiptServiceClient.getTreatment(searchData);
|
|
|
- RespDTOUtil.respNGDealCover(res, "中间层没有返回治疗方案");
|
|
|
+ RespDTOUtil.respNGDealCover(res, StringUtil.isNotBlank(res.msg) ? res.msg : "中间层没有返回治疗方案");
|
|
|
Map<String, Object> data = res.data;
|
|
|
return data;
|
|
|
}
|
|
|
@@ -104,7 +105,7 @@ public class PushFacade {
|
|
|
public List<ScaleContent> pushScale(PushVO pushVO) {
|
|
|
SearchData searchData = assembleFacade.assembleData(pushVO);
|
|
|
RespDTO<List<ScaleContent>> res = aiptServiceClient.getScale(searchData);
|
|
|
- RespDTOUtil.respNGDealCover(res, "中间层没有返回量表");
|
|
|
+ RespDTOUtil.respNGDealCover(res, StringUtil.isNotBlank(res.msg) ? res.msg : "中间层没有返回量表");
|
|
|
List<ScaleContent> data = res.data;
|
|
|
return data;
|
|
|
}
|
zhaops