diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PlatformService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PlatformService.java
index c02e8aa..748a4ff 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PlatformService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PlatformService.java
@@ -116,8 +116,11 @@ public class PlatformService {
//15-18
int sum15 = weekMonthTimeResps.stream().filter(a -> a.getCreateTime() >= 15 && a.getCreateTime() < 18).mapToInt(WeekMonthTimeResp::getCount).sum();
//18-21
- int sum18 = weekMonthTimeResps.stream().filter(a -> a.getCreateTime() >= 18 && a.getCreateTime() <= 21).mapToInt(WeekMonthTimeResp::getCount).sum();
+ int sum18 = weekMonthTimeResps.stream().filter(a -> a.getCreateTime() >= 18 && a.getCreateTime() < 21).mapToInt(WeekMonthTimeResp::getCount).sum();
+ //21-24
+ int sum21 = weekMonthTimeResps.stream().filter(a -> a.getCreateTime() >= 21 && a.getCreateTime() <= 24).mapToInt(WeekMonthTimeResp::getCount).sum();
map.put("sum0",sum0);map.put("sum3",sum3);map.put("sum6",sum6);map.put("sum9",sum9);map.put("sum12",sum12);map.put("sum15",sum15);map.put("sum18",sum18);
+ map.put("sum21",sum21);
return map;
}
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
index 494f621..c0c64e9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
@@ -214,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.name
from t_record a LEFT JOIN t_patient b on a.patient_id = b.id
where TO_DAYS(a.create_time) = TO_DAYS(NOW())
+ and b.del_flag = 0
and a.doctor_id = #{doctorId}
and a.hospital_id = #{hospitalId}
ORDER BY a.create_time desc
@@ -237,10 +238,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"