shiyang / regional-platform

Download as
Browse Code »

Commit d75979787fcdc3882754c7bc80127086414f176e

Authored by jiangjiazhi
1 parent f5c89b42b9
Exists in master and in 1 other branch nobuildprocess

修改转诊

Showing 1 changed file with 9 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ d759797
... ... @@ -85,7 +85,7 @@
85 85 sieveModel.setHospitalId(hospitalId);
86 86 sieveModel.setZtfx(sieveAddRequest.getMax());
87 87 sieveService.updateOneChanQianDiaSieve(sieveModel);
88   - SieveModel sieveModel1 =sieveService.findOneById(list.get(0).getId());
  88 + SieveModel sieveModel1 = sieveService.findOneById(list.get(0).getId());
89 89 SieveService.handOrder(sieveModel1);
90 90 sieveService.updateOneChanQianDiaSieve(sieveModel1);
91 91 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
... ... @@ -169,7 +169,7 @@
169 169 sieveModel.setCqStatus(1);
170 170 sieveService.updateOneChanQianDiaSieve(sieveModel);
171 171  
172   - SieveModel sieveModel1 =sieveService.findOneById(chanQianDiaAddRequest.getId());
  172 + SieveModel sieveModel1 = sieveService.findOneById(chanQianDiaAddRequest.getId());
173 173 SieveService.handOrder(sieveModel1);
174 174 sieveService.updateOneChanQianDiaSieve(sieveModel1);
175 175  
176 176  
... ... @@ -197,10 +197,10 @@
197 197 if (null != cqSieveQueryRequest.getDueWeekEnd()) {
198 198 sieveQuery.setDueWeekEnd(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()) + 6);
199 199 }
200   - if(null!=cqSieveQueryRequest.getcDueWeekStart()){
  200 + if (null != cqSieveQueryRequest.getcDueWeekStart()) {
201 201 sieveQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekStart() * 7)));
202 202 }
203   - if(null!=cqSieveQueryRequest.getcDueWeekEnd()){
  203 + if (null != cqSieveQueryRequest.getcDueWeekEnd()) {
204 204 sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd() * 7) - 6));
205 205 }
206 206  
207 207  
... ... @@ -242,13 +242,13 @@
242 242 sieveListResult.convertToResult(sieveModel);
243 243 Patients patients = patientsService.findOnePatientById(sieveModel.getParentId());
244 244 if (null != patients) {
245   - sieveListResult.setIsGravida(patients.getFmDate() != null ? "0" : "1");
  245 + sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1");
246 246 if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
247 247 sieveListResult.setcDueWeek("终止妊娠");
248 248 else if (patients.getType() == 3) {
249 249 sieveListResult.setcDueWeek("已分娩");
250 250 }
251   - sieveListResult.setAge(DateUtil.getAge(patients.getBirth())+"岁");
  251 + sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
252 252 }
253 253 data.add(sieveListResult);
254 254 }
255 255  
... ... @@ -301,12 +301,13 @@
301 301 response.setHeader("Content-Disposition", "attachment;fileName=" + "csdata.xls");
302 302 ExcelUtil.toExcel(out, datas, cnames);
303 303 } catch (Exception e) {
304   - ExceptionUtils.catchException(e,"产筛导出异常");
  304 + ExceptionUtils.catchException(e, "产筛导出异常");
305 305 }
306 306 }
307 307  
308 308 /**
309 309 * 修改产筛 备注
  310 + *
310 311 * @param csId
311 312 * @param qsTypeId
312 313 * @param detail
... ... @@ -320,7 +321,7 @@
320 321 sieve.setDetail(detail);
321 322 sieveService.updateOneChanQianDiaSieve(sieve);
322 323  
323   - SieveModel sieveModel1 =sieveService.findOneById(csId);
  324 + SieveModel sieveModel1 = sieveService.findOneById(csId);
324 325 SieveService.handOrder(sieveModel1);
325 326 sieveService.updateOneChanQianDiaSieve(sieveModel1);
326 327 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");