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

dev

This commit is contained in:
牛子源 2025-05-26 09:33:16 +08:00
parent d9b6676e6e
commit bcdfa82ece
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java
View File

@ -87,12 +87,12 @@ public class StatisticsController extends BaseController {
* 获取收费队列 就诊队列数量
*/
@RequestMapping("/getTipCount")
public Result<TipCountVo> getChargeQueueCount() {
public Result<TipCountVo> getTipCount() {
String begin = parmsUtil.getString("beginTime", "开始时间为空");
String end = parmsUtil.getString("endTime", "结束时间为空");
LocalDateTime beginTime = DateUtil.getDateTime(begin);
LocalDateTime endTime = DateUtil.getDateTime(end);
return success( statisticsService.getWaitCount(beginTime, endTime));
return success( statisticsService.getTipCount(beginTime, endTime));
}
/**
* 商品统计

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

@ -292,6 +292,12 @@ public class PatientRegistrationService extends BaseService {
if (query.getPageSize() == null) {
query.setPageSize(Constants.DetailPageSize);
}
if (query.getBeginTime() != null) {
PatientQueryWrapper.ge("update_datetime", query.getBeginTime());
}
if (query.getEndTime() != null) {
PatientQueryWrapper.le("update_datetime", query.getEndTime());
}
return PatientQueryWrapper;
}
@ -311,6 +317,7 @@ public class PatientRegistrationService extends BaseService {
regis.setIsAppointment(true);
}
});
return list;
}

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

@ -190,7 +190,7 @@ public class StatisticsService extends BaseService {
return result;
}
public TipCountVo getWaitCount(LocalDateTime beginTime, LocalDateTime endTime) {
public TipCountVo getTipCount(LocalDateTime beginTime, LocalDateTime endTime) {
ManagerUser user = getManagerUser();
ManagerUser dbUser = managerUserMapper.selectById(user.getId());
OrganizationMember member= null;
@ -213,8 +213,8 @@ public class StatisticsService extends BaseService {
registrationStatusEnum = RegistrationStatusEnum.inProgress;
registrationWrapper = new QueryWrapper<>();
registrationWrapper.lt("appointment_time", endTime);
registrationWrapper.ge("appointment_time", beginTime);
registrationWrapper.lt("update_datetime", endTime);
registrationWrapper.ge("update_datetime", beginTime);
registrationWrapper.eq("status", registrationStatusEnum.getStatus());
registrationWrapper.eq("del_flag",0);
if (member != null && member.getRole() == 1){
@ -224,8 +224,8 @@ public class StatisticsService extends BaseService {
registrationStatusEnum = RegistrationStatusEnum.complete;
registrationWrapper = new QueryWrapper<>();
registrationWrapper.lt("appointment_time", endTime);
registrationWrapper.ge("appointment_time", beginTime);
registrationWrapper.lt("update_datetime", endTime);
registrationWrapper.ge("update_datetime", beginTime);
registrationWrapper.eq("status", registrationStatusEnum.getStatus());
registrationWrapper.eq("del_flag",0);
if (member != null && member.getRole() == 1){