jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 89c2fb49dcede75321ecb9fb20026116f4f13c5c

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

乐陵住院提醒查询BUG修复

Showing 1 changed file with 11 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java View file @ 89c2fb4
... ... @@ -711,7 +711,11 @@
711 711 if (patientMarkRequest.getType() == 2) {//2-回院提醒
712 712 patientMarkHospQuery.setBackStatus(patientMarkRequest.getStatus());
713 713 patientMarkHospQuery.setBackResult(patientMarkRequest.getResult());
714   - patientMarkHospQuery.setBackFailure(patientMarkRequest.getFailure());
  714 + if(patientMarkRequest.getFailure()!=null){
  715 + //失败原因,则前提是提醒状态是失败
  716 + patientMarkHospQuery.setBackFailure(patientMarkRequest.getFailure());
  717 + patientMarkHospQuery.setBackResult(2);
  718 + }
715 719 patientMarkHospQuery.setBackStartDate(patientMarkRequest.getMakeStartDate());
716 720 patientMarkHospQuery.setBackEndDate(patientMarkRequest.getMakeEndDate());
717 721 patientMarkHospQuery.setSort("back_status asc,back_date desc");
718 722  
... ... @@ -720,8 +724,13 @@
720 724 //回院提醒状态为已提醒
721 725 patientMarkHospQuery.setBackStatus(2);
722 726 patientMarkHospQuery.setBackResult(1);
723   - patientMarkHospQuery.setInHospitStatus(patientMarkRequest.getStatus());
724 727 patientMarkHospQuery.setInHospitResult(patientMarkRequest.getResult());
  728 + if(patientMarkRequest.getFailure()!=null){
  729 + //失败原因,则前提是提醒状态是失败
  730 + patientMarkHospQuery.setInHospitFailure(patientMarkRequest.getFailure());
  731 + patientMarkHospQuery.setInHospitResult(2);
  732 + }
  733 + patientMarkHospQuery.setInHospitStatus(patientMarkRequest.getStatus());
725 734 patientMarkHospQuery.setInHospitFailure(patientMarkRequest.getFailure());
726 735 patientMarkHospQuery.setInHospitStartDate(patientMarkRequest.getMakeStartDate());
727 736 patientMarkHospQuery.setInHospitEndDate(patientMarkRequest.getMakeEndDate());