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 ff10493..fc0b6d4 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lyms.talkonlineweb.domain.*; import com.lyms.talkonlineweb.result.BaseResponse; +import com.lyms.talkonlineweb.service.HdepartInfoService; import com.lyms.talkonlineweb.service.LymsDepartillService; import com.lyms.talkonlineweb.service.LymsHdepartService; import com.lyms.talkonlineweb.service.LymsIllnessService; @@ -32,6 +33,9 @@ public class DepartController { @Autowired //科室所拥有的疾病 private LymsDepartillService lymsDepartillService; + @Autowired + private HdepartInfoService hdepartInfoService; + /** * 获取科室列表 @@ -41,17 +45,20 @@ public class DepartController { * @return */ @GetMapping("sltDepartLst") - public BaseResponse sltDepartLst(LymsHdepart depart, int current, int size){ + public BaseResponse sltDepartLst(HdepartInfo depart, int current, int size){ BaseResponse baseResponse=new BaseResponse(); - Page page=new Page<>(current,size); - Page departPage=lymsHdepartService.page(page, Wrappers.query(depart).orderByDesc("updated_time","createdtime")); +// Page page=new Page<>(current,size); +// Page departPage=lymsHdepartService.page(page, Wrappers.query(depart).orderByDesc("updated_time","createdtime")); +// addIll(departPage); + Page page=new Page<>(current,size); + Page departPage=hdepartInfoService.page(page, Wrappers.query(depart).orderByDesc("updated_time","createdtime")); addIll(departPage); baseResponse.setObject(departPage); return baseResponse; } - public void addIll(Page departPage){ + public void addIll(Page departPage){ departPage.getRecords().forEach(e->{ Map param=new HashMap(); param.put("did",e.getDid()); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/HdepartInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/HdepartInfo.java index 285b088..886c695 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/HdepartInfo.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/HdepartInfo.java @@ -9,7 +9,7 @@ import java.util.Date; import lombok.Data; /** - * + * 科室视图 * @TableName hdepart_info */ @TableName(value ="hdepart_info") @@ -87,6 +87,12 @@ public class HdepartInfo implements Serializable { @TableField(value = "htypename") private String htypename; + /** + * 疾病id串 + */ + @TableField(exist = false) + private String ills; + @TableField(exist = false) private static final long serialVersionUID = 1L;