diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 3652c6efe..e9ec10023 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -280,17 +280,21 @@ public class UdiContrastService { YbDrugDetailFilterRequest ybHcflDetailFilterRequest = new YbDrugDetailFilterRequest(); ybHcflDetailFilterRequest.setLimit(1); ybHcflDetailFilterRequest.setPage(1); + ybHcflDetailFilterRequest.setGoodsCode(thrProductsEntity.getYbbm()); List list = ybDrugService.getList(ybHcflDetailFilterRequest); UdiProductEntity udiProductEntity = new UdiProductEntity(); BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); udiProductEntity.setId(IdUtil.getSnowflakeNextId()); if (list.size() > 0) { YbDrug ybDrug = list.get(0); - - udiProductEntity.setNameCode(ybDrug.getGoodsStandardCode()); - udiProductEntity.setPrepnSpec(ybDrug.getRealityOutlook()); +// udiProductEntity.setNameCode(thrProductsEntity.getCode()); + udiProductEntity.setPrepnSpec(ybDrug.getRealityMedicinemodel()); 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.setPackUnit(ybDrug.getUnit()); @@ -301,7 +305,7 @@ public class UdiContrastService { //生产厂家 udiProductEntity.setManufactory(ybDrug.getListingHolder()); //商品条码 essentialDrugMarkName sptm - udiProductEntity.setSptm(ybDrug.getBusinessLicense()); +// udiProductEntity.setSptm(ybDrug.getBusinessLicense()); udiProductEntity.setPrepnUnit(ybDrug.getMinUnit()); } @@ -316,7 +320,7 @@ public class UdiContrastService { udiProductEntity.setMajorStatus(1); udiProductEntity.setPhysicType(3); if (StrUtil.isEmpty(udiProductEntity.getPrice())) { - udiProductEntity.setPrice(null); + udiProductEntity.setPrice("0.00"); } udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); udiProductService.insertUdiInfo(udiProductEntity); diff --git a/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java b/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java index 3b1f9f069..19544d742 100644 --- a/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java +++ b/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java @@ -21,6 +21,8 @@ public class YbDrugService { ErpBasicClient erpBasicClient; public List getList(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) { + ybHcflDetailFilterRequest.setPage(1); + ybHcflDetailFilterRequest.setLimit(1); List list = ybDrugMapper.list(ybHcflDetailFilterRequest); if (CollUtil.isEmpty(list)){ BaseResponse> ybDrugDetail = erpBasicClient.getYbDrugDetail(ybHcflDetailFilterRequest);