From ce7dbb84a2af062bc9c38719adc3580edd736744 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Sun, 2 Jun 2019 18:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E5=84=BF=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=9B=A0=E7=B4=A0=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BasicConfigFacade.java | 13 ++++++++++--- platform-operate-api/src/main/resources/sfdjb.docx | Bin 13385 -> 13520 bytes 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 9f2d271..64e93eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -293,10 +293,17 @@ public class BasicConfigFacade { BasicConfig basicConfig = ba.convertToDataModel(); if (null != basicConfig) { basicConfig.setCreateDate(System.currentTimeMillis()); - if(StringUtils.isEmpty(basicConfig.getTypeId())){ + if (StringUtils.isEmpty(basicConfig.getTypeId())) { BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); - if(basicConfig1!=null){ - basicConfig.setTypeId(basicConfig1.getTypeId()); + if (basicConfig1 != null) { + //高危儿因素配置暂时这么开发 + if ("高危儿因素".equals(basicConfig1.getName()) || "体弱儿因素".equals(basicConfig1.getName())) { + basicConfig.setTypeId("5b18f8a7422b03d4ad2bf913"); + } else { + basicConfig.setTypeId(basicConfig1.getTypeId()); + } + basicConfig.setpId(basicConfig.getParentId()); + } } basicConfigService.addBasicConfig(basicConfig); diff --git a/platform-operate-api/src/main/resources/sfdjb.docx b/platform-operate-api/src/main/resources/sfdjb.docx index 2e89bd58895fd6d5c46dcdb3da5aa09852d86d87..20b0fbe42984988e728ec5805ca4e4d5f27c9a9a 100644 GIT binary patch delta 5357 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