fix: Bug #449/#450 门诊医生站接诊/数据加载失败 - 修复TodayOutpatientServiceImpl中receivePatient/completeVisit/cancelVisit方法空壳问题,改为调用DoctorStationMainAppService正确业务逻辑
This commit is contained in:
@@ -11,6 +11,7 @@ import com.openhis.common.constant.CommonConstants;
|
|||||||
import com.openhis.common.enums.*;
|
import com.openhis.common.enums.*;
|
||||||
import com.openhis.common.utils.EnumUtils;
|
import com.openhis.common.utils.EnumUtils;
|
||||||
import com.openhis.common.utils.HisQueryUtils;
|
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.appservice.ITodayOutpatientService;
|
||||||
import com.openhis.web.doctorstation.dto.TodayOutpatientPatientDto;
|
import com.openhis.web.doctorstation.dto.TodayOutpatientPatientDto;
|
||||||
import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam;
|
import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam;
|
||||||
@@ -32,6 +33,9 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService {
|
|||||||
@Resource
|
@Resource
|
||||||
private TodayOutpatientMapper todayOutpatientMapper;
|
private TodayOutpatientMapper todayOutpatientMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IDoctorStationMainAppService doctorStationMainAppService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TodayOutpatientStatsDto getTodayOutpatientStats(HttpServletRequest request) {
|
public TodayOutpatientStatsDto getTodayOutpatientStats(HttpServletRequest request) {
|
||||||
Long doctorId = SecurityUtils.getLoginUser().getUserId();
|
Long doctorId = SecurityUtils.getLoginUser().getUserId();
|
||||||
@@ -259,22 +263,19 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService {
|
|||||||
@Override
|
@Override
|
||||||
public R<?> receivePatient(Long encounterId, HttpServletRequest request) {
|
public R<?> receivePatient(Long encounterId, HttpServletRequest request) {
|
||||||
// 调用现有的接诊逻辑
|
// 调用现有的接诊逻辑
|
||||||
// 这里可以复用 DoctorStationMainAppServiceImpl 中的 receiveEncounter 方法
|
return doctorStationMainAppService.receiveEncounter(encounterId);
|
||||||
// 或者直接调用相应的服务
|
|
||||||
|
|
||||||
return R.ok("接诊成功");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public R<?> completeVisit(Long encounterId, HttpServletRequest request) {
|
public R<?> completeVisit(Long encounterId, HttpServletRequest request) {
|
||||||
// 调用现有的完诊逻辑
|
// 调用现有的完诊逻辑
|
||||||
return R.ok("就诊完成");
|
return doctorStationMainAppService.completeEncounter(encounterId, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public R<?> cancelVisit(Long encounterId, String reason, HttpServletRequest request) {
|
public R<?> cancelVisit(Long encounterId, String reason, HttpServletRequest request) {
|
||||||
// 调用现有的取消就诊逻辑
|
// 调用现有的取消就诊逻辑
|
||||||
return R.ok("就诊取消成功");
|
return doctorStationMainAppService.cancelEncounter(encounterId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user