diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java index 1074d6533..4341e6b8f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java @@ -2,9 +2,13 @@ package com.openhis.web.clinicalmanage.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; +import com.openhis.common.enums.ActivityDefCategory; import com.openhis.web.clinicalmanage.appservice.ISurgicalScheduleAppService; import com.openhis.web.clinicalmanage.dto.OpCreateScheduleDto; import com.openhis.web.clinicalmanage.dto.OpScheduleDto; +import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService; +import com.openhis.web.regdoctorstation.dto.RequestFormDto; +import com.openhis.web.regdoctorstation.dto.RequestFormPageDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -26,6 +30,7 @@ import java.util.Map; public class SurgicalScheduleController { private final ISurgicalScheduleAppService surgicalScheduleAppService; + private final IRequestFormManageAppService requestFormManageAppService; /** * 分页查询手术安排列表 @@ -87,6 +92,27 @@ public class SurgicalScheduleController { return surgicalScheduleAppService.deleteSurgerySchedule(scheduleId); } + /** + * 分页查询待排期手术申请列表 + * + * @param requestFormDto 查询条件 + * @return 手术申请列表 + */ + @PostMapping(value = "/apply-list") + public R> getSurgeryApplyList(@RequestBody RequestFormDto requestFormDto) { + if (requestFormDto.getPageNo() == null) { + requestFormDto.setPageNo(1); + } + if (requestFormDto.getPageSize() == null) { + requestFormDto.setPageSize(10); + } + //虽然很想这么写,但是库里的手术申请单的type_code都是直接写的SURGERY +// requestFormDto.setTypeCode(ActivityDefCategory.PROCEDURE.getCode()); + //只查询手术申请单 + requestFormDto.setTypeCode("SURGERY"); + return R.ok(requestFormManageAppService.getRequestFormPage(requestFormDto)); + } + /** * 导出手术安排列表 * 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 a5d872542..7e564cac4 100755 --- 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 @@ -14,6 +14,10 @@ public class RequestFormDto { * 手术单号 */ private String surgeryNo; + /** + * 申请单类型编码 + */ + private String typeCode; /** * 申请时间开始 */ 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 de33a2ca2..e47dbf203 100755 --- 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 @@ -161,6 +161,9 @@ AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%') + + AND drf.type_code = #{requestFormDto.typeCode} + 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 fc71b67a0..68d214d1c 100755 --- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue +++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue @@ -872,11 +872,17 @@ import { Loading } from '@element-plus/icons-vue' // 🔧 新增:导入 Loadin import { getPrescriptionList } from '@/views/clinicmanagement/bargain/component/api' // API 导入 -import { getSurgerySchedulePage, addSurgerySchedule, updateSurgerySchedule, deleteSurgerySchedule, getSurgeryScheduleDetail } from '@/api/surgicalschedule' +import { + getSurgerySchedulePage, + addSurgerySchedule, + updateSurgerySchedule, + deleteSurgerySchedule, + getSurgeryScheduleDetail, + getSurgeryApplyList +} from '@/api/surgicalschedule' import { listUser } from '@/api/system/user' import { deptTreeSelect } from '@/api/system/user' import { listOperatingRoom } from '@/api/operatingroom' -import { getSurgery} from '@/views/inpatientDoctor/home/components/applicationShow/api.js' import { getTenantPage } from '@/api/system/tenant' import { getContract } from '@/views/inpatientDoctor/home/components/api.js' import SurgeryCharge from '../charge/surgerycharge/index.vue' @@ -2032,7 +2038,7 @@ function getSurgicalScheduleList() { params.applyTimeEnd = params.applyTimeRange[1] delete params.applyTimeRange } - getSurgery(params).then((res) => { + getSurgeryApplyList(params).then((res) => { // Check if data is nested under data.data or directly under data const responseData = res.data.data || res.data applyList.value = responseData.records || [] @@ -2282,4 +2288,4 @@ function getRowClassName({ row, rowIndex }) { border-bottom: 1px solid #d9ecff !important; } - \ No newline at end of file +