update:应急小组数量修改

This commit is contained in:
stan
2025-08-15 14:07:15 +08:00
parent 4e4cce85e8
commit a035d3f47e
3 changed files with 25 additions and 6 deletions
@@ -21,7 +21,6 @@ import com.renkang.emergency.mapper.*;
import com.renkang.emergency.service.IEmergencyCenterService; import com.renkang.emergency.service.IEmergencyCenterService;
import com.renkang.emergency.service.ISysNotifySmsPhoneService; import com.renkang.emergency.service.ISysNotifySmsPhoneService;
import com.renkang.emergency.service.ITblAmbulanceGpsService; import com.renkang.emergency.service.ITblAmbulanceGpsService;
import com.renkang.emergency.util.CodeConstant;
import com.renkang.emergency.util.DateUtils; import com.renkang.emergency.util.DateUtils;
import com.renkang.emergency.websocket.WebSocket; import com.renkang.emergency.websocket.WebSocket;
import com.renkang.im.api.IMHelloApi; import com.renkang.im.api.IMHelloApi;
@@ -31,17 +30,13 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.bean.request.ListUser; import org.jeecg.bean.request.ListUser;
import org.jeecg.common.api.dto.message.BusTemplateMessageDTO;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.system.vo.LoginUserNew; import org.jeecg.common.system.vo.LoginUserNew;
import org.jeecg.common.system.vo.SysDepartModel;
import org.jeecg.global.GlobalUtils; import org.jeecg.global.GlobalUtils;
import org.jeecg.modules.manager.ISysCache; import org.jeecg.modules.manager.ISysCache;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.entity.SysUser;
import org.parboiled.common.StringUtils; import org.parboiled.common.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -214,7 +209,8 @@ public class EmergencyApiServiceImpl implements EmergencyApiService {
Stat stat = new Stat(); Stat stat = new Stat();
stat.setCompletionRate(getCompletionRate(userId, personType)); stat.setCompletionRate(getCompletionRate(userId, personType));
stat.setTotalNum(getTotalNum(userId, personType)); stat.setTotalNum(getTotalNum(userId, personType));
stat.setDutyTeamNum(getDutyTeamNum()); // stat.setDutyTeamNum(getDutyTeamNum());
stat.setDutyTeamNum(getDutyTeamNumV2(userId));
stat.setTimelinessRate(getTimelinessRate(userId)); stat.setTimelinessRate(getTimelinessRate(userId));
return stat; return stat;
} }
@@ -232,6 +228,11 @@ public class EmergencyApiServiceImpl implements EmergencyApiService {
return onDutyPerson; return onDutyPerson;
} }
private Integer getDutyTeamNumV2(String userId) {
Integer num = emergencySeriousDiseaseMapper.dutyTeam(userId);
return num == null ? 0 : num;
}
private CenterUser findOnDutyUser(boolean isDefaultCenter) { private CenterUser findOnDutyUser(boolean isDefaultCenter) {
EmergencyCenter emergencyCenter = getEmergencyCenter(isDefaultCenter); EmergencyCenter emergencyCenter = getEmergencyCenter(isDefaultCenter);
CenterUser centerUser = new CenterUser(); CenterUser centerUser = new CenterUser();
@@ -35,4 +35,6 @@ public interface EmergencySeriousDiseaseMapper extends BaseMapper<EmergencySerio
@Select("select count(1) from emergency_serious_disease where user_id = #{userId} and state < 5") @Select("select count(1) from emergency_serious_disease where user_id = #{userId} and state < 5")
int selectEmergencyExist(String userId); int selectEmergencyExist(String userId);
Integer dutyTeam(String userId);
} }
@@ -96,4 +96,20 @@
</where> </where>
order by a.create_time desc order by a.create_time desc
</select> </select>
<select id="dutyTeam" resultType="java.lang.Integer">
SELECT t8.num
from (SELECT t1.user_type AS type,
count(1) AS num
FROM emergency_schedules_new_item t1
LEFT JOIN emergency_new_schedules t2 ON t1.schedules_id = t2.id
LEFT JOIN emergency_profession_user t3 ON t3.center_id = t2.center_id
WHERE t3.user_id = #{userId}
AND DATE ( t2.schedules_time) = CURRENT_DATE
GROUP BY
t1.user_type
) t8
ORDER BY
t8.num
LIMIT 1
</select>
</mapper> </mapper>