From ffb52957948c1786c6990fba930cba3c095be456 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 19 Dec 2018 17:58:13 +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 --- .../java/com/lyms/platform/pojo/BabyModel.java | 45 ++++++++++++++++++++++ .../web/controller/MatDeliverController.java | 11 +++--- .../operate/web/facade/MatDeliverFacade.java | 5 +++ .../web/result/ChildbirthManagerQueryModel.java | 13 +++++++ .../operate/web/worker/MaterDeliverWorker.java | 7 +++- 5 files changed, 75 insertions(+), 6 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 2ba10a0..1660aad 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -375,6 +375,51 @@ public class BabyModel extends BaseModel { private String stReflex;//手头反射 private String sAbility;//吮能力 + private String umbilicus;//脐 + private String umXqFy;//脐带血清反应 + private Integer skinContact;//皮肤接触及早吮吸>=30分钟 + private String zhixi;//窒息（0：青紫；1：苍白） + private String impression;//印象 + + public String getUmbilicus() { + return umbilicus; + } + + public void setUmbilicus(String umbilicus) { + this.umbilicus = umbilicus; + } + + public String getUmXqFy() { + return umXqFy; + } + + public void setUmXqFy(String umXqFy) { + this.umXqFy = umXqFy; + } + + public Integer getSkinContact() { + return skinContact; + } + + public void setSkinContact(Integer skinContact) { + this.skinContact = skinContact; + } + + public String getZhixi() { + return zhixi; + } + + public void setZhixi(String zhixi) { + this.zhixi = zhixi; + } + + public String getImpression() { + return impression; + } + + public void setImpression(String impression) { + this.impression = impression; + } public String getSieveStatus() { return sieveStatus; 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 2fe6430..fff0b7b 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 @@ -433,20 +433,21 @@ public class MatDeliverController extends BaseController{ String reslult4 = ""; String reslult5 = ""; String deliveryMode = queryModel.getDeliveryMode(); + String deliveryMode1 = queryModel.getDeliveryMode1(); if (deliveryMode != null && deliveryMode.contains("顺产")) { reslult1 = "√"; } - else if(deliveryMode != null && deliveryMode.contains("胎吸")){ + if(deliveryMode1 != null && deliveryMode1.contains("胎吸")){ reslult2 = "√"; } - else if(deliveryMode != null && deliveryMode.contains("自由体位")){ + else if(deliveryMode1 != null && deliveryMode1.contains("自由体位")){ reslult3 = "√"; } - else if(deliveryMode != null && deliveryMode.contains("臀牵引")){ + else if(deliveryMode1 != null && deliveryMode1.contains("臀牵引")){ reslult4 = "√"; } - else if (deliveryMode != null && deliveryMode.contains("剖宫产")) + if (deliveryMode != null && deliveryMode.contains("剖宫产")) { reslult5 = "√"; } @@ -516,7 +517,7 @@ public class MatDeliverController extends BaseController{ String[] arrs = queryModel.getContactM().split(","); for (int i = 0 ;i < arrs.length ; i++) { - if (arrs[i] != null && StringUtils.isNumeric(arrs[i]) && Integer.parseInt(arrs[i]) >= 30) + if (StringUtils.isNotEmpty(arrs[i])) { jcsc += "√"; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 7ac6c01..6d6aa17 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -901,6 +901,11 @@ public class MatDeliverFacade { babyModel1.setYbReflex(baby.getYbReflex()); babyModel1.setStReflex(baby.getStReflex()); babyModel1.setsAbility(baby.getsAbility()); + babyModel1.setUmbilicus(baby.getUmbilicus()); + babyModel1.setUmXqFy(baby.getUmXqFy()); + babyModel1.setSkinContact(baby.getSkinContact()); + babyModel1.setZhixi(baby.getZhixi()); + babyModel1.setImpression(baby.getImpression()); babyService.findAndModify(query.convertToQuery(), babyModel1); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java index 339ad3c..4a13ff4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java @@ -60,6 +60,11 @@ public class ChildbirthManagerQueryModel { private String deliveryMode; /** + * 分娩方式详情 + */ + private String deliveryMode1; + + /** * @auther HuJiaqi * @createTime 2016年12月07日 16时38分 * @discription 产妇情况 @@ -933,4 +938,12 @@ public class ChildbirthManagerQueryModel { public void setFileCode(String fileCode) { this.fileCode = fileCode; } + + public String getDeliveryMode1() { + return deliveryMode1; + } + + public void setDeliveryMode1(String deliveryMode1) { + this.deliveryMode1 = deliveryMode1; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java index d8f269a..ccad1a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java @@ -179,7 +179,8 @@ public class MaterDeliverWorker implements Callable