diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java index 4ebea0d..ff10493 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java @@ -2,13 +2,11 @@ package com.lyms.talkonlineweb.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.lyms.talkonlineweb.domain.LymsDepartill; -import com.lyms.talkonlineweb.domain.LymsDict; -import com.lyms.talkonlineweb.domain.LymsHdepart; -import com.lyms.talkonlineweb.domain.LymsHospital; +import com.lyms.talkonlineweb.domain.*; import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.service.LymsDepartillService; import com.lyms.talkonlineweb.service.LymsHdepartService; +import com.lyms.talkonlineweb.service.LymsIllnessService; import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.JwtUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -47,12 +45,26 @@ public class DepartController { BaseResponse baseResponse=new BaseResponse(); Page page=new Page<>(current,size); Page departPage=lymsHdepartService.page(page, Wrappers.query(depart).orderByDesc("updated_time","createdtime")); - + addIll(departPage); baseResponse.setObject(departPage); return baseResponse; } + public void addIll(Page departPage){ + departPage.getRecords().forEach(e->{ + Map param=new HashMap(); + param.put("did",e.getDid()); + List iLst=lymsDepartillService.listByMap(param); + iLst.forEach(i->{ + if(e.getIlls()==null){ + e.setIlls(""); + } + e.setIlls(e.getIlls()+i.getIid()+","); + }); + }); + } + /**