From 7c70e4cdbe9cec36115c23c604c0bdfded33cb48 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Fri, 23 May 2025 13:17:16 +0800 Subject: [PATCH] dev --- .../patient/PatientRegistrationService.java | 14 +++++++++++++ .../service/statistics/StatisticsService.java | 21 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java index da11b6a..e839228 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java @@ -13,6 +13,7 @@ import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.DateUtil; import com.syjiaer.clinic.server.common.util.StringUtil; import com.syjiaer.clinic.server.common.vo.Page; +import com.syjiaer.clinic.server.entity.manager.ManagerUser; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; import com.syjiaer.clinic.server.entity.organization.OrganizationSection; import com.syjiaer.clinic.server.entity.patient.PatientInfo; @@ -21,6 +22,7 @@ import com.syjiaer.clinic.server.entity.patient.dto.RegistrationQuery; import com.syjiaer.clinic.server.entity.patient.dto.RegistrationSaveDto; import com.syjiaer.clinic.server.entity.patient.vo.PatientAndRegistrationInfoVo; import com.syjiaer.clinic.server.entity.patient.vo.PatientRegistrationVo; +import com.syjiaer.clinic.server.mapper.manager.ManagerUserMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper; import com.syjiaer.clinic.server.mapper.patient.PatientInfoMapper; @@ -53,6 +55,8 @@ public class PatientRegistrationService extends BaseService { @Autowired private OrganizationSectionMapper organizationSectionMapper; @Autowired + private ManagerUserMapper managerUserMapper; + @Autowired @Lazy private PatientRegistrationService patientRegistrationService; @Autowired @@ -236,8 +240,18 @@ public class PatientRegistrationService extends BaseService { * @param query 查询条件 */ public Page getPageByType(RegistrationQuery query) { + ManagerUser user = getManagerUser(); + ManagerUser dbUser = managerUserMapper.selectById(user.getId()); + OrganizationMember member= null; + if (dbUser != null && dbUser.getOrganizationMemberId() != null){ + member = organizationMemberMapper.selectById(dbUser.getOrganizationMemberId()); + } + QueryWrapper regisQuery = new QueryWrapper<>(); regisQuery.eq("del_flag", 0); + if (member != null && member.getRole() == 1){ + regisQuery.eq("organization_doctor_id", member.getId()); + } if (query.getStatus() != null) { regisQuery.eq("status", query.getStatus()); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java index f9735d4..1f16c6e 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java @@ -7,6 +7,7 @@ import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList; import com.syjiaer.clinic.server.entity.charge.ChargeOrder; import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; import com.syjiaer.clinic.server.entity.goods.Goods; +import com.syjiaer.clinic.server.entity.manager.ManagerUser; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; import com.syjiaer.clinic.server.entity.patient.PatientRegistration; import com.syjiaer.clinic.server.entity.statistics.*; @@ -14,6 +15,7 @@ import com.syjiaer.clinic.server.mapper.charge.ChargeGoodsListMapper; import com.syjiaer.clinic.server.mapper.charge.ChargeOrderMapper; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMapper; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; +import com.syjiaer.clinic.server.mapper.manager.ManagerUserMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; import com.syjiaer.clinic.server.mapper.patient.PatientRegistrationMapper; import com.syjiaer.clinic.server.service.BaseService; @@ -39,6 +41,8 @@ public class StatisticsService extends BaseService { private DiagnosisMapper diagnosisMapper; @Autowired private GoodsMapper goodsMapper; + @Autowired + private ManagerUserMapper managerUserMapper; public RevenueOverviewVo getRevenueOverview(LocalDateTime begin, LocalDateTime end) { RevenueOverviewVo overviewVo = new RevenueOverviewVo(); @@ -187,6 +191,14 @@ public class StatisticsService extends BaseService { } public TipCountVo getWaitCount(LocalDateTime beginTime, LocalDateTime endTime) { + ManagerUser user = getManagerUser(); + ManagerUser dbUser = managerUserMapper.selectById(user.getId()); + OrganizationMember member= null; + if (dbUser != null && dbUser.getOrganizationMemberId() != null){ + member = organizationMemberMapper.selectById(dbUser.getOrganizationMemberId()); + } + + TipCountVo tipCountVo = new TipCountVo(); RegistrationStatusEnum registrationStatusEnum = RegistrationStatusEnum.waiting; QueryWrapper registrationWrapper = new QueryWrapper<>(); @@ -194,6 +206,9 @@ public class StatisticsService extends BaseService { registrationWrapper.ge("create_datetime", beginTime); registrationWrapper.eq("status", registrationStatusEnum.getStatus()); registrationWrapper.eq("del_flag",0); + if (member != null && member.getRole() == 1){ + registrationWrapper.eq("organization_doctor_id", member.getId()); + } tipCountVo.setWaitDiagnosisCount(patientRegistrationMapper.selectCount(registrationWrapper)); registrationStatusEnum = RegistrationStatusEnum.inProgress; @@ -202,6 +217,9 @@ public class StatisticsService extends BaseService { registrationWrapper.ge("create_datetime", beginTime); registrationWrapper.eq("status", registrationStatusEnum.getStatus()); registrationWrapper.eq("del_flag",0); + if (member != null && member.getRole() == 1){ + registrationWrapper.eq("organization_doctor_id", member.getId()); + } tipCountVo.setDiagnosingCount(patientRegistrationMapper.selectCount(registrationWrapper)); registrationStatusEnum = RegistrationStatusEnum.complete; @@ -210,6 +228,9 @@ public class StatisticsService extends BaseService { registrationWrapper.ge("create_datetime", beginTime); registrationWrapper.eq("status", registrationStatusEnum.getStatus()); registrationWrapper.eq("del_flag",0); + if (member != null && member.getRole() == 1){ + registrationWrapper.eq("organization_doctor_id", member.getId()); + } tipCountVo.setCompleteDiaCount(patientRegistrationMapper.selectCount(registrationWrapper));