jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4f9a9ff815617d223b9ad195d321901ace1fad5d

Authored by jiangjiazhi
1 parent 59654db548
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

修改新电子病历

Showing 1 changed file with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 4f9a9ff
... ... @@ -779,7 +779,7 @@
779 779 Patients patients = iterator.next();
780 780 //处理建档就分娩的情况
781 781 Date date = DateUtil.addWeek(patients.getLastMenses(), 42);
782   - Date currentDate = DateUtil.formatDate(patients.getBookbuildingDate());
  782 + Date currentDate = DateUtil.formatDate(patients.getCreated());
783 783 if (date.getTime() <= currentDate.getTime()||patients.getBuildType()==2) {
784 784 //建档记录
785 785 if (null != patients.getHospitalId()) {
786 786  
... ... @@ -787,8 +787,8 @@
787 787 }
788 788 pid = patients.getPid();
789 789 listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
790   - iterator.remove();
791 790  
  791 +
792 792 if(null==dueDate &&null!=patients.getFmDate()){
793 793 dueDate=patients.getFmDate();
794 794 }
795 795  
796 796  
... ... @@ -811,13 +811,13 @@
811 811 if (null != postReviewModel.getHospitalId()) {
812 812 organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
813 813 }
814   - int size = patientses.size();
815 814  
816   - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(size>1?size-1:size).getFmDate()));
  815 + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", dueDate));
817 816 }
818 817  
819 818 }
820 819 }
  820 + iterator.remove();
821 821 updateEditEnable(listData, sortList);
822 822 sortList.add(listData);
823 823 listData=new ArrayList();