From 04a3893aef11cef6487bf94d7b6d066d9e55ca61 Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Wed, 8 Sep 2021 13:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E7=96=BE=E7=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../talkonlineweb/controller/DepartController.java | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

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<LymsHdepart> page=new Page<>(current,size);
         Page<LymsHdepart> departPage=lymsHdepartService.page(page, Wrappers.query(depart).orderByDesc("updated_time","createdtime"));
-
+        addIll(departPage);
         baseResponse.setObject(departPage);
 
         return baseResponse;
     }
 
+    public void addIll(Page<LymsHdepart> departPage){
+        departPage.getRecords().forEach(e->{
+            Map param=new HashMap();
+            param.put("did",e.getDid());
+            List<LymsDepartill> iLst=lymsDepartillService.listByMap(param);
+            iLst.forEach(i->{
+                if(e.getIlls()==null){
+                    e.setIlls("");
+                }
+                e.setIlls(e.getIlls()+i.getIid()+",");
+            });
+        });
+    }
+
 
 
     /**
-- 
1.8.3.1