changpengfei / talkonline

Commit 03c8e3c84f384059ff47dad1fb2b5fe48e81ecb0

Authored by shiyang over 3 years ago

Exists in master

update

Showing 2 changed files with 18 additions and 5 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/HdepartInfo.java

...	...	@@ -4,6 +4,7 @@
4	4	import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5	5	import com.lyms.talkonlineweb.domain.*;
6	6	import com.lyms.talkonlineweb.result.BaseResponse;
	7	+import com.lyms.talkonlineweb.service.HdepartInfoService;
7	8	import com.lyms.talkonlineweb.service.LymsDepartillService;
8	9	import com.lyms.talkonlineweb.service.LymsHdepartService;
9	10	import com.lyms.talkonlineweb.service.LymsIllnessService;
10	11
...	...	@@ -32,7 +33,10 @@
32	33	@Autowired //科室所拥有的疾病
33	34	private LymsDepartillService lymsDepartillService;
34	35
	36	+ @Autowired
	37	+ private HdepartInfoService hdepartInfoService;
35	38
	39	+
36	40	/**
37	41	* 获取科室列表
38	42	* @param depart
39	43
40	44
...	...	@@ -41,17 +45,20 @@
41	45	* @return
42	46	*/
43	47	@GetMapping("sltDepartLst")
44		- public BaseResponse sltDepartLst(LymsHdepart depart, int current, int size){
	48	+ public BaseResponse sltDepartLst(HdepartInfo depart, int current, int size){
45	49	BaseResponse baseResponse=new BaseResponse();
46		- Page<LymsHdepart> page=new Page<>(current,size);
47		- Page<LymsHdepart> departPage=lymsHdepartService.page(page, Wrappers.query(depart).orderByDesc("updated_time","createdtime"));
	50	+// Page<LymsHdepart> page=new Page<>(current,size);
	51	+// Page<LymsHdepart> departPage=lymsHdepartService.page(page, Wrappers.query(depart).orderByDesc("updated_time","createdtime"));
	52	+// addIll(departPage);
	53	+ Page<HdepartInfo> page=new Page<>(current,size);
	54	+ Page<HdepartInfo> departPage=hdepartInfoService.page(page, Wrappers.query(depart).orderByDesc("updated_time","createdtime"));
48	55	addIll(departPage);
49	56	baseResponse.setObject(departPage);
50	57
51	58	return baseResponse;
52	59	}
53	60
54		- public void addIll(Page<LymsHdepart> departPage){
	61	+ public void addIll(Page<HdepartInfo> departPage){
55	62	departPage.getRecords().forEach(e->{
56	63	Map param=new HashMap();
57	64	param.put("did",e.getDid());

...	...	@@ -9,7 +9,7 @@
9	9	import lombok.Data;
10	10
11	11	/**
12		- *
	12	+ * 科室视图
13	13	* @TableName hdepart_info
14	14	*/
15	15	@TableName(value ="hdepart_info")
...	...	@@ -86,6 +86,12 @@
86	86	*/
87	87	@TableField(value = "htypename")
88	88	private String htypename;
	89	+
	90	+ /**
	91	+ * 疾病id串
	92	+ */
	93	+ @TableField(exist = false)
	94	+ private String ills;
89	95
90	96	@TableField(exist = false)
91	97	private static final long serialVersionUID = 1L;