From a81998c216b0679d7d37754ccea18ed080b7e99e Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Thu, 27 Dec 2018 15:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/BabyModel.java | 9 +++++++++ .../main/java/com/lyms/platform/pojo/MaternalDeliverModel.java | 9 +++++++++ .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 7 +++++++ .../java/com/lyms/platform/operate/web/facade/ViewFacade.java | 1 + .../platform/operate/web/request/MatDeliverAddRequest.java | 10 ++++++++++ .../platform/operate/web/result/MaternalDeliverResult.java | 10 ++++++++++ 6 files changed, 46 insertions(+) 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 1660aad..b53c462 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 @@ -380,6 +380,15 @@ public class BabyModel extends BaseModel { private Integer skinContact;//皮肤接触及早吮吸>=30分钟 private String zhixi;//窒息（0：青紫；1：苍白） private String impression;//印象 + private String qzdbh;//亲子带编号 + + public String getQzdbh() { + return qzdbh; + } + + public void setQzdbh(String qzdbh) { + this.qzdbh = qzdbh; + } public String getUmbilicus() { return umbilicus; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 3bcfcff..a8e9f89 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -528,11 +528,20 @@ public class MaternalDeliverModel extends BaseModel { private Integer skinContact;//皮肤接触及早吮吸>=30分钟 private String zhixi;//窒息（0：青紫；1：苍白） private String impression;//印象 + private String qzdbh;//亲子带编号 public Baby(){ } + public String getQzdbh() { + return qzdbh; + } + + public void setQzdbh(String qzdbh) { + this.qzdbh = qzdbh; + } + public String getImpression() { return impression; } 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 6d6aa17..e1916d7 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 @@ -906,6 +906,7 @@ public class MatDeliverFacade { babyModel1.setSkinContact(baby.getSkinContact()); babyModel1.setZhixi(baby.getZhixi()); babyModel1.setImpression(baby.getImpression()); + babyModel1.setQzdbh(baby.getQzdbh()); babyService.findAndModify(query.convertToQuery(), babyModel1); } @@ -1081,6 +1082,12 @@ public class MatDeliverFacade { babyModel.setYbReflex(baby1.getYbReflex()); babyModel.setStReflex(baby1.getStReflex()); babyModel.setsAbility(baby1.getsAbility()); + babyModel.setUmbilicus(baby1.getUmbilicus()); + babyModel.setUmXqFy(baby1.getUmXqFy()); + babyModel.setSkinContact(baby1.getSkinContact()); + babyModel.setZhixi(baby1.getZhixi()); + babyModel.setImpression(baby1.getImpression()); + babyModel.setQzdbh(baby1.getQzdbh()); //判断妊娠结局是活产才添加数据 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 2c884bc..e2ea185 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 @@ -3070,6 +3070,7 @@ public class ViewFacade { babyMap.put("skinContact",temp.getSkinContact()); babyMap.put("zhixi",temp.getZhixi()); babyMap.put("impression",temp.getImpression()); + babyMap.put("qzdbh",temp.getQzdbh()); babyList.add(babyMap); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index 5e56e5c..6acf187 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -1126,6 +1126,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert=30分钟 private String zhixi;//窒息（0：青紫；1：苍白） private String impression;//印象 + private String qzdbh;//亲子带编号 @Override public MaternalDeliverModel.Baby convertToDataModel() { @@ -1238,10 +1239,19 @@ public class MatDeliverAddRequest implements IBasicRequestConvert=30分钟 private String zhixi;//窒息（0：青紫；1：苍白） private String impression;//印象 + private String qzdbh;//亲子带编号 public Baby(){}//增加无参构造方法 public Baby(MaternalDeliverModel.Baby babyModel){ @@ -790,9 +791,18 @@ public class MaternalDeliverResult { setSkinContact(babyModel.getSkinContact()); setZhixi(babyModel.getZhixi()); setImpression(babyModel.getImpression()); + setQzdbh(babyModel.getQzdbh()); } + public String getQzdbh() { + return qzdbh; + } + + public void setQzdbh(String qzdbh) { + this.qzdbh = qzdbh; + } + public String getImpression() { return impression; } -- 1.8.3.1