diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 16d6280..f5da0b7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -3728,21 +3728,15 @@ public class BabyBookbuildingFacade { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(model.getId()); - List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { //ApplyOrderStatusEnums - if (list.get(0).getStatus() == 1) - { + if (list.get(0).getStatus() == 1) { status = "已转诊"; - } - else if (list.get(0).getStatus() == 2) - { + } else if (list.get(0).getStatus() == 2) { status = "已转诊 已接收"; - } - else if (list.get(0).getStatus() == 5) - { + } else if (list.get(0).getStatus() == 5) { status = "已转诊 已接收 已转回"; } } @@ -3751,12 +3745,12 @@ public class BabyBookbuildingFacade { String hospitalAddress = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getHospitalId())) { Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId())); - hospitalAddress = CommonsHelper.getResidence(organization.getProvinceId(), organization.getCityId(), - organization.getAreaId(), organization.getStreetId(),"", - basicConfigService); + hospitalAddress = CommonsHelper.getResidence(organization.getProvinceId(), organization.getCityId(), + organization.getAreaId(), organization.getStreetId(), "", + basicConfigService); } - data.put("status",status); - data.put("hospitalAddress",hospitalAddress); + data.put("status", status); + data.put("hospitalAddress", hospitalAddress); data.put("sex", model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); data.put("babyName", StringUtils.emptyDeal(model.getName())); data.put("birthday", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); @@ -3997,19 +3991,19 @@ public class BabyBookbuildingFacade { GrowthCountQhdTask task = new GrowthCountQhdTask(groups, babyQuery, babyCheckService, key); result.addAll(task.getResults()); } - Integer scCount=0; - Integer tzCount=0; - Integer scbtzCount=0; + Integer scCount = 0; + Integer tzCount = 0; + Integer scbtzCount = 0; for (int i = 0; i < result.size(); i++) { try { BabyGrowthCountResult babyResult = result.get(i); if ("身长".equals(babyResult.getTypeName())) { - scCount += Integer.parseInt(babyResult.getCount()) ; + scCount += Integer.parseInt(babyResult.getCount()); } else if ("体重".equals(babyResult.getTypeName())) { - tzCount += Integer.parseInt(babyResult.getCount()) ; + tzCount += Integer.parseInt(babyResult.getCount()); } else if ("身长别体重".equals(babyResult.getTypeName())) { - scbtzCount += Integer.parseInt(babyResult.getCount()) ; + scbtzCount += Integer.parseInt(babyResult.getCount()); } } catch (NumberFormatException e) { e.printStackTrace(); @@ -4022,20 +4016,20 @@ public class BabyBookbuildingFacade { if ("身长".equals(babyResult.getTypeName())) { babyResult.setFslCount(scCount); Integer sc = Integer.parseInt(babyResult.getCount()); - BigDecimal b = new BigDecimal((float)sc/scCount); - babyResult.setFsl(new DecimalFormat("0.00").format(b)+"%"); + BigDecimal b = new BigDecimal((float) sc / scCount); + babyResult.setFsl(new DecimalFormat("0.00").format(b) + "%"); } else if ("体重".equals(babyResult.getTypeName())) { babyResult.setFslCount(tzCount); Integer sc = Integer.parseInt(babyResult.getCount()); - BigDecimal b = new BigDecimal((float)sc/tzCount); - babyResult.setFsl(new DecimalFormat("0.00").format(b)+"%"); + BigDecimal b = new BigDecimal((float) sc / tzCount); + babyResult.setFsl(new DecimalFormat("0.00").format(b) + "%"); } else if ("身长别体重".equals(babyResult.getTypeName())) { babyResult.setFslCount(scbtzCount); Integer sc = Integer.parseInt(babyResult.getCount()); - BigDecimal b = new BigDecimal((float)sc/scbtzCount); - babyResult.setFsl(new DecimalFormat("0.00").format(b)+"%"); + BigDecimal b = new BigDecimal((float) sc / scbtzCount); + babyResult.setFsl(new DecimalFormat("0.00").format(b) + "%"); } } } catch (NumberFormatException e) { @@ -4117,8 +4111,12 @@ public class BabyBookbuildingFacade { List > list = new ArrayList <>(); if (CollectionUtils.isNotEmpty(checkModels)) { for (BabyCheckModel checkModel : checkModels) { + if (StringUtils.isNotEmpty(checkModel.getBuildId())) { BabyModel model = getBabyModelById(checkModel.getBuildId()); + if (model == null) { + continue; + } Map map = new HashMap <>(); map.put("id", model.getId()); //儿童主键 map.put("checkId", checkModel.getId()); //检查主键 @@ -4166,7 +4164,7 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(futures)) { for (Future f : futures) { try { - results.addAll((List) f.get(30, TimeUnit.SECONDS)); + results.addAll((List) f.get(300, TimeUnit.SECONDS)); } catch (Exception e) { ExceptionUtils.catchException(e, "baby check list"); }