From 7de1e04e1c148538a349c5fda0912881bbcb8ebd Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 14 Apr 2022 18:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=94=9F=E8=AF=81=E5=88=86=E5=A8=A9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E4=BA=A7?=
 =?UTF-8?q?=E5=A6=87=EF=BC=9Afmddlb=EF=BC=8Cfmddlx=EF=BC=8Cgwrs=EF=BC=8Crs?=
 =?UTF-8?q?fxdm=EF=BC=8Ccfyc=E3=80=82=E5=88=86=E5=A8=A9=E5=84=BF=E7=AB=A5?=
 =?UTF-8?q?=EF=BC=9Acftc=EF=BC=8CbabySeq=EF=BC=8Cxsexm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/pojo/MaternalDeliverModel.java   |  28 +++---
 .../platform/operate/web/facade/ViewFacade.java    |  10 ++
 .../operate/web/request/MatDeliverAddRequest.java  | 109 +++++++++++++++++++++
 .../operate/web/result/MaternalDeliverResult.java  | 106 +++++++++++++++++++-
 4 files changed, 240 insertions(+), 13 deletions(-)

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 6cd6c7e..9bd267e 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
@@ -216,10 +216,17 @@ public class MaternalDeliverModel extends BaseModel {
     private List<Integer> status;
 
     /**
+     *分娩地点类别代码
+     */
+    private String fmddlb;
+    /**
+     *分娩地点类型代码
+     */
+    private String fmddlx;
+    /**
      *本次是否属于高危妊娠
      */
     private String gwrs;
-
     /**
      *妊娠风险评估分级代码
      */
@@ -228,14 +235,7 @@ public class MaternalDeliverModel extends BaseModel {
      *孕次
      */
     private String cfyc;
-    /**
-     *分娩地点类别代码
-     */
-    private String fmddlb;
-    /**
-     *分娩地点类型代码
-     */
-    private String fmddlx;
+
 
     public String getFmddlb() {
         return fmddlb;
@@ -801,11 +801,15 @@ public class MaternalDeliverModel extends BaseModel {
         private String babyQX;  //新生儿去向  1.病房  2.NICU  3.转院  4.其他
         private String otherInfo;
 
-        //儿童出生序列号
-        private String babySeq;
-        //胎次 	该新生儿在本次分娩中出生的次序
+        /**
+         * 胎次 	该新生儿在本次分娩中出生的次序
+         */
         private String cftc;
         /**
+         * 儿童出生序列号
+         */
+        private String babySeq;
+        /**
          * 新生儿姓名
          */
         private String xsexm;
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 d75840a..762b816 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
@@ -4417,6 +4417,10 @@ public class ViewFacade {
                 babyMap.put("cjfy", temp.getCjfy());
                 babyMap.put("zl", temp.getZl());
 
+                babyMap.put("cftc", temp.getCftc());
+                babyMap.put("babySeq", temp.getBabySeq());
+                babyMap.put("xsexm", temp.getXsexm());
+
                 babyList.add(babyMap);
             }
         }
@@ -4437,6 +4441,12 @@ public class ViewFacade {
         /** 优惠券编号 */
         map.put("couponCode", couponService.findByUsedId(id));
 
+        map.put("fmddlb",data.getFmddlb());
+        map.put("fmddlx",data.getFmddlx());
+        map.put("gwrs",data.getGwrs());
+        map.put("rsfxdm",data.getRsfxdm());
+        map.put("cfyc",data.getCfyc());
+
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         br.setData(map);
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 0a17f61..819526f 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
@@ -445,6 +445,68 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
      */
     private Integer cesareanTimeType;
 
+    /**
+     *分娩地点类别代码
+     */
+    private String fmddlb;
+    /**
+     *分娩地点类型代码
+     */
+    private String fmddlx;
+    /**
+     *本次是否属于高危妊娠
+     */
+    private String gwrs;
+    /**
+     *妊娠风险评估分级代码
+     */
+    private String rsfxdm;
+    /**
+     *孕次
+     */
+    private String cfyc;
+
+
+    public String getFmddlb() {
+        return fmddlb;
+    }
+
+    public void setFmddlb(String fmddlb) {
+        this.fmddlb = fmddlb;
+    }
+
+    public String getFmddlx() {
+        return fmddlx;
+    }
+
+    public void setFmddlx(String fmddlx) {
+        this.fmddlx = fmddlx;
+    }
+
+    public String getGwrs() {
+        return gwrs;
+    }
+
+    public void setGwrs(String gwrs) {
+        this.gwrs = gwrs;
+    }
+
+    public String getRsfxdm() {
+        return rsfxdm;
+    }
+
+    public void setRsfxdm(String rsfxdm) {
+        this.rsfxdm = rsfxdm;
+    }
+
+    public String getCfyc() {
+        return cfyc;
+    }
+
+    public void setCfyc(String cfyc) {
+        this.cfyc = cfyc;
+    }
+
     public Integer getCesareanTimeType() {
         return cesareanTimeType;
     }
@@ -564,6 +626,12 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         //抛宫产次数类型
         maternalDeliverModel.setCesareanTimeType(cesareanTimeType);
 
+        maternalDeliverModel.setFmddlb(fmddlb);
+        maternalDeliverModel.setFmddlx(fmddlx);
+        maternalDeliverModel.setGwrs(gwrs);
+        maternalDeliverModel.setRsfxdm(rsfxdm);
+        maternalDeliverModel.setCfyc(cfyc);
+
         return maternalDeliverModel;
     }
 
@@ -1404,6 +1472,43 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         private String babyQX;  //新生儿去向  1.病房  2.NICU  3.转院  4.其他
         private String otherInfo;//其他详细说明
 
+        /**
+         * 胎次 	该新生儿在本次分娩中出生的次序
+         */
+        private String cftc;
+        /**
+         * 儿童出生序列号
+         */
+        private String babySeq;
+        /**
+         * 新生儿姓名
+         */
+        private String xsexm;
+
+        public String getCftc() {
+            return cftc;
+        }
+
+        public void setCftc(String cftc) {
+            this.cftc = cftc;
+        }
+
+        public String getBabySeq() {
+            return babySeq;
+        }
+
+        public void setBabySeq(String babySeq) {
+            this.babySeq = babySeq;
+        }
+
+        public String getXsexm() {
+            return xsexm;
+        }
+
+        public void setXsexm(String xsexm) {
+            this.xsexm = xsexm;
+        }
+
         public String getBabyQX() {
             return babyQX;
         }
@@ -1559,6 +1664,10 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
             /*********201905计划威海妇幼新增字段*********/
             baby.setBabyQX(babyQX);
             baby.setOtherInfo(otherInfo);
+
+            baby.setCftc(cftc);
+            baby.setBabySeq(babySeq);
+            baby.setXsexm(xsexm);
             return baby;
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
index 5d2a7b8..da706c3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
@@ -222,6 +222,67 @@ public class MaternalDeliverResult {
      */
     private Integer cesareanTimeType;
 
+    /**
+     *分娩地点类别代码
+     */
+    private String fmddlb;
+    /**
+     *分娩地点类型代码
+     */
+    private String fmddlx;
+    /**
+     *本次是否属于高危妊娠
+     */
+    private String gwrs;
+    /**
+     *妊娠风险评估分级代码
+     */
+    private String rsfxdm;
+    /**
+     *孕次
+     */
+    private String cfyc;
+
+    public String getFmddlb() {
+        return fmddlb;
+    }
+
+    public void setFmddlb(String fmddlb) {
+        this.fmddlb = fmddlb;
+    }
+
+    public String getFmddlx() {
+        return fmddlx;
+    }
+
+    public void setFmddlx(String fmddlx) {
+        this.fmddlx = fmddlx;
+    }
+
+    public String getGwrs() {
+        return gwrs;
+    }
+
+    public void setGwrs(String gwrs) {
+        this.gwrs = gwrs;
+    }
+
+    public String getRsfxdm() {
+        return rsfxdm;
+    }
+
+    public void setRsfxdm(String rsfxdm) {
+        this.rsfxdm = rsfxdm;
+    }
+
+    public String getCfyc() {
+        return cfyc;
+    }
+
+    public void setCfyc(String cfyc) {
+        this.cfyc = cfyc;
+    }
+
     public Integer getCesareanTimeType() {
         return cesareanTimeType;
     }
@@ -675,6 +736,11 @@ public class MaternalDeliverResult {
         //抛宫产次数类型
         setCesareanTimeType(null!=destModel.getCesareanTimeType()?destModel.getCesareanTimeType():null);
 
+        setFmddlb(destModel.getFmddlb());
+        setFmddlx(destModel.getFmddlx());
+        setGwrs(destModel.getGwrs());
+        setRsfxdm(destModel.getRsfxdm());
+        setCfyc(destModel.getCfyc());
         return this;
     }
 
@@ -898,7 +964,18 @@ public class MaternalDeliverResult {
         /*********201905计划威海妇幼新增字段*********/
         private String babyQX;
         private String otherInfo;
-
+        /**
+         * 胎次 	该新生儿在本次分娩中出生的次序
+         */
+        private String cftc;
+        /**
+         * 儿童出生序列号
+         */
+        private String babySeq;
+        /**
+         * 新生儿姓名
+         */
+        private String xsexm;
 
         public Baby() {
         }//增加无参构造方法
@@ -1018,6 +1095,33 @@ public class MaternalDeliverResult {
             if ("4".equals(babyModel.getBabyQX())) {
                 setOtherInfo(babyModel.getOtherInfo());
             }
+            setCftc(babyModel.getCftc());
+            setBabySeq(babyModel.getBabySeq());
+            setXsexm(babyModel.getXsexm());
+        }
+
+        public String getCftc() {
+            return cftc;
+        }
+
+        public void setCftc(String cftc) {
+            this.cftc = cftc;
+        }
+
+        public String getBabySeq() {
+            return babySeq;
+        }
+
+        public void setBabySeq(String babySeq) {
+            this.babySeq = babySeq;
+        }
+
+        public String getXsexm() {
+            return xsexm;
+        }
+
+        public void setXsexm(String xsexm) {
+            this.xsexm = xsexm;
         }
 
         public String getHx() {
-- 
1.8.3.1