From 4d4fd87aaae6490cc1137e1ca23861454cae464c Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Thu, 27 Mar 2025 21:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E7=9B=AE=E5=BD=95up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/impl/MedicationManageAppServiceImpl.java | 1 + .../datadictionary/MedicationManageSearchMapper.xml | 2 ++ .../java/com/openhis/common/enums/SplitPropertyCode.java | 8 ++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java index 8469e6ee..6d843778 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java @@ -210,6 +210,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi Medication medication = new Medication(); BeanUtils.copyProperties(medicationManageUpDto, medication); // 子表信息 BeanUtils.copyProperties(medicationManageUpDto, medicationDefinition);// 主表信息 + medicationDefinition.setId(medicationManageUpDto.getMedicationDefId()); // 拼音码 medicationDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDefinition.getName())); medicationDefinition diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml index 183bc082..72211ce2 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml @@ -51,6 +51,7 @@ T6.skin_test_flag, T6.inject_flag, T6.manufacturer_id, + T6.manufacturer_text, T6.supply_id, T6.restricted_flag, T6.restricted_scope, @@ -122,6 +123,7 @@ T1.skin_test_flag, T1.inject_flag, T1.manufacturer_id, + T1.manufacturer_text, T1.supply_id, T1.restricted_flag, T1.restricted_scope, diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java index 9de5b807..a81c02c4 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java @@ -15,10 +15,10 @@ import lombok.Getter; @AllArgsConstructor public enum SplitPropertyCode implements HisEnumInterface { - OUTPATIENT_NON_SPLITTABLE(1, "outpatient_non_splittable", "门诊不可拆分包装单位"), - INPATIENT_SPLITTABLE(2, "inpatient_splittable", "住院可拆分包装单位"), - EMERGENCY_SPLITTABLE(3, "emergency_splittable", "急诊可拆分包装单位"), - PHARMACY_NON_SPLITTABLE(4, "pharmacy_non_splittable", "药房不可拆分包装单位"); + OUTPATIENT_MIN_UNIT_CEIL(1, "outpatient_min_unit_ceil", "门诊按最小单位每次量向上取整"), + OUTPATIENT_PACKAGE_NON_SPLITTABLE(2, "outpatient_package_non_splittable", "门诊按包装单位不可拆分"), + OUTPATIENT_MIN_UNIT_TOTAL_CEIL(3, "outpatient_min_unit_total_ceil", "门诊按最小单位总量向上取整"), + OUTPATIENT_PACKAGE_UNIT_CEIL(4, "outpatient_package_unit_ceil", "门诊按包装单位每次量向上取整"); @EnumValue private final Integer value;