Commit 6ae3c5e3bef5fa80114ae8e8efa5e1a36bee46ba
1 parent
7dcb30b708
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
6ae3c5e
| ... | ... | @@ -783,35 +783,35 @@ |
| 783 | 783 | } |
| 784 | 784 | for (AntExChuModel antExChuModel : antExChuModels) { |
| 785 | 785 | for (Patients patient : patients) { |
| 786 | - if(antExChuModel.getParentId().equals(patient.getId())) { | |
| 786 | + if(antExChuModel.getParentId().equals(patient.getId()) && antExChuModel.getId().equals(usedId)) { | |
| 787 | 787 | return patient; |
| 788 | 788 | } |
| 789 | 789 | } |
| 790 | 790 | } |
| 791 | 791 | for (AntenatalExaminationModel antenatalExaminationModel : antenatalExaminationModels) { |
| 792 | 792 | for (Patients patient : patients) { |
| 793 | - if(antenatalExaminationModel.getParentId().equals(patient.getId())) { | |
| 793 | + if(antenatalExaminationModel.getParentId().equals(patient.getId()) && antenatalExaminationModel.getId().equals(usedId)) { | |
| 794 | 794 | return patient; |
| 795 | 795 | } |
| 796 | 796 | } |
| 797 | 797 | } |
| 798 | 798 | for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModels) { |
| 799 | 799 | for (Patients patient : patients) { |
| 800 | - if(maternalDeliverModel.getParentId().equals(patient.getId())) { | |
| 800 | + if(maternalDeliverModel.getParentId().equals(patient.getId()) && maternalDeliverModel.getId().equals(usedId)) { | |
| 801 | 801 | return patient; |
| 802 | 802 | } |
| 803 | 803 | } |
| 804 | 804 | } |
| 805 | 805 | for (DischargeAbstractMotherModel deliverModel : deliverModels) { |
| 806 | 806 | for (Patients patient : patients) { |
| 807 | - if(deliverModel.getPatientId().equals(patient.getId())) { | |
| 807 | + if(deliverModel.getPatientId().equals(patient.getId()) && deliverModel.getId().equals(usedId)) { | |
| 808 | 808 | return patient; |
| 809 | 809 | } |
| 810 | 810 | } |
| 811 | 811 | } |
| 812 | 812 | for (PostReviewModel postReviewModel : postReviewModels) { |
| 813 | 813 | for (Patients patient : patients) { |
| 814 | - if(postReviewModel.getParentId().equals(patient.getId())) { | |
| 814 | + if(postReviewModel.getParentId().equals(patient.getId()) && postReviewModel.getId().equals(usedId)) { | |
| 815 | 815 | return patient; |
| 816 | 816 | } |
| 817 | 817 | } |