From 2dc448d18de6fc6559acbcf3fd29b96afcb38de4 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 19 Dec 2018 18:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/MatDeliverController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 15229f3..d63d6f9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -511,13 +511,15 @@ public class MatDeliverController extends BaseController{ //queryModel.getTireNumber()-queryModel.getLivingNumber() map.put("sc",queryModel.getPregnancyOut());//死产 + int bn = 0; String jcsc = ""; if (queryModel.getContactM() != null && queryModel.getContactM().contains(",")) { + bn = 1; String[] arrs = queryModel.getContactM().split(","); for (int i = 0 ;i < arrs.length ; i++) { - if (StringUtils.isNotEmpty(arrs[i])) + if ("1".equals(arrs[i])) { jcsc += "√"; @@ -532,7 +534,12 @@ public class MatDeliverController extends BaseController{ } } } - map.put("jzsx",queryModel.getContactM());//皮肤接触及早吸吮≥30分钟 + if(bn == 0 && !"-".equals(queryModel.getContactM())){ + jcsc += "√"; + }else if(bn == 0 && "-".equals(queryModel.getContactM())){ + jcsc += queryModel.getContactM(); + } + map.put("jzsx",jcsc);//皮肤接触及早吸吮≥30分钟 map.put("xj","-");//宣教 map.put("jsz",queryModel.getDeliverDoctor());//接生者 //科室 -- 1.8.3.1