From bbef0322a35054dbc0de426bb22992f2c6d9a182 Mon Sep 17 00:00:00 2001 From: chenqi Date: Tue, 31 Mar 2026 17:18:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(surgicalschedule):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=8B=E6=9C=AF=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=94=B6=E8=B4=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=20BUG#306?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在手术申请查询界面添加手术单号输入框 - 将收费项目状态从草稿改为待收费状态 - 在请求表单DTO中添加手术单号字段 - 在数据库查询中关联手术安排表并添加手术单号过滤条件 - 添加筛选条件确保只查询未安排手术的申请记录 --- .../appservice/impl/SurgeryAppServiceImpl.java | 2 +- .../openhis/web/regdoctorstation/dto/RequestFormDto.java | 4 ++++ .../regdoctorstation/RequestFormManageAppMapper.xml | 5 +++++ openhis-ui-vue3/src/views/surgicalschedule/index.vue | 9 +++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java index 8e49158b..9be2fe68 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java @@ -347,7 +347,7 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService { // 生成收费项目 ChargeItem chargeItem = new ChargeItem(); - chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态 + chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 收费状态：待收费 chargeItem.setBusNo("CI" + serviceRequest.getBusNo()); chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源 chargeItem.setPatientId(surgeryDto.getPatientId()); // 患者 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java index 4f32af5f..a5d87254 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java @@ -10,6 +10,10 @@ import java.time.LocalDate; @AllArgsConstructor @NoArgsConstructor public class RequestFormDto { + /** + * 手术单号 + */ + private String surgeryNo; /** * 申请时间开始 */ 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 64725f1a..d4ea473f 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 @@ -98,7 +98,11 @@ 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' + LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0' + + AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%') + AND drf.create_time >= #{requestFormDto.applyTimeStart} @@ -112,6 +116,7 @@ AND cs.apply_dept_id = #{requestFormDto.applyDeptId} AND drf.delete_flag = '0' + AND os.schedule_id IS NULL ORDER BY drf.create_time DESC diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue index 99336298..c490f1b0 100644 --- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue +++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue @@ -692,6 +692,15 @@ + + +