From 69d61b87d2c5bc6e2d4395a82c3e3a5951a41507 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 26 Nov 2024 10:51:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E9=80=89=E5=85=A5bug=20?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/basic/UdiContrastService.java | 43 +++++++++++-------- .../api/service/basic/UdiProductService.java | 2 +- src/main/resources/schemas/schema_v2.4.sql | 7 +++ 3 files changed, 34 insertions(+), 18 deletions(-) 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 7644c2f6d..3f3a8351a 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -281,11 +281,31 @@ public class UdiContrastService { ybHcflDetailFilterRequest.setLimit(1); ybHcflDetailFilterRequest.setPage(1); ybHcflDetailFilterRequest.setGoodsCode(thrProductsEntity.getYbbm()); - List list = ybDrugService.getList(ybHcflDetailFilterRequest); - UdiProductEntity udiProductEntity = new UdiProductEntity(); BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); + udiProductEntity.setUuid(udiRelevanceEntity.getUuid()); + udiProductEntity.setDiType(1); + udiProductEntity.setScbssfbhph("是"); + udiProductEntity.setScbssfbhscrq("是"); + udiProductEntity.setScbssfbhsxrq("是"); + udiProductEntity.setScbssfbhxlh("否"); + udiProductEntity.setProductsType(thrProductsEntity.getProductType()); + udiProductEntity.setRequireScanCode(1); + udiProductEntity.setMajorStatus(1); + udiProductEntity.setPhysicType(3); + udiProductEntity.setCpmctymc(thrProductsEntity.getName()); + udiProductEntity.setBzgg(thrProductsEntity.getSpec() + "/" + thrProductsEntity.getMeasname()); + udiProductEntity.setMeasname(thrProductsEntity.getMeasname()); + udiProductEntity.setNameCode(thrProductsEntity.getCode()); + + if (StrUtil.isEmpty(udiProductEntity.getPrice())) { + udiProductEntity.setPrice("0.00"); + } + udiProductEntity.setUpdateTime(new Date()); + udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); + + List list = ybDrugService.getList(ybHcflDetailFilterRequest); if (list != null && list.size() > 0) { YbDrug ybDrug = list.get(0); udiProductEntity.setId(IdUtil.getSnowflakeNextId()); @@ -310,21 +330,7 @@ public class UdiContrastService { //商品条码 essentialDrugMarkName sptm // udiProductEntity.setSptm(ybDrug.getBusinessLicense()); udiProductEntity.setPrepnUnit(ybDrug.getRealityMedicinemodel()); - udiProductEntity.setUuid(udiRelevanceEntity.getUuid()); - udiProductEntity.setDiType(1); - udiProductEntity.setScbssfbhph("是"); - udiProductEntity.setScbssfbhscrq("是"); - udiProductEntity.setScbssfbhsxrq("是"); - udiProductEntity.setScbssfbhxlh("否"); - udiProductEntity.setProductsType(thrProductsEntity.getProductType()); - udiProductEntity.setRequireScanCode(1); - udiProductEntity.setMajorStatus(1); - udiProductEntity.setPhysicType(3); - if (StrUtil.isEmpty(udiProductEntity.getPrice())) { - udiProductEntity.setPrice("0.00"); - } - udiProductEntity.setUpdateTime(new Date()); - udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); + List thirdAliDrugList = thirdAliDrugService.findByByApproved(ybDrug.getApprovalCode()); if (CollUtil.isNotEmpty(thirdAliDrugList)) { for (int i = 0; i < thirdAliDrugList.size(); i++) { @@ -353,7 +359,10 @@ public class UdiContrastService { } else { udiProductService.insertUdiInfo(udiProductEntity); } + } else { + udiProductService.insertUdiInfo(udiProductEntity); } + // setLevel(udiRelevanceEntity.getUuid()); UdiProductEntity byUuid = udiProductService.findByUuid(udiRelevanceEntity.getUuid()); udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, byUuid); diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 569393db9..43f2d9e5e 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -148,7 +148,7 @@ public class UdiProductService extends ServiceImpl udiInfoEntities = findByUuids(udiRelevanceEntity.getUuid()); List diLevelResponses = new ArrayList<>(); - if (CollUtil.isNotEmpty(udiInfoEntities)) { + if (CollUtil.isNotEmpty(udiInfoEntities) && StrUtil.isNotEmpty(udiInfoEntities.get(0).getPackLevel())) { Map> groupedByLevel = udiInfoEntities.stream() .collect(Collectors.groupingBy(UdiProductEntity::getPackLevel)); diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index c9b7aad23..da37753e5 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4840,3 +4840,10 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'startUploadHour', CALL Pro_Temp_ColumnWork('auth_company', 'refEntId', ' varchar(255) DEFAULT NULL COMMENT ''接口调用企业的唯一标识''', 1); + +ALTER TABLE io_collect_order_origin MODIFY errorMsg text; +ALTER TABLE io_collect_order MODIFY errorMsg text; +ALTER TABLE io_collect_order_backup MODIFY errorMsg text; + + +