From d5513d193bdc246ab7bcc56914b9c4a759709cd1 Mon Sep 17 00:00:00 2001 From: HaoWang <1477026787@qq.com> Date: Wed, 8 Nov 2023 09:34:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E9=97=AE?= =?UTF-8?q?=E8=AF=8A=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConsultationInfoController.java | 15 ++++++++++++++- .../HealthConsultationController.java | 4 ++-- .../HealthConsultationService.java | 2 +- .../impl/HealthConsultationServiceImpl.java | 8 ++++---- .../HospitalPersonInfoMapper.java | 4 ++-- .../HospitalPersonInfoMapper.xml | 4 ++++ 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java index ec1e3a6..a76ff0a 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java @@ -9,6 +9,8 @@ import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.custominterface.Insert; import com.xinelu.manage.domain.consultationInfo.ConsultationInfo; +import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo; +import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; import com.xinelu.manage.vo.consultationInfo.ConsultationInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,7 +35,8 @@ import java.util.Objects; public class ConsultationInfoController extends BaseController { @Autowired private IConsultationInfoService consultationInfoService; - + @Autowired + private IHospitalPersonInfoService hospitalPersonInfoService; /** * 查询在线问诊-问诊信息列表 @@ -45,6 +48,16 @@ public class ConsultationInfoController extends BaseController { return getDataTable(list); } + /** + * 获取在线问诊-问诊信息详细信息 + */ + @ApiOperation(value = "获取在线问诊-问诊信息详细信息") + @GetMapping(value = "/getHospitalPersonInfo") + public R getHospitalPersonInfo(@RequestParam("personCode") String personCode, + @RequestParam("status") String status) { + return R.ok(hospitalPersonInfoService.getByPersonCode(personCode,status)); + } + /** * 获取在线问诊-问诊信息详细信息 */ diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/healthconsultation/HealthConsultationController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/healthconsultation/HealthConsultationController.java index 315bb9e..02818d8 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/healthconsultation/HealthConsultationController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/healthconsultation/HealthConsultationController.java @@ -56,9 +56,9 @@ public class HealthConsultationController extends BaseController { */ @MobileRequestAuthorization @GetMapping("/selectHospitalPerson") - public TableDataInfo selectHospitalPerson(Long departmentId) { + public TableDataInfo selectHospitalPerson(HospitalPersonInfo hospitalPersonInfo) { startPage(); - List list = healthConsultationService.selectHospitalPerson(departmentId); + List list = healthConsultationService.selectHospitalPerson(hospitalPersonInfo); return getDataTable(list); } diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/HealthConsultationService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/HealthConsultationService.java index 17aa6fe..4630e14 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/HealthConsultationService.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/HealthConsultationService.java @@ -36,7 +36,7 @@ public interface HealthConsultationService { * @param departmentId 科室id * @return AjaxResult */ - List selectHospitalPerson(Long departmentId); + List selectHospitalPerson(HospitalPersonInfo hospitalPersonInfo); /** * 健康咨询-信息确认 diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/impl/HealthConsultationServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/impl/HealthConsultationServiceImpl.java index 53fc4aa..7c8d16b 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/impl/HealthConsultationServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/impl/HealthConsultationServiceImpl.java @@ -103,15 +103,15 @@ public class HealthConsultationServiceImpl implements HealthConsultationService /** * 单查科室人员 * - * @param departmentId 科室id + * @param hospitalPersonInfo 科室id * @return AjaxResult */ @Override - public List selectHospitalPerson(Long departmentId) { - if (Objects.isNull(departmentId)) { + public List selectHospitalPerson(HospitalPersonInfo hospitalPersonInfo) { + if (Objects.isNull(hospitalPersonInfo.getDepartmentId())) { return new ArrayList<>(); } - return hospitalPersonInfoMapper.selectHospitalPerson(departmentId); + return hospitalPersonInfoMapper.selectHospitalPerson(hospitalPersonInfo); } /** diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java index 8de9b62..2cc5deb 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java @@ -97,10 +97,10 @@ public interface HospitalPersonInfoMapper { /** * 健康咨询 根据科室查询医院人员 * - * @param departmentId 科室人员信息 + * @param hospitalPersonInfo 科室人员信息 * @return AjaxResult */ - List selectHospitalPerson(Long departmentId); + List selectHospitalPerson(HospitalPersonInfo hospitalPersonInfo); /** * 根据科室人员id查询科室人员数量 diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml index c3f2337..d2da1bb 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml @@ -497,6 +497,7 @@