From 125c265a4b4c1adab8e4f50469b143da3f82c72a Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 22 Mar 2018 10:50:20 +0800
Subject: [PATCH] =?UTF-8?q?6=E5=B2=81=E5=A5=97=E9=A4=90=EF=BC=8C=E4=B9=99?=
 =?UTF-8?q?=E8=82=9D=E8=A1=A8=E9=9D=A2=E6=8A=97=E4=BD=93=EF=BC=8C=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E2=80=9C-=E2=80=9D=E4=BB=A5=E5=90=8E=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/MaternalDeliverModel.java   | 11 +++++++++++
 .../lyms/platform/operate/web/facade/BabyCheckFacade.java   |  1 +
 .../com/lyms/platform/operate/web/facade/ViewFacade.java    |  3 ++-
 .../platform/operate/web/request/MatDeliverAddRequest.java  | 13 +++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

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 1ce110e..ca00340 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
@@ -20,6 +20,9 @@ public class MaternalDeliverModel extends BaseModel {
     private static final long serialVersionUID = SerialIdEnum.MaternalDeliverModel.getCid();
 
     private String id;
+    /**新加字段***/
+    //产次
+    private Integer dueCount;
     //产妇id
     private String parentId;
     private String pid;
@@ -153,6 +156,14 @@ public class MaternalDeliverModel extends BaseModel {
      */
     private Integer isClose;
 
+    public Integer getDueCount() {
+        return dueCount;
+    }
+
+    public void setDueCount(Integer dueCount) {
+        this.dueCount = dueCount;
+    }
+
     public String getMatFollowId() {
         return matFollowId;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 1cea818..bc408a1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -180,6 +180,7 @@ public class BabyCheckFacade {
         model.setNd(request.getNd());
         model.setYgbmky(request.getYgbmky());
         model.setYgeky(request.getYgeky());
+        model.setYgbmkt(request.getYgbmkt());
         model.setYgekt(request.getYgekt());
         model.setYghxkt(request.getYghxkt());
         model.setWlTong(request.getWlTong());
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 4401547..ee3b7fc 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
@@ -3274,6 +3274,7 @@ public class ViewFacade {
         model.setYgeky(FunvCommonUtil.checkYiGan(checkModel.getYgeky()));
         model.setYgekt(FunvCommonUtil.checkYiGan(checkModel.getYgekt()));
         model.setYghxkt(FunvCommonUtil.checkYiGan(checkModel.getYghxkt()));
+        model.setYgbmkt(FunvCommonUtil.checkYiGan(checkModel.getYgbmkt()));
 
         model.setWlTong(UnitUtils.unitSplice(checkModel.getWlTong(), UnitConstants.UMOLL));
         model.setWlXin(UnitUtils.unitSplice(checkModel.getWlXin(), UnitConstants.UMOLL));
@@ -3541,7 +3542,7 @@ public class ViewFacade {
                 String qt = map.get("qt") == null ? "" : map.get("qt").toString();
                 if ("true".equals(qt)) {
                     String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
-                    drugGllergic += " " + qtText + ",";
+                    drugGllergic += " 其他:" + qtText + ",";
                 }
                 drugGllergic = FunvCommonUtil.spitd(drugGllergic);
             }
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 f3a6632..c0a6c8d 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
@@ -17,6 +17,10 @@ import java.util.Map;
 @Form
 public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDeliverModel>{
     private String id;
+
+    /**新加字段***/
+    //产次
+    private Integer dueCount;
     //
     private String pid;
     //产妇id
@@ -89,6 +93,14 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
 
     private Integer couponType;
 
+    public Integer getDueCount() {
+        return dueCount;
+    }
+
+    public void setDueCount(Integer dueCount) {
+        this.dueCount = dueCount;
+    }
+
     public String getCouponCode() {
         return couponCode;
     }
@@ -180,6 +192,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     @Override
     public MaternalDeliverModel convertToDataModel() {
         MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
+        maternalDeliverModel.setDueCount(dueCount);
         maternalDeliverModel.setFmType(fmType);
         maternalDeliverModel.setFmAddr(fmAddr);
         maternalDeliverModel.setParentId(parentId);
-- 
1.8.3.1