jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4dbdc799b8d0e0a8ecb7ceb451d7172269207292

Authored by landong2015
1 parent 6d85bf1581
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

update

Showing 1 changed file with 20 additions and 20 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 4dbdc79
... ... @@ -89,28 +89,28 @@
89 89 archiveModel = modelList.get(0);
90 90 }
91 91 }
  92 + }
92 93  
93   - if (archiveModel != null) {
94   - PremaritalCheckupQuery query = new PremaritalCheckupQuery();
95   - query.setYn(YnEnums.YES.getId());
96   - query.setHospitalId(requestParam.getHospitalId());
97   - query.setParentId(archiveModel.getId());
98   - List<PremaritalCheckup> checkupList = premaritalCheckupService.queryPremaritalCheckup(query);
99   - if (CollectionUtils.isNotEmpty(checkupList)) {
100   - result = checkupList.get(0);
101   - //历史婚检记录
102   - for (PremaritalCheckup data : checkupList){
103   - PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
104   - historyResult.setId(data.getId());
105   - historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
106   - Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
107   - if (org!=null){
108   - historyResult.setPremaritalUpHospital(org.getName());
109   - historyResult.setHospitalId(data.getHospitalId());
110   - }
111   - historyList = new ArrayList<>();
112   - historyList.add(historyResult);
  94 + if (archiveModel != null) {
  95 + PremaritalCheckupQuery query = new PremaritalCheckupQuery();
  96 + query.setYn(YnEnums.YES.getId());
  97 + query.setHospitalId(requestParam.getHospitalId());
  98 + query.setParentId(archiveModel.getId());
  99 + List<PremaritalCheckup> checkupList = premaritalCheckupService.queryPremaritalCheckup(query);
  100 + if (CollectionUtils.isNotEmpty(checkupList)) {
  101 + result = checkupList.get(0);
  102 + //历史婚检记录
  103 + for (PremaritalCheckup data : checkupList){
  104 + PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
  105 + historyResult.setId(data.getId());
  106 + historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
  107 + Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
  108 + if (org!=null){
  109 + historyResult.setPremaritalUpHospital(org.getName());
  110 + historyResult.setHospitalId(data.getHospitalId());
113 111 }
  112 + historyList = new ArrayList<>();
  113 + historyList.add(historyResult);
114 114 }
115 115 }
116 116 }