clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
LiJianZhao 2025-05-23 13:17:16 +08:00
parent 33a0ccff84
commit 7c70e4cdbe
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
View File

@ -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.DateUtil;
import com.syjiaer.clinic.server.common.util.StringUtil; import com.syjiaer.clinic.server.common.util.StringUtil;
import com.syjiaer.clinic.server.common.vo.Page; 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.OrganizationMember;
import com.syjiaer.clinic.server.entity.organization.OrganizationSection; import com.syjiaer.clinic.server.entity.organization.OrganizationSection;
import com.syjiaer.clinic.server.entity.patient.PatientInfo; 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.dto.RegistrationSaveDto;
import com.syjiaer.clinic.server.entity.patient.vo.PatientAndRegistrationInfoVo; import com.syjiaer.clinic.server.entity.patient.vo.PatientAndRegistrationInfoVo;
import com.syjiaer.clinic.server.entity.patient.vo.PatientRegistrationVo; 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.OrganizationMemberMapper;
import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper;
import com.syjiaer.clinic.server.mapper.patient.PatientInfoMapper; import com.syjiaer.clinic.server.mapper.patient.PatientInfoMapper;
@ -53,6 +55,8 @@ public class PatientRegistrationService extends BaseService {
@Autowired @Autowired
private OrganizationSectionMapper organizationSectionMapper; private OrganizationSectionMapper organizationSectionMapper;
@Autowired @Autowired
private ManagerUserMapper managerUserMapper;
@Autowired
@Lazy @Lazy
private PatientRegistrationService patientRegistrationService; private PatientRegistrationService patientRegistrationService;
@Autowired @Autowired
@ -236,8 +240,18 @@ public class PatientRegistrationService extends BaseService {
* @param query 查询条件 * @param query 查询条件
*/ */
public Page<PatientRegistration> getPageByType(RegistrationQuery query) { public Page<PatientRegistration> 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<PatientRegistration> regisQuery = new QueryWrapper<>(); QueryWrapper<PatientRegistration> regisQuery = new QueryWrapper<>();
regisQuery.eq("del_flag", 0); regisQuery.eq("del_flag", 0);
if (member != null && member.getRole() == 1){
regisQuery.eq("organization_doctor_id", member.getId());
}
if (query.getStatus() != null) { if (query.getStatus() != null) {
regisQuery.eq("status", query.getStatus()); regisQuery.eq("status", query.getStatus());
} }

21
src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
View File

@ -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.charge.ChargeOrder;
import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis;
import com.syjiaer.clinic.server.entity.goods.Goods; 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.organization.OrganizationMember;
import com.syjiaer.clinic.server.entity.patient.PatientRegistration; import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
import com.syjiaer.clinic.server.entity.statistics.*; 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.charge.ChargeOrderMapper;
import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMapper; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMapper;
import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; 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.organization.OrganizationMemberMapper;
import com.syjiaer.clinic.server.mapper.patient.PatientRegistrationMapper; import com.syjiaer.clinic.server.mapper.patient.PatientRegistrationMapper;
import com.syjiaer.clinic.server.service.BaseService; import com.syjiaer.clinic.server.service.BaseService;
@ -39,6 +41,8 @@ public class StatisticsService extends BaseService {
private DiagnosisMapper diagnosisMapper; private DiagnosisMapper diagnosisMapper;
@Autowired @Autowired
private GoodsMapper goodsMapper; private GoodsMapper goodsMapper;
@Autowired
private ManagerUserMapper managerUserMapper;
public RevenueOverviewVo getRevenueOverview(LocalDateTime begin, LocalDateTime end) { public RevenueOverviewVo getRevenueOverview(LocalDateTime begin, LocalDateTime end) {
RevenueOverviewVo overviewVo = new RevenueOverviewVo(); RevenueOverviewVo overviewVo = new RevenueOverviewVo();
@ -187,6 +191,14 @@ public class StatisticsService extends BaseService {
} }
public TipCountVo getWaitCount(LocalDateTime beginTime, LocalDateTime endTime) { 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(); TipCountVo tipCountVo = new TipCountVo();
RegistrationStatusEnum registrationStatusEnum = RegistrationStatusEnum.waiting; RegistrationStatusEnum registrationStatusEnum = RegistrationStatusEnum.waiting;
QueryWrapper<PatientRegistration> registrationWrapper = new QueryWrapper<>(); QueryWrapper<PatientRegistration> registrationWrapper = new QueryWrapper<>();
@ -194,6 +206,9 @@ public class StatisticsService extends BaseService {
registrationWrapper.ge("create_datetime", beginTime); registrationWrapper.ge("create_datetime", beginTime);
registrationWrapper.eq("status", registrationStatusEnum.getStatus()); registrationWrapper.eq("status", registrationStatusEnum.getStatus());
registrationWrapper.eq("del_flag",0); registrationWrapper.eq("del_flag",0);
if (member != null && member.getRole() == 1){
registrationWrapper.eq("organization_doctor_id", member.getId());
}
tipCountVo.setWaitDiagnosisCount(patientRegistrationMapper.selectCount(registrationWrapper)); tipCountVo.setWaitDiagnosisCount(patientRegistrationMapper.selectCount(registrationWrapper));
registrationStatusEnum = RegistrationStatusEnum.inProgress; registrationStatusEnum = RegistrationStatusEnum.inProgress;
@ -202,6 +217,9 @@ public class StatisticsService extends BaseService {
registrationWrapper.ge("create_datetime", beginTime); registrationWrapper.ge("create_datetime", beginTime);
registrationWrapper.eq("status", registrationStatusEnum.getStatus()); registrationWrapper.eq("status", registrationStatusEnum.getStatus());
registrationWrapper.eq("del_flag",0); registrationWrapper.eq("del_flag",0);
if (member != null && member.getRole() == 1){
registrationWrapper.eq("organization_doctor_id", member.getId());
}
tipCountVo.setDiagnosingCount(patientRegistrationMapper.selectCount(registrationWrapper)); tipCountVo.setDiagnosingCount(patientRegistrationMapper.selectCount(registrationWrapper));
registrationStatusEnum = RegistrationStatusEnum.complete; registrationStatusEnum = RegistrationStatusEnum.complete;
@ -210,6 +228,9 @@ public class StatisticsService extends BaseService {
registrationWrapper.ge("create_datetime", beginTime); registrationWrapper.ge("create_datetime", beginTime);
registrationWrapper.eq("status", registrationStatusEnum.getStatus()); registrationWrapper.eq("status", registrationStatusEnum.getStatus());
registrationWrapper.eq("del_flag",0); registrationWrapper.eq("del_flag",0);
if (member != null && member.getRole() == 1){
registrationWrapper.eq("organization_doctor_id", member.getId());
}
tipCountVo.setCompleteDiaCount(patientRegistrationMapper.selectCount(registrationWrapper)); tipCountVo.setCompleteDiaCount(patientRegistrationMapper.selectCount(registrationWrapper));