fix: 选入药品的异常响应

dev_2.5_csconfilt
chenhc 3 months ago
parent e5d446d001
commit 845bfafdb6

@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
@ -118,7 +119,10 @@ public class UdiContrastController {
BasicProductsCreateDto basicProductsCreateDto = new BasicProductsCreateDto();
basicProductsCreateDto.setMainId(thirdId);
basicProductsCreateDto.setAddCodeRelMark(false);
udiContrastService.createOnlyMainId(basicProductsCreateDto);
BaseResponse response = udiContrastService.createOnlyMainId(basicProductsCreateDto);
if (response.getCode() != ResultEnum.SUCCESS.getCode()) {
return response;
}
}
}
if (StrUtil.isNotBlank(buffer.toString())) {

@ -20,6 +20,8 @@ import com.glxp.api.entity.sync.SyncEditTypeEntity;
import com.glxp.api.entity.system.SyncDataSetEntity;
import com.glxp.api.entity.thrsys.CodeRel;
import com.glxp.api.entity.thrsys.ThirdAliDrug;
import com.glxp.api.entity.thrsys.ThrSystemEntity;
import com.glxp.api.entity.thrsys.YbDrug;
import com.glxp.api.idc.service.FileService;
import com.glxp.api.req.alihealth.AlihealthRelCodeInsertReqeust;
import com.glxp.api.req.alihealth.AlihealthYljgCodedetailReqeust;
@ -29,6 +31,7 @@ import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust;
import com.glxp.api.req.basic.BasicDataRequest;
import com.glxp.api.req.basic.DeleteBasicDataRequest;
import com.glxp.api.req.basic.ProductInfoFilterRequest;
import com.glxp.api.req.basic.YbDrugDetailFilterRequest;
import com.glxp.api.req.inout.RefreshInoiceRequest;
import com.glxp.api.req.inout.ReviewFinishRequest;
import com.glxp.api.req.inout.ReviewSpmsRequest;
@ -762,4 +765,22 @@ public class SpGetHttpClient {
}
return response;
}
/**
*
*/
public BaseResponse<PageSimpleResponse<YbDrug>> getYbDrugDetail(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) {
String json = JSONUtil.toJsonStr(ybHcflDetailFilterRequest);
String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/spms/udchs/ybDrug/list", json, buildHeader());
BaseResponse<PageSimpleResponse<YbDrug>> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<PageSimpleResponse<YbDrug>>>() {
});
if(response == null){
return ResultVOUtils.error("访问供应商平台访问不到");
}
return response;
}
}

@ -5,6 +5,7 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.dao.thrsys.YbDrugMapper;
import com.glxp.api.entity.thrsys.YbDrug;
import com.glxp.api.http.ErpBasicClient;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.basic.YbDrugDetailFilterRequest;
import com.glxp.api.res.PageSimpleResponse;
import lombok.extern.slf4j.Slf4j;
@ -22,6 +23,8 @@ public class YbDrugService {
YbDrugMapper ybDrugMapper;
@Resource
ErpBasicClient erpBasicClient;
@Resource
SpGetHttpClient spGetHttpClient;
public List<YbDrug> getList(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) {
ybHcflDetailFilterRequest.setPage(1);
@ -30,7 +33,7 @@ public class YbDrugService {
if (CollUtil.isEmpty(list)){
List<YbDrug> list1 = new ArrayList<>();
try {
BaseResponse<PageSimpleResponse<YbDrug>> ybDrugDetail = erpBasicClient.getYbDrugDetail(ybHcflDetailFilterRequest);
BaseResponse<PageSimpleResponse<YbDrug>> ybDrugDetail = spGetHttpClient.getYbDrugDetail(ybHcflDetailFilterRequest);
PageSimpleResponse<YbDrug> data = ybDrugDetail.getData();
list1 = data.getList();
}catch (Exception e){

Loading…
Cancel
Save