From e2808fd6b99758703a10b2b171e1248f4fe511e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= Date: Wed, 22 Apr 2026 17:20:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Bug=20#403=20=E4=BD=8F=E9=99=A2=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99=EF=BC=9A=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8C=BB=E5=98=B1=E7=BB=84=E5=A5=97=E5=90=8E=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AD=97=E6=AE=B5=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SQL查询getGroupPackageDetail增加therapy_enum字段 - OrdersGroupPackageDetailQueryDto增加therapyEnum属性 - 修复组套明细保存时therapyEnum已写入但查询时丢失的问题 --- .../dto/OrdersGroupPackageDetailQueryDto.java | 5 +++++ .../personalization/OrdersGroupPackageAppMapper.xml | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java index 019a6eed..8a0fdec9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java @@ -88,5 +88,10 @@ public class OrdersGroupPackageDetailQueryDto { */ private Long groupId; + /** + * 治疗类型：1-长期 2-临时 + */ + private Integer therapyEnum; + } diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml index e9b50d68..3ecbdee1 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml @@ -42,13 +42,13 @@ togpd.quantity, togpd.unit_code, sdd.dict_label AS unit_code_name, - togpd.dose AS dose, - togpd.rate_code AS rate_code, - togpd.method_code AS method_code, - togpd.dose_quantity AS dose_quantity, + togpd.dose, + togpd.rate_code, + togpd.method_code, + togpd.dose_quantity, togpd.group_id, - togpd.therapy_enum AS therapy_enum, - togpd.dispense_per_duration AS dispense_per_duration, + togpd.dispense_per_duration, + togpd.therapy_enum, CASE WHEN togpd.order_definition_table = 'med_medication_definition' THEN med.NAME