From 9b8655748e4f0a42e1353c979f49c260d4565f5e Mon Sep 17 00:00:00 2001 From: guanyu Date: Tue, 28 Apr 2026 12:07:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Bug=20#449/#450=20=E9=97=A8=E8=AF=8A?= =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AB=99=E6=8E=A5=E8=AF=8A/=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5=20-=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DTodayOutpatientServiceImpl=E4=B8=ADreceivePatient/comp?= =?UTF-8?q?leteVisit/cancelVisit=E6=96=B9=E6=B3=95=E7=A9=BA=E5=A3=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=94=B9=E4=B8=BA=E8=B0=83=E7=94=A8?= =?UTF-8?q?DoctorStationMainAppService=E6=AD=A3=E7=A1=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TodayOutpatientServiceImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 +}