From d1aad25a7cdef77895fa85ceaf1730f2672a3c4d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 17 Jul 2024 15:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=EF=BC=8C=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=AE=A1=E6=A0=B8=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/basic/BasicOrderPrintController.java | 2 +- .../api/controller/inout/IoOrderDetailBizController.java | 2 +- .../api/controller/thrsys/ThrProductsAddDiController.java | 4 +--- src/main/resources/schemas/schema_v2.4.sql | 6 ++++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index edebb129..4d8e6dce 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -217,7 +217,7 @@ public class BasicOrderPrintController { for (IoCodeEntity obj : ioCodeEntityList) { //查询业务表 for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) { - if (ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())) { + if (StrUtil.trimToEmpty(ioObj.getBatchNo()).equals(StrUtil.trimToEmpty(obj.getBatchNo())) && ioObj.getBindRlFk().equals(obj.getRelId())) { ioOrderDetailBizEntity = ioObj; break; } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index c988ac9b..5ecee2a9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -201,7 +201,7 @@ public class IoOrderDetailBizController extends BaseController { } } - if(bussinessTypeEntity != null && udiRelevanceResponse != null) { + if (bussinessTypeEntity != null && udiRelevanceResponse != null) { //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index d9b7b178..ccdbbe92 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -243,9 +243,7 @@ public class ThrProductsAddDiController { udiRelevanceEntity.setUuid(udiProductEntity.getUuid()); udiRelevanceEntity.setSupName(thrProductsAddDiEntity.getSupName()); udiRelevanceEntity.setIsDisable(false); - - - udiProductEntity.setNameCode(null); +// udiProductEntity.setNameCode(null); udiProductService.insertUdiInfo(udiProductEntity); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); //回填关联关系到关联表 diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index ac94e27a..3d40ecc1 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -634,6 +634,12 @@ CALL Pro_Temp_ColumnWork('basic_products', 'bzgg', 1); +CALL Pro_Temp_ColumnWork('thr_products', 'bzgg', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''包装规格''', + 1); + + + UPDATE auth_menu SET `menu_name` = '选入入院产品', `parent_id` = 1819,