shiyang / regional-platform

Download as
Browse Code ยป

Commit 0dba52a86902cb9427a02352228c0929829bc6c6

Authored by baohanddd
2 parents 65cf320f56 843f61b74b
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java View file @ 0dba52a
... ... @@ -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();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ 0dba52a
... ... @@ -37,13 +37,27 @@
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,
  46 + @RequestParam(value = "name",required = false) String name,
  47 + @RequestParam(value = "status",required = false) Integer status
41 48 ){
42 49 LisCrisisItemQuery query = new LisCrisisItemQuery();
43 50 query.setSort("publishTime desc");
44 51 query.setPage(page);
45 52 query.setLimit(limit);
46 53 query.setId(id);
  54 + query.setCardNo(cardNo);
  55 + query.setPhone(phone);
  56 + query.setAge(age);
  57 + query.setStartWeek(startWeek);
  58 + query.setEndWeek(endWeek);
  59 + query.setName(name);
  60 + query.setStatus(status);
47 61 List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
48 62  
49 63 List<Map> list = new ArrayList<>();
... ... @@ -55,7 +69,6 @@
55 69 map.put("hospitalId",data.getHospitalId());
56 70 map.put("name",data.getName());
57 71 map.put("age",data.getAge());
58   - map.put("weeks",data.getWeeks());
59 72 map.put("itemCode",data.getItemCode());
60 73 map.put("itemName",data.getItemName());
61 74 map.put("classify",data.getClassify());
... ... @@ -69,6 +82,15 @@
69 82 map.put("publishTime", DateUtil.getSecond(data.getPublishTime()));
70 83 map.put("status",data.getStatus());
71 84 map.put("statusName",data.getStatusName());
  85 +
  86 + map.put("patientName",data.getStatusName());
  87 + map.put("cardNo",data.getStatusName());
  88 + map.put("phone",data.getStatusName());
  89 + map.put("serviceType",data.getStatusName());
  90 + map.put("serviceStatus",data.getStatusName());
  91 + map.put("lastMenses",DateUtil.getSecond(data.getLastMenses()));
  92 + map.put("week",data.getWeek());
  93 +
72 94 list.add(map);
73 95 }
74 96 ResultUtils.buildSuccessResultAndWrite(response, list);