jiangjiazhi / regional-platform

Commit e7f9e7ed396c55d64c57a1f40fb2005f997be98b

Authored by landong2015 about 9 years ago

Exists in master and in 8 other branches

提交代码

Showing 2 changed files with 32 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java

...	...	@@ -33,7 +33,16 @@
33	33	private Integer serviceStatus;
34	34	private Integer startWeek;
35	35	private Integer endWeek;
	36	+ private Integer age;
36	37
	38	+ public Integer getAge() {
	39	+ return age;
	40	+ }
	41	+
	42	+ public void setAge(Integer age) {
	43	+ this.age = age;
	44	+ }
	45	+
37	46	public String getPatientName() {
38	47	return patientName;
39	48	}
...	...	@@ -232,6 +241,9 @@
232	241	}
233	242	if(null!=endWeek){
234	243	condition=condition.and("week",endWeek,MongoOper.LTE);
	244	+ }
	245	+ if(null!=age){
	246	+ condition=condition.and("age",age,MongoOper.IS);
235	247	}
236	248
237	249	return condition.toMongoQuery();

...	...	@@ -37,13 +37,23 @@
37	37	public void getEmergenceTreatments(HttpServletResponse response,
38	38	@RequestParam("page") int page,
39	39	@RequestParam("limit") int limit,
40		- @RequestParam(value = "id",required = false) String id
	40	+ @RequestParam(value = "id",required = false) String id,
	41	+ @RequestParam(value = "cardNo",required = false) String cardNo,
	42	+ @RequestParam(value = "phone",required = false) String phone,
	43	+ @RequestParam(value = "age",required = false) Integer age,
	44	+ @RequestParam(value = "startWeek",required = false) Integer startWeek,
	45	+ @RequestParam(value = "endWeek",required = false) Integer endWeek
41	46	){
42	47	LisCrisisItemQuery query = new LisCrisisItemQuery();
43	48	query.setSort("publishTime desc");
44	49	query.setPage(page);
45	50	query.setLimit(limit);
46	51	query.setId(id);
	52	+ query.setCardNo(cardNo);
	53	+ query.setPhone(phone);
	54	+ query.setAge(age);
	55	+ query.setStartWeek(startWeek);
	56	+ query.setEndWeek(endWeek);
47	57	List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
48	58
49	59	List<Map> list = new ArrayList<>();
...	...	@@ -55,7 +65,6 @@
55	65	map.put("hospitalId",data.getHospitalId());
56	66	map.put("name",data.getName());
57	67	map.put("age",data.getAge());
58		- map.put("weeks",data.getWeeks());
59	68	map.put("itemCode",data.getItemCode());
60	69	map.put("itemName",data.getItemName());
61	70	map.put("classify",data.getClassify());
...	...	@@ -69,6 +78,15 @@
69	78	map.put("publishTime", DateUtil.getSecond(data.getPublishTime()));
70	79	map.put("status",data.getStatus());
71	80	map.put("statusName",data.getStatusName());
	81	+
	82	+ map.put("patientName",data.getStatusName());
	83	+ map.put("cardNo",data.getStatusName());
	84	+ map.put("phone",data.getStatusName());
	85	+ map.put("serviceType",data.getStatusName());
	86	+ map.put("serviceStatus",data.getStatusName());
	87	+ map.put("lastMenses",DateUtil.getSecond(data.getLastMenses()));
	88	+ map.put("week",data.getWeek());
	89	+
72	90	list.add(map);
73	91	}
74	92	ResultUtils.buildSuccessResultAndWrite(response, list);