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