feat: 修复

dev_no_inv
chenhc 9 months ago
parent 67e4600796
commit 4ebf9eedf3

@ -280,17 +280,21 @@ public class UdiContrastService {
YbDrugDetailFilterRequest ybHcflDetailFilterRequest = new YbDrugDetailFilterRequest(); YbDrugDetailFilterRequest ybHcflDetailFilterRequest = new YbDrugDetailFilterRequest();
ybHcflDetailFilterRequest.setLimit(1); ybHcflDetailFilterRequest.setLimit(1);
ybHcflDetailFilterRequest.setPage(1); ybHcflDetailFilterRequest.setPage(1);
ybHcflDetailFilterRequest.setGoodsCode(thrProductsEntity.getYbbm());
List<YbDrug> list = ybDrugService.getList(ybHcflDetailFilterRequest); List<YbDrug> list = ybDrugService.getList(ybHcflDetailFilterRequest);
UdiProductEntity udiProductEntity = new UdiProductEntity(); UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
udiProductEntity.setId(IdUtil.getSnowflakeNextId()); udiProductEntity.setId(IdUtil.getSnowflakeNextId());
if (list.size() > 0) { if (list.size() > 0) {
YbDrug ybDrug = list.get(0); YbDrug ybDrug = list.get(0);
// udiProductEntity.setNameCode(thrProductsEntity.getCode());
udiProductEntity.setNameCode(ybDrug.getGoodsStandardCode()); udiProductEntity.setPrepnSpec(ybDrug.getRealityMedicinemodel());
udiProductEntity.setPrepnSpec(ybDrug.getRealityOutlook());
udiProductEntity.setZczbhhzbapzbh(ybDrug.getApprovalCode()); udiProductEntity.setZczbhhzbapzbh(ybDrug.getApprovalCode());
udiProductEntity.setCpmctymc(ybDrug.getProductRemark()); udiProductEntity.setCpmctymc(ybDrug.getRegisteredProductName());
udiProductEntity.setSpmc(ybDrug.getRegisteredProductName());
udiProductEntity.setBzgg(ybDrug.getRegisteredOutlook());
udiProductEntity.setMatrial(ybDrug.getMaterialName());
udiProductEntity.setPackMatrial(ybDrug.getMaterialName());
udiProductEntity.setMedicareType(setMedicareType(ybDrug.getProductInsuranceType())); udiProductEntity.setMedicareType(setMedicareType(ybDrug.getProductInsuranceType()));
//最小产品单位 //最小产品单位
udiProductEntity.setPackUnit(ybDrug.getUnit()); udiProductEntity.setPackUnit(ybDrug.getUnit());
@ -301,7 +305,7 @@ public class UdiContrastService {
//生产厂家 //生产厂家
udiProductEntity.setManufactory(ybDrug.getListingHolder()); udiProductEntity.setManufactory(ybDrug.getListingHolder());
//商品条码 essentialDrugMarkName sptm //商品条码 essentialDrugMarkName sptm
udiProductEntity.setSptm(ybDrug.getBusinessLicense()); // udiProductEntity.setSptm(ybDrug.getBusinessLicense());
udiProductEntity.setPrepnUnit(ybDrug.getMinUnit()); udiProductEntity.setPrepnUnit(ybDrug.getMinUnit());
} }
@ -316,7 +320,7 @@ public class UdiContrastService {
udiProductEntity.setMajorStatus(1); udiProductEntity.setMajorStatus(1);
udiProductEntity.setPhysicType(3); udiProductEntity.setPhysicType(3);
if (StrUtil.isEmpty(udiProductEntity.getPrice())) { if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
udiProductEntity.setPrice(null); udiProductEntity.setPrice("0.00");
} }
udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
udiProductService.insertUdiInfo(udiProductEntity); udiProductService.insertUdiInfo(udiProductEntity);

@ -21,6 +21,8 @@ public class YbDrugService {
ErpBasicClient erpBasicClient; ErpBasicClient erpBasicClient;
public List<YbDrug> getList(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) { public List<YbDrug> getList(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) {
ybHcflDetailFilterRequest.setPage(1);
ybHcflDetailFilterRequest.setLimit(1);
List<YbDrug> list = ybDrugMapper.list(ybHcflDetailFilterRequest); List<YbDrug> list = ybDrugMapper.list(ybHcflDetailFilterRequest);
if (CollUtil.isEmpty(list)){ if (CollUtil.isEmpty(list)){
BaseResponse<PageSimpleResponse<YbDrug>> ybDrugDetail = erpBasicClient.getYbDrugDetail(ybHcflDetailFilterRequest); BaseResponse<PageSimpleResponse<YbDrug>> ybDrugDetail = erpBasicClient.getYbDrugDetail(ybHcflDetailFilterRequest);

Loading…
Cancel
Save