Commit 9405500f314394b33bec938d1f25bbd0df9df74b

Authored by liquanyu
1 parent c1a5a88f53

update

Showing 1 changed file with 50 additions and 47 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9405500
... ... @@ -2277,67 +2277,70 @@
2277 2277 List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
2278 2278  
2279 2279 if (CollectionUtils.isNotEmpty(models)) {
2280   - BabyModel model = models.get(0);
2281   - if (model != null) {
  2280 + for (BabyModel model : models)
  2281 + {
  2282 + if (model != null) {
2282 2283  
2283   - puerperaQuery.setCardNo(model.getMcertNo());
  2284 + puerperaQuery.setCardNo(model.getMcertNo());
2284 2285  
2285   - BabyInfoResult result = new BabyInfoResult();
  2286 + BabyInfoResult result = new BabyInfoResult();
2286 2287  
2287   - result.setPid(model.getPid());
2288   - result.setCardNo(model.getMcertNo());//母亲的身份证号码
2289   - result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
2290   - if (model.getBirth() != null) {
2291   - result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
2292   - } else {
2293   - result.setMonthAge("");
2294   - }
  2288 + result.setPid(model.getPid());
  2289 + result.setCardNo(model.getMcertNo());//母亲的身份证号码
  2290 + result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
  2291 + if (model.getBirth() != null) {
  2292 + result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
  2293 + } else {
  2294 + result.setMonthAge("");
  2295 + }
2295 2296  
2296   - BabyModelQuery babyBuildQuery = new BabyModelQuery();
2297   - // babyBuildQuery.setYn(YnEnums.YES.getId());
2298   - babyBuildQuery.setPid(model.getPid());
2299   - List <BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyBuildQuery, "buildDate", Sort.Direction.DESC);
  2297 + BabyModelQuery babyBuildQuery = new BabyModelQuery();
  2298 + // babyBuildQuery.setYn(YnEnums.YES.getId());
  2299 + babyBuildQuery.setPid(model.getPid());
  2300 + List <BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyBuildQuery, "buildDate", Sort.Direction.DESC);
2300 2301  
2301   - List <Map <String, String>> list = new ArrayList <>();
2302   - if (CollectionUtils.isNotEmpty(builds)) {
2303   - for (BabyModel build : builds) {
  2302 + List <Map <String, String>> list = new ArrayList <>();
  2303 + if (CollectionUtils.isNotEmpty(builds)) {
  2304 + for (BabyModel build : builds) {
2304 2305  
2305   - if (build == null || StringUtils.isEmpty(build.getHospitalId())) {
2306   - continue;
2307   - }
2308   - if (build.getHospitalId().equals(param.getHospitalId())) {
2309   - isCurrentHosp = true;
2310   - buildInfo = build;
2311   - buildInfo.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
2312   - }
  2306 + if (build == null || StringUtils.isEmpty(build.getHospitalId())) {
  2307 + continue;
  2308 + }
  2309 + if (build.getHospitalId().equals(param.getHospitalId())) {
  2310 + isCurrentHosp = true;
  2311 + buildInfo = build;
  2312 + buildInfo.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
  2313 + }
2313 2314  
2314   - if (build != null && build.getYn() == YnEnums.YES.getId()) {
2315   - result.setIsBuild(true);
2316   - }
  2315 + if (build != null && build.getYn() == YnEnums.YES.getId()) {
  2316 + result.setIsBuild(true);
  2317 + }
2317 2318  
2318 2319  
2319   - Map <String, String> buildRecords = new HashMap <>();
2320   - buildRecords.put("id", build.getId());
2321   - buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate()));
2322   - buildRecords.put("hospitalId", build.getHospitalId());
2323   - //查询建档医院
2324   - Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId()));
2325   - if (org != null) {
2326   - buildRecords.put("buildHospital", org.getName());
2327   - } else {
2328   - buildRecords.put("buildHospital", "");
  2320 + Map <String, String> buildRecords = new HashMap <>();
  2321 + buildRecords.put("id", build.getId());
  2322 + buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate()));
  2323 + buildRecords.put("hospitalId", build.getHospitalId());
  2324 + //查询建档医院
  2325 + Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId()));
  2326 + if (org != null) {
  2327 + buildRecords.put("buildHospital", org.getName());
  2328 + } else {
  2329 + buildRecords.put("buildHospital", "");
  2330 + }
  2331 +
  2332 + list.add(buildRecords);
2329 2333 }
2330 2334  
2331   - list.add(buildRecords);
2332   - }
  2335 + if (!isCurrentHosp) {
  2336 + buildInfo = builds.get(0);
  2337 + }
2333 2338  
2334   - if (!isCurrentHosp) {
2335   - buildInfo = builds.get(0);
  2339 + result.setBuildRecords(list);
2336 2340 }
2337   -
2338   - result.setBuildRecords(list);
  2341 + results.add(result);
2339 2342 }
2340   - results.add(result);
  2343 +
2341 2344 }
2342 2345  
2343 2346 } else {