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());//接生者 //科室