diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java index fa9ab5e7..f6bbadfa 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java @@ -3,6 +3,7 @@ package com.openhis.web.patientmanage.appservice; import java.util.List; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; import com.openhis.web.patientmanage.dto.OutpatientRecordDto; import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam; @@ -30,5 +31,5 @@ public interface IOutpatientRecordService { * * @return 医生名字列表 */ - List getDoctorNames(); + R getDoctorNames(); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java index 71261560..a02b75a3 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import javax.annotation.Resource; +import com.core.common.core.domain.R; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -63,8 +64,8 @@ public class OutpatientRecordServiceImpl implements IOutpatientRecordService { * * @return 医生名字列表 */ - public List getDoctorNames() { - return patientManageMapper.getDoctorNames(); + public R getDoctorNames() { + return R.ok(patientManageMapper.getDoctorNames()); } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java index 8580e873..1ac8ef93 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java @@ -36,7 +36,7 @@ public class OutpatientRecordController { @GetMapping("/init") public R getDoctorNames() { // 获取医生名字列表 - return R.ok(outpatientRecordService.getDoctorNames()); + return outpatientRecordService.getDoctorNames(); } /**