Commit 01b44cab3d7d2ec6fc5497cc6c672735325be050
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
01b44ca
| ... | ... | @@ -98,7 +98,10 @@ |
| 98 | 98 | query.setParentId(archiveModel.getId()); |
| 99 | 99 | List<PremaritalCheckup> checkupList = premaritalCheckupService.queryPremaritalCheckup(query); |
| 100 | 100 | if (CollectionUtils.isNotEmpty(checkupList)) { |
| 101 | - result = checkupList.get(0); | |
| 101 | + if (result==null){ | |
| 102 | + result = checkupList.get(0); | |
| 103 | + } | |
| 104 | + historyList = new ArrayList<>(); | |
| 102 | 105 | //历史婚检记录 |
| 103 | 106 | for (PremaritalCheckup data : checkupList){ |
| 104 | 107 | PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult(); |
| ... | ... | @@ -109,7 +112,6 @@ |
| 109 | 112 | historyResult.setPremaritalUpHospital(org.getName()); |
| 110 | 113 | historyResult.setHospitalId(data.getHospitalId()); |
| 111 | 114 | } |
| 112 | - historyList = new ArrayList<>(); | |
| 113 | 115 | historyList.add(historyResult); |
| 114 | 116 | } |
| 115 | 117 | } |