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 ac5719d..1dc243b 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
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.result;
 
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.MaternalDeliverModel;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -108,6 +109,134 @@ public class MaternalDeliverResult  {
         this.deathCauseText = deathCauseText;
     }
 
+    /******威海妇幼新增分娩记录字段******/
+    private Integer parity;//胎次
+    private String gsqsDate;//宫缩起始时间
+    private String openDate;//宫口开全时间
+    private String tmplDate;//胎膜破裂时间
+    private String incision;//切开方式
+    private String sutureMethod;//缝合方式
+    private String anaesthesia;//麻醉方式
+    private String csyy;//产时用药
+    private String chgs;//产后宫缩
+    private String sszcmc;//手术助产名称
+    private String mzfs;//麻醉方式
+    private String sszz;//手术指征
+    private String sszcjg;//手术助产经过
+    private String remarks;//备注
+
+    public Integer getParity() {
+        return parity;
+    }
+
+    public void setParity(Integer parity) {
+        this.parity = parity;
+    }
+
+    public String getGsqsDate() {
+        return gsqsDate;
+    }
+
+    public void setGsqsDate(String gsqsDate) {
+        this.gsqsDate = gsqsDate;
+    }
+
+    public String getOpenDate() {
+        return openDate;
+    }
+
+    public void setOpenDate(String openDate) {
+        this.openDate = openDate;
+    }
+
+    public String getTmplDate() {
+        return tmplDate;
+    }
+
+    public void setTmplDate(String tmplDate) {
+        this.tmplDate = tmplDate;
+    }
+
+    public String getIncision() {
+        return incision;
+    }
+
+    public void setIncision(String incision) {
+        this.incision = incision;
+    }
+
+    public String getSutureMethod() {
+        return sutureMethod;
+    }
+
+    public void setSutureMethod(String sutureMethod) {
+        this.sutureMethod = sutureMethod;
+    }
+
+    public String getAnaesthesia() {
+        return anaesthesia;
+    }
+
+    public void setAnaesthesia(String anaesthesia) {
+        this.anaesthesia = anaesthesia;
+    }
+
+    public String getCsyy() {
+        return csyy;
+    }
+
+    public void setCsyy(String csyy) {
+        this.csyy = csyy;
+    }
+
+    public String getChgs() {
+        return chgs;
+    }
+
+    public void setChgs(String chgs) {
+        this.chgs = chgs;
+    }
+
+    public String getSszcmc() {
+        return sszcmc;
+    }
+
+    public void setSszcmc(String sszcmc) {
+        this.sszcmc = sszcmc;
+    }
+
+    public String getMzfs() {
+        return mzfs;
+    }
+
+    public void setMzfs(String mzfs) {
+        this.mzfs = mzfs;
+    }
+
+    public String getSszz() {
+        return sszz;
+    }
+
+    public void setSszz(String sszz) {
+        this.sszz = sszz;
+    }
+
+    public String getSszcjg() {
+        return sszcjg;
+    }
+
+    public void setSszcjg(String sszcjg) {
+        this.sszcjg = sszcjg;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
     public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) {
         setDueCount(destModel.getDueCount());
         setHandDueWeek(destModel.getHandDueWeek());
@@ -143,6 +272,21 @@ public class MaternalDeliverResult  {
         setOcs(destModel.getOcs() == null ? null : JsonUtil.str2Obj(destModel.getOcs(), Map.class));
         setExtPlacentas(destModel.getExtPlacentas());
 
+        /**********威海新增字段**********/
+        setParity(destModel.getParity());
+        setGsqsDate(DateUtil.gety_m_dhm(destModel.getGsqsDate()));
+        setOpenDate(DateUtil.gety_m_dhm(destModel.getOpenDate()));
+        setTmplDate(DateUtil.gety_m_dhm(destModel.getTmplDate()));
+        setIncision(destModel.getIncision());
+        setSutureMethod(destModel.getSutureMethod());
+        setAnaesthesia(destModel.getAnaesthesia());
+        setCsyy(destModel.getCsyy());
+        setChgs(destModel.getChgs());
+        setSszcmc(destModel.getSszcmc());
+        setMzfs(destModel.getMzfs());
+        setSszz(destModel.getSszz());
+        setSszcjg(destModel.getSszcjg());
+        setRemarks(destModel.getRemarks());
 
         return this;
     }
@@ -298,6 +442,59 @@ public class MaternalDeliverResult  {
         private boolean jxXtx;
         //其他(写明病名并详细描述)
         private Map jxOther;
+
+        /*********威海妇幼新增字段*********/
+        private String csStatus;//出生时状况
+        private String dyDrug;//滴眼所用药
+        private String hurt;//伤害
+        private String malformation;//畸形
+        private String breathing;//呼吸
+        private String ybxzyl;//一般吸粘液量
+        private String cgNumber;//插管次数
+        private String cgysh;//插管于生后
+        private String xcwxz;//吸出物形状
+        private String xcwl;//吸出物量
+        private String breathingType;//人工呼吸方式
+
+        //体格检查
+        private String ybstatus;//一般状况
+        /************皮肤************/
+        private String mxxgb;//毛细血管斑
+        private String skinColour;//肤色
+        private String furfur;//脱屑
+        private String nevus;//痣
+        private String pigment;//色素斑
+        private String buttocks;//臀
+        private String skinOther;//皮肤其它
+
+        /************头**************/
+        private String qxSize;//前囟大小
+        private String tension;//张力
+        private String plasticity;//塑性
+        private String ttEdema;//胎头水肿
+
+        /************部位*************/
+        private String skullOverlap;//颅骨重叠
+        private String eye;//眼
+        private String nose;//鼻
+        private String ear;//耳
+        private String mouth;//口腔
+        private String heart;//心
+        private String heartbeat;//心跳
+        private String lung;//肺
+        private String babyBreathing;//呼吸
+        private String abdomen;//腹
+        private String breast;//乳腺
+        private String liver;//肝
+        private String spleen;//脾
+        private String genitals;//生殖器
+        private String anus;//肛门
+        private String limb;//四肢
+        private String ybReflex;//拥抱反射
+        private String stReflex;//手头反射
+        private String sAbility;//吮能力
+        /*************新增结束************/
+
         public Baby(){}//增加无参构造方法
         public Baby(MaternalDeliverModel.Baby babyModel){
             setId(babyModel.getId());
@@ -353,6 +550,51 @@ public class MaternalDeliverResult  {
             setJxTszh(babyModel.isJxTszh());
             setJxXtx(babyModel.isJxXtx());
             setJxOther(babyModel.getJxOther());
+
+            /**********威海新生儿新增字段***********/
+            setCsStatus(babyModel.getCsStatus());
+            setDyDrug(babyModel.getDyDrug());
+            setHurt(babyModel.getHurt());
+            setMalformation(babyModel.getMalformation());
+            setBreathing(babyModel.getBreathing());
+            setYbxzyl(babyModel.getYbxzyl());
+            setCgNumber(babyModel.getCgNumber());
+            setCgysh(babyModel.getCgysh());
+            setXcwxz(babyModel.getXcwxz());
+            setXcwl(babyModel.getXcwl());
+            setBreathingType(babyModel.getBreathingType());
+            setYbstatus(babyModel.getYbstatus());
+            setMxxgb(babyModel.getMxxgb());
+            setSkinColour(babyModel.getSkinColour());
+            setFurfur(babyModel.getFurfur());
+            setNevus(babyModel.getNevus());
+            setPigment(babyModel.getPigment());
+            setButtocks(babyModel.getButtocks());
+            setSkinOther(babyModel.getSkinOther());
+            setQxSize(babyModel.getQxSize());
+            setTension(babyModel.getTension());
+            setPlasticity(babyModel.getPlasticity());
+            setTtEdema(babyModel.getTtEdema());
+            setSkullOverlap(babyModel.getSkullOverlap());
+            setEye(babyModel.getEye());
+            setNose(babyModel.getNose());
+            setEar(babyModel.getEar());
+            setMouth(babyModel.getMouth());
+            setHeart(babyModel.getHeart());
+            setHeartbeat(babyModel.getHeartbeat());
+            setLung(babyModel.getLung());
+            setBabyBreathing(babyModel.getBabyBreathing());
+            setAbdomen(babyModel.getAbdomen());
+            setBreast(babyModel.getBreast());
+            setLiver(babyModel.getLiver());
+            setSpleen(babyModel.getSpleen());
+            setGenitals(babyModel.getGenitals());
+            setAnus(babyModel.getAnus());
+            setLimb(babyModel.getLimb());
+            setYbReflex(babyModel.getYbReflex());
+            setStReflex(babyModel.getStReflex());
+            setsAbility(babyModel.getsAbility());
+
         }
 
         public String getNbnaNum() {
@@ -774,6 +1016,342 @@ public class MaternalDeliverResult  {
         public void setPregnancyOut(String pregnancyOut) {
             this.pregnancyOut = pregnancyOut;
         }
+
+        public String getCsStatus() {
+            return csStatus;
+        }
+
+        public void setCsStatus(String csStatus) {
+            this.csStatus = csStatus;
+        }
+
+        public String getDyDrug() {
+            return dyDrug;
+        }
+
+        public void setDyDrug(String dyDrug) {
+            this.dyDrug = dyDrug;
+        }
+
+        public String getHurt() {
+            return hurt;
+        }
+
+        public void setHurt(String hurt) {
+            this.hurt = hurt;
+        }
+
+        public String getMalformation() {
+            return malformation;
+        }
+
+        public void setMalformation(String malformation) {
+            this.malformation = malformation;
+        }
+
+        public String getBreathing() {
+            return breathing;
+        }
+
+        public void setBreathing(String breathing) {
+            this.breathing = breathing;
+        }
+
+        public String getYbxzyl() {
+            return ybxzyl;
+        }
+
+        public void setYbxzyl(String ybxzyl) {
+            this.ybxzyl = ybxzyl;
+        }
+
+        public String getCgNumber() {
+            return cgNumber;
+        }
+
+        public void setCgNumber(String cgNumber) {
+            this.cgNumber = cgNumber;
+        }
+
+        public String getCgysh() {
+            return cgysh;
+        }
+
+        public void setCgysh(String cgysh) {
+            this.cgysh = cgysh;
+        }
+
+        public String getXcwxz() {
+            return xcwxz;
+        }
+
+        public void setXcwxz(String xcwxz) {
+            this.xcwxz = xcwxz;
+        }
+
+        public String getXcwl() {
+            return xcwl;
+        }
+
+        public void setXcwl(String xcwl) {
+            this.xcwl = xcwl;
+        }
+
+        public String getBreathingType() {
+            return breathingType;
+        }
+
+        public void setBreathingType(String breathingType) {
+            this.breathingType = breathingType;
+        }
+
+        public String getYbstatus() {
+            return ybstatus;
+        }
+
+        public void setYbstatus(String ybstatus) {
+            this.ybstatus = ybstatus;
+        }
+
+        public String getMxxgb() {
+            return mxxgb;
+        }
+
+        public void setMxxgb(String mxxgb) {
+            this.mxxgb = mxxgb;
+        }
+
+        public String getSkinColour() {
+            return skinColour;
+        }
+
+        public void setSkinColour(String skinColour) {
+            this.skinColour = skinColour;
+        }
+
+        public String getFurfur() {
+            return furfur;
+        }
+
+        public void setFurfur(String furfur) {
+            this.furfur = furfur;
+        }
+
+        public String getNevus() {
+            return nevus;
+        }
+
+        public void setNevus(String nevus) {
+            this.nevus = nevus;
+        }
+
+        public String getPigment() {
+            return pigment;
+        }
+
+        public void setPigment(String pigment) {
+            this.pigment = pigment;
+        }
+
+        public String getButtocks() {
+            return buttocks;
+        }
+
+        public void setButtocks(String buttocks) {
+            this.buttocks = buttocks;
+        }
+
+        public String getSkinOther() {
+            return skinOther;
+        }
+
+        public void setSkinOther(String skinOther) {
+            this.skinOther = skinOther;
+        }
+
+        public String getQxSize() {
+            return qxSize;
+        }
+
+        public void setQxSize(String qxSize) {
+            this.qxSize = qxSize;
+        }
+
+        public String getTension() {
+            return tension;
+        }
+
+        public void setTension(String tension) {
+            this.tension = tension;
+        }
+
+        public String getPlasticity() {
+            return plasticity;
+        }
+
+        public void setPlasticity(String plasticity) {
+            this.plasticity = plasticity;
+        }
+
+        public String getTtEdema() {
+            return ttEdema;
+        }
+
+        public void setTtEdema(String ttEdema) {
+            this.ttEdema = ttEdema;
+        }
+
+        public String getSkullOverlap() {
+            return skullOverlap;
+        }
+
+        public void setSkullOverlap(String skullOverlap) {
+            this.skullOverlap = skullOverlap;
+        }
+
+        public String getEye() {
+            return eye;
+        }
+
+        public void setEye(String eye) {
+            this.eye = eye;
+        }
+
+        public String getNose() {
+            return nose;
+        }
+
+        public void setNose(String nose) {
+            this.nose = nose;
+        }
+
+        public String getEar() {
+            return ear;
+        }
+
+        public void setEar(String ear) {
+            this.ear = ear;
+        }
+
+        public String getMouth() {
+            return mouth;
+        }
+
+        public void setMouth(String mouth) {
+            this.mouth = mouth;
+        }
+
+        public String getHeart() {
+            return heart;
+        }
+
+        public void setHeart(String heart) {
+            this.heart = heart;
+        }
+
+        public String getHeartbeat() {
+            return heartbeat;
+        }
+
+        public void setHeartbeat(String heartbeat) {
+            this.heartbeat = heartbeat;
+        }
+
+        public String getLung() {
+            return lung;
+        }
+
+        public void setLung(String lung) {
+            this.lung = lung;
+        }
+
+        public String getBabyBreathing() {
+            return babyBreathing;
+        }
+
+        public void setBabyBreathing(String babyBreathing) {
+            this.babyBreathing = babyBreathing;
+        }
+
+        public String getAbdomen() {
+            return abdomen;
+        }
+
+        public void setAbdomen(String abdomen) {
+            this.abdomen = abdomen;
+        }
+
+        public String getBreast() {
+            return breast;
+        }
+
+        public void setBreast(String breast) {
+            this.breast = breast;
+        }
+
+        public String getLiver() {
+            return liver;
+        }
+
+        public void setLiver(String liver) {
+            this.liver = liver;
+        }
+
+        public String getSpleen() {
+            return spleen;
+        }
+
+        public void setSpleen(String spleen) {
+            this.spleen = spleen;
+        }
+
+        public String getGenitals() {
+            return genitals;
+        }
+
+        public void setGenitals(String genitals) {
+            this.genitals = genitals;
+        }
+
+        public String getAnus() {
+            return anus;
+        }
+
+        public void setAnus(String anus) {
+            this.anus = anus;
+        }
+
+        public String getLimb() {
+            return limb;
+        }
+
+        public void setLimb(String limb) {
+            this.limb = limb;
+        }
+
+        public String getYbReflex() {
+            return ybReflex;
+        }
+
+        public void setYbReflex(String ybReflex) {
+            this.ybReflex = ybReflex;
+        }
+
+        public String getStReflex() {
+            return stReflex;
+        }
+
+        public void setStReflex(String stReflex) {
+            this.stReflex = stReflex;
+        }
+
+        public String getsAbility() {
+            return sAbility;
+        }
+
+        public void setsAbility(String sAbility) {
+            this.sAbility = sAbility;
+        }
     }