pc bug 修改

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;
     }
 }

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
         <if test="doctorId != null "> and a.doctor_id = #{doctorId}</if>
         <if test="hospitalId != null "> and a.hospital_id = #{hospitalId}</if>
         ORDER BY a.create_time desc
@@ -237,10 +238,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="ageCount" resultType="com.ruoyi.system.domain.TPatient">
         SELECT
-        a.id,a.age
+        DISTINCT(a.phone),a.id,a.age
         from t_patient a
         inner JOIN t_record b on a.id = b.patient_id
         where 1 = 1
+        and a.del_flag = 0
         <if test="doctorId != null "> and b.doctor_id = #{doctorId}</if>
         <if test="hospitalId != null "> and b.hospital_id = #{hospitalId}</if>
     </select>