jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 861c1359827afa5bf505ee1f44600b4ad8d0d3d2

Authored by baohanddd
2 parents e25fc5f5b0 939fe402b6
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java View file @ 861c135
... ... @@ -134,7 +134,7 @@
134 134 LisCrisisItemQuery query = new LisCrisisItemQuery();
135 135 query.setId(emergenceId);
136 136 List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
137   - if (lisCrisisItemList.size()==1){
  137 + if (lisCrisisItemList.size()!=0){
138 138 emergenceId = lisCrisisItemList.get(0).getId();
139 139 }else {
140 140 ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在");
... ... @@ -160,7 +160,7 @@
160 160 emergence.put("content", data.getContent());
161 161 emergence.put("status", data.getStatus());
162 162 emergence.put("statusName", data.getStatusName());
163   - emergence.put("emergenceId", data.getEmergenceId());
  163 + emergence.put("lisCrisisItemId", data.getEmergenceId());
164 164 emergence.put("doctorName", data.getDoctorName());
165 165 emergence.put("created", DateUtil.getSecond(data.getCreated()));
166 166 list.add(emergence);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ 861c135
... ... @@ -51,6 +51,7 @@
51 51 query.setSort("publishTime desc");
52 52 query.setPage(page);
53 53 query.setLimit(limit);
  54 + query.setNeed("y");
54 55 query.setId(id);
55 56 query.setCardNo(cardNo);
56 57 query.setPhone(phone);
... ... @@ -84,11 +85,11 @@
84 85 map.put("status",data.getStatus());
85 86 map.put("statusName",data.getStatusName());
86 87  
87   - map.put("patientName",data.getStatusName());
88   - map.put("cardNo",data.getStatusName());
89   - map.put("phone",data.getStatusName());
90   - map.put("serviceType",data.getStatusName());
91   - map.put("serviceStatus",data.getStatusName());
  88 + map.put("patientName",data.getPatientName());
  89 + map.put("cardNo",data.getCardNo());
  90 + map.put("phone",data.getPhone());
  91 + map.put("serviceType",data.getServiceType());
  92 + map.put("serviceStatus",data.getServiceStatus());
92 93 map.put("lastMenses",DateUtil.getSecond(data.getLastMenses()));
93 94 map.put("week",data.getWeek());
94 95 map.put("pId",data.getPid());