From 67968d5adfc8b6069b92b1d1bcaf4bc9feb99c19 Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 15 Mar 2021 14:32:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E7=96=BE=E7=97=85?= =?UTF-8?q?=E8=A1=A1=E6=B0=B4=E7=8E=AF=E5=A2=83=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ViewFacade.java | 33 +++++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 4cab619..648bc1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -7087,15 +7087,34 @@ public class ViewFacade { //新生儿出生地(区县) map.put("babydistrict", babydistrict); + String type = ""; + if(data!=null && StringUtils.isNotEmpty(data.getHospitalId())){ + Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId())); + //衡水城市限制 + if(org!=null && "12".equals(org.getCityId())){ + type = "12"; + } + } String babyState = ""; - if (baby.getDeformity() != null && baby.getDeformity() == 1) { - babyState = "差"; - } else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy())) { - babyState = "一般"; - } else { - babyState = "良好"; + if("12".equals(type)){ + //System.out.println("-------------------------20210315支持衡水逻辑-------------------------"); + if ("差".equals(baby.getBabyHealthy())) { + babyState = "差"; + }else if("一般".equals(baby.getBabyHealthy())){ + babyState = "一般"; + }else if("良好".equals(baby.getBabyHealthy())){ + babyState = "良好"; + } + }else { + //System.out.println("-------------------------20210315以前逻辑-------------------------"); + if (baby.getDeformity() != null && baby.getDeformity() == 1) { + babyState = "差"; + } else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy())) { + babyState = "一般"; + } else { + babyState = "良好"; + } } - //新生儿健康状态 map.put("babystate", babyState); -- 1.8.3.1