diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java index 39c69f0..a73c624 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java @@ -21,7 +21,6 @@ import com.renkang.emergency.mapper.*; import com.renkang.emergency.service.IEmergencyCenterService; import com.renkang.emergency.service.ISysNotifySmsPhoneService; import com.renkang.emergency.service.ITblAmbulanceGpsService; -import com.renkang.emergency.util.CodeConstant; import com.renkang.emergency.util.DateUtils; import com.renkang.emergency.websocket.WebSocket; import com.renkang.im.api.IMHelloApi; @@ -31,17 +30,13 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; 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.constant.CommonConstant; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUserNew; -import org.jeecg.common.system.vo.SysDepartModel; import org.jeecg.global.GlobalUtils; 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -214,7 +209,8 @@ public class EmergencyApiServiceImpl implements EmergencyApiService { Stat stat = new Stat(); stat.setCompletionRate(getCompletionRate(userId, personType)); stat.setTotalNum(getTotalNum(userId, personType)); - stat.setDutyTeamNum(getDutyTeamNum()); +// stat.setDutyTeamNum(getDutyTeamNum()); + stat.setDutyTeamNum(getDutyTeamNumV2(userId)); stat.setTimelinessRate(getTimelinessRate(userId)); return stat; } @@ -232,6 +228,11 @@ public class EmergencyApiServiceImpl implements EmergencyApiService { return onDutyPerson; } + private Integer getDutyTeamNumV2(String userId) { + Integer num = emergencySeriousDiseaseMapper.dutyTeam(userId); + return num == null ? 0 : num; + } + private CenterUser findOnDutyUser(boolean isDefaultCenter) { EmergencyCenter emergencyCenter = getEmergencyCenter(isDefaultCenter); CenterUser centerUser = new CenterUser(); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/EmergencySeriousDiseaseMapper.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/EmergencySeriousDiseaseMapper.java index c62fd78..eb3d3fe 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/EmergencySeriousDiseaseMapper.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/EmergencySeriousDiseaseMapper.java @@ -35,4 +35,6 @@ public interface EmergencySeriousDiseaseMapper extends BaseMapper order by a.create_time desc +