diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java index 9f3a295e..60f10663 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java @@ -77,4 +77,8 @@ public class RequestFormPageDto { * 申请时间 */ private String applyTime; + /** + * 费用类别 + */ + private String feeType; } diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml index 1e981ba2..411ccf22 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -63,6 +63,7 @@ + @@ -83,11 +84,14 @@ cs.main_surgeon_name, cs.apply_dept_id, cs.apply_dept_name, - cs.surgery_type_enum + cs.surgery_type_enum, + fc.contract_name AS fee_type FROM doc_request_form drf LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no LEFT JOIN adm_patient ap ON ap.id = cs.patient_id LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id + LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0' + LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0' AND drf.create_time >= #{requestFormDto.applyTimeStart} diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue index bcaaeefc..3579fe8c 100644 --- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue +++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue @@ -1751,6 +1751,7 @@ function confirmApply() { form.surgeryNature = selectedRow.surgeryTypeEnum//手术性质 form.surgeonCode = selectedRow.mainSurgeonId//主刀医生id form.surgeonName = selectedRow.mainSurgeonName//主刀医生姓名 + form.feeType = selectedRow.feeType//费用类别 showApplyDialog.value = false }