jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6bd145629c31f9721144953b8a7fff6c655e4661

Authored by liquanyu
1 parent 34aad53f66
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 11 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 6bd1456
... ... @@ -351,13 +351,11 @@
351 351 Patients patients = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, null, 1, false, null, og.getbStatus() != 1);
352 352  
353 353 //未分娩建档
354   -
355 354 if (null != patients) {
356 355 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩，不能进行复查");
357 356 }
358 357  
359 358 //取所有医院的建档数据 优先取本院 ，然后取外院
360   -
361 359 Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId, false), 3, true, null, og.getbStatus() != 1);
362 360 PostReviewListResult postReviewListResult = new PostReviewListResult();
363 361 if (null != patientsList) {
364 362  
... ... @@ -365,11 +363,14 @@
365 363 return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇已终止妊娠，不能进行复查");
366 364 }
367 365  
368   - MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
369   - matDeliverQuery.setPid(patientsList.getPid());
370   - matDeliverQuery.setYn(YnEnums.YES.getId());
  366 +// MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  367 +// matDeliverQuery.setPid(patientsList.getPid());
  368 +// matDeliverQuery.setYn(YnEnums.YES.getId());
  369 +// List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
  370 +// if (CollectionUtils.isEmpty(list)) {
  371 +// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇没有录入分娩信息，不能进行复查");
  372 +// }
371 373  
372   - List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
373 374  
374 375 PostReviewQuery postReviewQuery = new PostReviewQuery();
375 376 postReviewQuery.setPid(patientsList.getPid());
376 377  
377 378  
... ... @@ -377,15 +378,14 @@
377 378 postReviewQuery.setStart(patientsList.getFmDate());
378 379 List<PostReviewModel> postReviewModels = postReviewService.findWithList(postReviewQuery);
379 380 String dueDate = "";
380   - if (CollectionUtils.isEmpty(list)) {
381   - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇没有录入分娩信息，不能进行复查");
382   - }
  381 +
383 382 // 3-产妇
384 383 if (patientsList.getType() == 3){
385 384 dueDate = DateUtil.getyyyy_MM_dd(patientsList.getFmDate());
386   - } else {
387   - dueDate = list.get(0).getDueDate();
388 385 }
  386 +// else {
  387 +// dueDate = list.get(0).getDueDate();
  388 +// }
389 389 HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getPid(), false);
390 390  
391 391 List<AntData> dataList = new ArrayList<>();