diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java index c55c6b5c..0357e03b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java @@ -11,6 +11,7 @@ import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.*; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService; import com.openhis.web.doctorstation.appservice.ITodayOutpatientService; import com.openhis.web.doctorstation.dto.TodayOutpatientPatientDto; import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam; @@ -32,6 +33,9 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService { @Resource private TodayOutpatientMapper todayOutpatientMapper; + @Resource + private IDoctorStationMainAppService doctorStationMainAppService; + @Override public TodayOutpatientStatsDto getTodayOutpatientStats(HttpServletRequest request) { Long doctorId = SecurityUtils.getLoginUser().getUserId(); @@ -259,22 +263,19 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService { @Override public R receivePatient(Long encounterId, HttpServletRequest request) { // 调用现有的接诊逻辑 - // 这里可以复用 DoctorStationMainAppServiceImpl 中的 receiveEncounter 方法 - // 或者直接调用相应的服务 - - return R.ok("接诊成功"); + return doctorStationMainAppService.receiveEncounter(encounterId); } @Override public R completeVisit(Long encounterId, HttpServletRequest request) { // 调用现有的完诊逻辑 - return R.ok("就诊完成"); + return doctorStationMainAppService.completeEncounter(encounterId, null); } @Override public R cancelVisit(Long encounterId, String reason, HttpServletRequest request) { // 调用现有的取消就诊逻辑 - return R.ok("就诊取消成功"); + return doctorStationMainAppService.cancelEncounter(encounterId); } /** @@ -302,4 +303,4 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService { return orderBy; } -} \ No newline at end of file +}