jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c26566ec9fff9a1adfb75819b29d062a1952b08d

Authored by hujiaqi
2 parents 28e93e3fa6 dcc59e63e8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c26566e
... ... @@ -161,19 +161,19 @@
161 161 BabyModel babyModel1 = null;
162 162 if(org.apache.commons.lang.StringUtils.isNotEmpty(parentId)){
163 163 BabyModelQuery babyModelQuery=new BabyModelQuery();
164   - babyModelQuery.setParentId(parentId);
  164 + babyModelQuery.setId(parentId);
165 165 List<BabyModel> patients1 = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
166 166 if(CollectionUtils.isNotEmpty(patients1)){
167 167 babyModel1=patients1.get(0);
168 168 }
169   - if (org.apache.commons.lang.StringUtils.isEmpty(pid)) {
  169 + if (babyModel1!=null&org.apache.commons.lang.StringUtils.isEmpty(pid)) {
170 170 pid = babyModel1.getPid();
171 171 }
172 172 }
173 173  
174 174 BabyModelQuery babyModelQuery=new BabyModelQuery();
175 175  
176   - babyModelQuery.setParentId(parentId);
  176 + babyModelQuery.setId(parentId);
177 177  
178 178 List li = new ArrayList();
179 179 li.add(hospitalId);
... ... @@ -188,7 +188,7 @@
188 188  
189 189 //表示区域的
190 190 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) {
191   - babyModelQuery.setParentId(null);
  191 + babyModelQuery.setId(null);
192 192 babyModelQuery.setPid(pid);
193 193 babyModel= findBabyCond(babyModelQuery,li, false);
194 194 babyModel.setSource(babyModel.getId());