diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java index 44ec6e33e..a84045564 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java @@ -1,7 +1,7 @@ package com.openhis.web.Inspection.dto; -import lombok.Data; -import lombok.experimental.Accessors; +import lombok.Getter; +import lombok.Setter; import java.util.List; @@ -11,30 +11,17 @@ import java.util.List; * @author * @date */ -@Data -@Accessors(chain = true) +@Getter +@Setter public class InstrumentManageInitDto { private List statusFlagOptions; - private List InstrumentTypeList; - private List InstrumentStatusEnumList; - - // 手动添加 setter 方法 - public void setStatusFlagOptions(List statusFlagOptions) { - this.statusFlagOptions = statusFlagOptions; - } - - public void setInstrumentTypeList(List InstrumentTypeList) { - this.InstrumentTypeList = InstrumentTypeList; - } - - public void setInstrumentStatusEnumList(List InstrumentStatusEnumList) { - this.InstrumentStatusEnumList = InstrumentStatusEnumList; - } + private List instrumentTypeList; + private List instrumentStatusEnumList; /** * 状态 */ - @Data + @Getter public static class statusEnumOption { private Integer value; private String info; @@ -44,7 +31,7 @@ public class InstrumentManageInitDto { } } - @Data + @Getter public static class InstrumentStatusEnumOption { private Integer value; private String info; @@ -54,7 +41,7 @@ public class InstrumentManageInitDto { } } - @Data + @Getter public static class InstrumentType { private Integer value; private String info; @@ -63,6 +50,4 @@ public class InstrumentManageInitDto { this.info = info; } } - - -} +} \ No newline at end of file diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml index d85551cef..ead82c745 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml @@ -515,7 +515,7 @@ T1.encounter_id AS encounter_id, T1.patient_id AS patient_id, 'med_medication_definition' AS advice_table_name, - T1.medication_id AS advice_definition_id + T1.medication_id AS advice_definition_id, , T1.content_json::jsonb ->> 'remark' AS remark FROM med_medication_request AS T1 LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id @@ -696,7 +696,7 @@ T1.encounter_id AS encounter_id, T1.patient_id AS patient_id, 'adm_device_definition' AS advice_table_name, - T1.device_def_id AS advice_definition_id + T1.device_def_id AS advice_definition_id, , T1.content_json::jsonb ->> 'remark' AS remark FROM wor_device_request AS T1 LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id @@ -754,7 +754,7 @@ T1.patient_id AS patient_id, 'wor_activity_definition' AS advice_table_name, , T1.remark AS remark - T1.activity_id AS advice_definition_id + T1.activity_id AS advice_definition_id, FROM wor_service_request AS T1 LEFT JOIN wor_activity_definition AS T2 ON T2.ID = T1.activity_id @@ -933,4 +933,4 @@ ORDER BY t1.ID, t1.name ASC, t2.ID ASC - \ No newline at end of file + diff --git a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue index 48e1be61e..7a201ec7f 100755 --- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue @@ -757,24 +757,6 @@ -
-
-
加载中...
-
+ + - @@ -938,8 +913,6 @@ - -