From f6bbc5783925cb6b7bb4976a89ce7b26dc605429 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 23 Mar 2018 09:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?=
 =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/AntExChuModel.java | 235 ++++++++++++++++++
 .../platform/pojo/AntenatalExaminationModel.java   | 240 ++++++++++++++++++
 .../operate/web/facade/BabyCheckFacade.java        |   1 +
 .../operate/web/request/AntExAddRequest.java       | 264 +++++++++++++++++++-
 .../operate/web/request/AntExcAddRequest.java      | 274 ++++++++++++++++++++-
 .../operate/web/request/BabyCheckRequest.java      |   1 -
 .../operate/web/request/MatDeliverAddRequest.java  |  56 +++++
 7 files changed, 1064 insertions(+), 7 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
index 73cce01..bc9386e 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
@@ -263,6 +263,241 @@ public class AntExChuModel extends BaseModel {
     //浮肿
     private String edema;
 
+    /***新增辅助检查项***/
+    /***甲状腺功能***/
+    //总三碘甲状腺原氨酸（TT3）
+    public String ttita;
+    //总甲状腺素(TT4)
+    public String totalThy;
+    //游离三碘甲状腺原氨酸（FT3）
+    public String ftita;
+    //游离甲状腺素（FT4）
+    public String freeThy;
+    //促甲状腺激素(TSH)
+    public String thyStim;
+    //抗甲状腺球蛋白抗体（TGA）
+    public String antGlan;
+    //抗甲状腺微粒体抗体(TMA)
+    public String tmab;
+    //甲状腺过氧化物酶抗体（TPOA）
+    public String thyPerAnt;
+    /***凝血功能***/
+    //凝血酶原时间（PT-S）
+    public String prothTime;
+    //国际标准化比值（INR）
+    public String interStan;
+    //凝血酶原活动度（PT%）
+    public String pta;
+    //活化部分凝血活酶时间（APTT）
+    public String actPar;
+    //凝血酶时间（TT）
+    public String thrTime;
+    //纤维蛋白原（FIB）
+    public String fibrin;
+    //抗凝血酶III活性（AT-III）
+    public String antil;
+    //D-二聚体（D-Dimer）
+    public String dimer;
+    /***血脂***/
+    //总胆固醇（TC）
+    public String totalChol;
+    //甘油三酯（TG）
+    public String tricer;
+    //高密度脂蛋白胆固醇（HDL-C）
+    public String highDens;
+    //低密度脂蛋白胆固醇（LDL-C）
+    public String lowDens;
+    //载脂蛋白A1（ApoA1）
+    public String apolipa;
+    //载脂蛋白B（ApoB）
+    public String apolipb;
+    //心电图
+    public String electr;
+
+    public String getTtita() {
+        return ttita;
+    }
+
+    public void setTtita(String ttita) {
+        this.ttita = ttita;
+    }
+
+    public String getTotalThy() {
+        return totalThy;
+    }
+
+    public void setTotalThy(String totalThy) {
+        this.totalThy = totalThy;
+    }
+
+    public String getFtita() {
+        return ftita;
+    }
+
+    public void setFtita(String ftita) {
+        this.ftita = ftita;
+    }
+
+    public String getFreeThy() {
+        return freeThy;
+    }
+
+    public void setFreeThy(String freeThy) {
+        this.freeThy = freeThy;
+    }
+
+    public String getThyStim() {
+        return thyStim;
+    }
+
+    public void setThyStim(String thyStim) {
+        this.thyStim = thyStim;
+    }
+
+    public String getAntGlan() {
+        return antGlan;
+    }
+
+    public void setAntGlan(String antGlan) {
+        this.antGlan = antGlan;
+    }
+
+    public String getTmab() {
+        return tmab;
+    }
+
+    public void setTmab(String tmab) {
+        this.tmab = tmab;
+    }
+
+    public String getThyPerAnt() {
+        return thyPerAnt;
+    }
+
+    public void setThyPerAnt(String thyPerAnt) {
+        this.thyPerAnt = thyPerAnt;
+    }
+
+    public String getProthTime() {
+        return prothTime;
+    }
+
+    public void setProthTime(String prothTime) {
+        this.prothTime = prothTime;
+    }
+
+    public String getInterStan() {
+        return interStan;
+    }
+
+    public void setInterStan(String interStan) {
+        this.interStan = interStan;
+    }
+
+    public String getPta() {
+        return pta;
+    }
+
+    public void setPta(String pta) {
+        this.pta = pta;
+    }
+
+    public String getActPar() {
+        return actPar;
+    }
+
+    public void setActPar(String actPar) {
+        this.actPar = actPar;
+    }
+
+    public String getThrTime() {
+        return thrTime;
+    }
+
+    public void setThrTime(String thrTime) {
+        this.thrTime = thrTime;
+    }
+
+    public String getFibrin() {
+        return fibrin;
+    }
+
+    public void setFibrin(String fibrin) {
+        this.fibrin = fibrin;
+    }
+
+    public String getAntil() {
+        return antil;
+    }
+
+    public void setAntil(String antil) {
+        this.antil = antil;
+    }
+
+    public String getDimer() {
+        return dimer;
+    }
+
+    public void setDimer(String dimer) {
+        this.dimer = dimer;
+    }
+
+    public String getTotalChol() {
+        return totalChol;
+    }
+
+    public void setTotalChol(String totalChol) {
+        this.totalChol = totalChol;
+    }
+
+    public String getTricer() {
+        return tricer;
+    }
+
+    public void setTricer(String tricer) {
+        this.tricer = tricer;
+    }
+
+    public String getHighDens() {
+        return highDens;
+    }
+
+    public void setHighDens(String highDens) {
+        this.highDens = highDens;
+    }
+
+    public String getLowDens() {
+        return lowDens;
+    }
+
+    public void setLowDens(String lowDens) {
+        this.lowDens = lowDens;
+    }
+
+    public String getApolipa() {
+        return apolipa;
+    }
+
+    public void setApolipa(String apolipa) {
+        this.apolipa = apolipa;
+    }
+
+    public String getApolipb() {
+        return apolipb;
+    }
+
+    public void setApolipb(String apolipb) {
+        this.apolipb = apolipb;
+    }
+
+    public String getElectr() {
+        return electr;
+    }
+
+    public void setElectr(String electr) {
+        this.electr = electr;
+    }
+
     public String getEdema() {
         return edema;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
index 535a30a..9af1828 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
@@ -224,6 +224,246 @@ public class AntenatalExaminationModel extends BaseModel {
     //甲状腺功能
     private String jzxgn;
 
+    /***新增辅助检查项***/
+    /***甲状腺功能***/
+    //总三碘甲状腺原氨酸（TT3）
+    public String ttita;
+    //总甲状腺素(TT4)
+    public String totalThy;
+    //游离三碘甲状腺原氨酸（FT3）
+    public String ftita;
+    //游离甲状腺素（FT4）
+    public String freeThy;
+    //促甲状腺激素(TSH)
+    public String thyStim;
+    //抗甲状腺球蛋白抗体（TGA）
+    public String antGlan;
+    //抗甲状腺微粒体抗体(TMA)
+    public String tmab;
+    //甲状腺过氧化物酶抗体（TPOA）
+    public String thyPerAnt;
+    /***凝血功能***/
+    //凝血酶原时间（PT-S）
+    public String prothTime;
+    //国际标准化比值（INR）
+    public String interStan;
+    //凝血酶原活动度（PT%）
+    public String pta;
+    //活化部分凝血活酶时间（APTT）
+    public String actPar;
+    //凝血酶时间（TT）
+    public String thrTime;
+    //纤维蛋白原（FIB）
+    public String fibrin;
+    //抗凝血酶III活性（AT-III）
+    public String antil;
+    //D-二聚体（D-Dimer）
+    public String dimer;
+    /***血脂***/
+    //总胆固醇（TC）
+    public String totalChol;
+    //甘油三酯（TG）
+    public String tricer;
+    //高密度脂蛋白胆固醇（HDL-C）
+    public String highDens;
+    //低密度脂蛋白胆固醇（LDL-C）
+    public String lowDens;
+    //载脂蛋白A1（ApoA1）
+    public String apolipa;
+    //载脂蛋白B（ApoB）
+    public String apolipb;
+    //心电图
+    public String electr;
+
+
+    public String getTtita() {
+        return ttita;
+    }
+
+    public void setTtita(String ttita) {
+        this.ttita = ttita;
+    }
+
+    public String getTotalThy() {
+        return totalThy;
+    }
+
+    public void setTotalThy(String totalThy) {
+        this.totalThy = totalThy;
+    }
+
+    public String getFtita() {
+        return ftita;
+    }
+
+    public void setFtita(String ftita) {
+        this.ftita = ftita;
+    }
+
+    public String getFreeThy() {
+        return freeThy;
+    }
+
+    public void setFreeThy(String freeThy) {
+        this.freeThy = freeThy;
+    }
+
+    public String getThyStim() {
+        return thyStim;
+    }
+
+    public void setThyStim(String thyStim) {
+        this.thyStim = thyStim;
+    }
+
+    public String getAntGlan() {
+        return antGlan;
+    }
+
+    public void setAntGlan(String antGlan) {
+        this.antGlan = antGlan;
+    }
+
+    public String getTmab() {
+        return tmab;
+    }
+
+    public void setTmab(String tmab) {
+        this.tmab = tmab;
+    }
+
+    public String getThyPerAnt() {
+        return thyPerAnt;
+    }
+
+    public void setThyPerAnt(String thyPerAnt) {
+        this.thyPerAnt = thyPerAnt;
+    }
+
+    public String getProthTime() {
+        return prothTime;
+    }
+
+    public void setProthTime(String prothTime) {
+        this.prothTime = prothTime;
+    }
+
+    public String getInterStan() {
+        return interStan;
+    }
+
+    public void setInterStan(String interStan) {
+        this.interStan = interStan;
+    }
+
+    public String getPta() {
+        return pta;
+    }
+
+    public void setPta(String pta) {
+        this.pta = pta;
+    }
+
+    public String getActPar() {
+        return actPar;
+    }
+
+    public void setActPar(String actPar) {
+        this.actPar = actPar;
+    }
+
+    public String getThrTime() {
+        return thrTime;
+    }
+
+    public void setThrTime(String thrTime) {
+        this.thrTime = thrTime;
+    }
+
+    public String getFibrin() {
+        return fibrin;
+    }
+
+    public void setFibrin(String fibrin) {
+        this.fibrin = fibrin;
+    }
+
+    public String getAntil() {
+        return antil;
+    }
+
+    public void setAntil(String antil) {
+        this.antil = antil;
+    }
+
+    public String getDimer() {
+        return dimer;
+    }
+
+    public void setDimer(String dimer) {
+        this.dimer = dimer;
+    }
+
+    public String getTotalChol() {
+        return totalChol;
+    }
+
+    public void setTotalChol(String totalChol) {
+        this.totalChol = totalChol;
+    }
+
+    public String getTricer() {
+        return tricer;
+    }
+
+    public void setTricer(String tricer) {
+        this.tricer = tricer;
+    }
+
+    public String getHighDens() {
+        return highDens;
+    }
+
+    public void setHighDens(String highDens) {
+        this.highDens = highDens;
+    }
+
+    public String getLowDens() {
+        return lowDens;
+    }
+
+    public void setLowDens(String lowDens) {
+        this.lowDens = lowDens;
+    }
+
+    public String getApolipa() {
+        return apolipa;
+    }
+
+    public void setApolipa(String apolipa) {
+        this.apolipa = apolipa;
+    }
+
+    public String getApolipb() {
+        return apolipb;
+    }
+
+    public void setApolipb(String apolipb) {
+        this.apolipb = apolipb;
+    }
+
+    public String getElectr() {
+        return electr;
+    }
+
+    public void setElectr(String electr) {
+        this.electr = electr;
+    }
+
+    /***新增辅助检查项***/
+
+
+
     public String getHighriskDesc() {
         return highriskDesc;
     }
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 bc408a1..c4e01e0 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
@@ -1155,6 +1155,7 @@ public class BabyCheckFacade {
         model.setXldq(checkModel.getXldq());
         model.setNd(checkModel.getNd());
         model.setYgbmky(checkModel.getYgbmky());
+        model.setYgbmkt(checkModel.getYgbmkt());
         model.setYgeky(checkModel.getYgeky());
         model.setYgekt(checkModel.getYgekt());
         model.setYghxkt(checkModel.getYghxkt());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
index b079c67..9a65054 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
@@ -177,7 +177,6 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
 
     private Integer couponType;
 
-
     //早孕期病毒检测
     private String zyqbdjc;
     //nt检查
@@ -191,6 +190,245 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //甲状腺功能
     private String jzxgn;
 
+    /***新增辅助检查项***/
+    /***甲状腺功能***/
+    //总三碘甲状腺原氨酸（TT3）
+    public String ttita;
+    //总甲状腺素(TT4)
+    public String totalThy;
+    //游离三碘甲状腺原氨酸（FT3）
+    public String ftita;
+    //游离甲状腺素（FT4）
+    public String freeThy;
+    //促甲状腺激素(TSH)
+    public String thyStim;
+    //抗甲状腺球蛋白抗体（TGA）
+    public String antGlan;
+    //抗甲状腺微粒体抗体(TMA)
+    public String tmab;
+    //甲状腺过氧化物酶抗体（TPOA）
+    public String thyPerAnt;
+    /***凝血功能***/
+    //凝血酶原时间（PT-S）
+    public String prothTime;
+    //国际标准化比值（INR）
+    public String interStan;
+    //凝血酶原活动度（PT%）
+    public String pta;
+    //活化部分凝血活酶时间（APTT）
+    public String actPar;
+    //凝血酶时间（TT）
+    public String thrTime;
+    //纤维蛋白原（FIB）
+    public String fibrin;
+    //抗凝血酶III活性（AT-III）
+    public String antil;
+    //D-二聚体（D-Dimer）
+    public String dimer;
+    /***血脂***/
+    //总胆固醇（TC）
+    public String totalChol;
+    //甘油三酯（TG）
+    public String tricer;
+    //高密度脂蛋白胆固醇（HDL-C）
+    public String highDens;
+    //低密度脂蛋白胆固醇（LDL-C）
+    public String lowDens;
+    //载脂蛋白A1（ApoA1）
+    public String apolipa;
+    //载脂蛋白B（ApoB）
+    public String apolipb;
+    //心电图
+    public String electr;
+
+
+    public String getTtita() {
+        return ttita;
+    }
+
+    public void setTtita(String ttita) {
+        this.ttita = ttita;
+    }
+
+    public String getTotalThy() {
+        return totalThy;
+    }
+
+    public void setTotalThy(String totalThy) {
+        this.totalThy = totalThy;
+    }
+
+    public String getFtita() {
+        return ftita;
+    }
+
+    public void setFtita(String ftita) {
+        this.ftita = ftita;
+    }
+
+    public String getFreeThy() {
+        return freeThy;
+    }
+
+    public void setFreeThy(String freeThy) {
+        this.freeThy = freeThy;
+    }
+
+    public String getThyStim() {
+        return thyStim;
+    }
+
+    public void setThyStim(String thyStim) {
+        this.thyStim = thyStim;
+    }
+
+    public String getAntGlan() {
+        return antGlan;
+    }
+
+    public void setAntGlan(String antGlan) {
+        this.antGlan = antGlan;
+    }
+
+    public String getTmab() {
+        return tmab;
+    }
+
+    public void setTmab(String tmab) {
+        this.tmab = tmab;
+    }
+
+    public String getThyPerAnt() {
+        return thyPerAnt;
+    }
+
+    public void setThyPerAnt(String thyPerAnt) {
+        this.thyPerAnt = thyPerAnt;
+    }
+
+    public String getProthTime() {
+        return prothTime;
+    }
+
+    public void setProthTime(String prothTime) {
+        this.prothTime = prothTime;
+    }
+
+    public String getInterStan() {
+        return interStan;
+    }
+
+    public void setInterStan(String interStan) {
+        this.interStan = interStan;
+    }
+
+    public String getPta() {
+        return pta;
+    }
+
+    public void setPta(String pta) {
+        this.pta = pta;
+    }
+
+    public String getActPar() {
+        return actPar;
+    }
+
+    public void setActPar(String actPar) {
+        this.actPar = actPar;
+    }
+
+    public String getThrTime() {
+        return thrTime;
+    }
+
+    public void setThrTime(String thrTime) {
+        this.thrTime = thrTime;
+    }
+
+    public String getFibrin() {
+        return fibrin;
+    }
+
+    public void setFibrin(String fibrin) {
+        this.fibrin = fibrin;
+    }
+
+    public String getAntil() {
+        return antil;
+    }
+
+    public void setAntil(String antil) {
+        this.antil = antil;
+    }
+
+    public String getDimer() {
+        return dimer;
+    }
+
+    public void setDimer(String dimer) {
+        this.dimer = dimer;
+    }
+
+    public String getTotalChol() {
+        return totalChol;
+    }
+
+    public void setTotalChol(String totalChol) {
+        this.totalChol = totalChol;
+    }
+
+    public String getTricer() {
+        return tricer;
+    }
+
+    public void setTricer(String tricer) {
+        this.tricer = tricer;
+    }
+
+    public String getHighDens() {
+        return highDens;
+    }
+
+    public void setHighDens(String highDens) {
+        this.highDens = highDens;
+    }
+
+    public String getLowDens() {
+        return lowDens;
+    }
+
+    public void setLowDens(String lowDens) {
+        this.lowDens = lowDens;
+    }
+
+    public String getApolipa() {
+        return apolipa;
+    }
+
+    public void setApolipa(String apolipa) {
+        this.apolipa = apolipa;
+    }
+
+    public String getApolipb() {
+        return apolipb;
+    }
+
+    public void setApolipb(String apolipb) {
+        this.apolipb = apolipb;
+    }
+
+    public String getElectr() {
+        return electr;
+    }
+
+    public void setElectr(String electr) {
+        this.electr = electr;
+    }
+
+    /***新增辅助检查项***/
+
+
     public String getHighriskDesc() {
         return highriskDesc;
     }
@@ -352,6 +590,30 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     @Override
     public AntenatalExaminationModel convertToDataModel() {
         AntenatalExaminationModel examinationModel =  new AntenatalExaminationModel();
+        examinationModel.setTtita(ttita);
+        examinationModel.setTotalThy(totalThy);
+        examinationModel.setFtita(ftita);
+        examinationModel.setFreeThy(freeThy);
+        examinationModel.setThyStim(thyStim);
+        examinationModel.setAntGlan(antGlan);
+        examinationModel.setTmab(tmab);
+        examinationModel.setThyPerAnt(thyPerAnt);
+        examinationModel.setProthTime(prothTime);
+        examinationModel.setInterStan(interStan);
+        examinationModel.setPta(pta);
+        examinationModel.setActPar(actPar);
+        examinationModel.setThrTime(thrTime);
+        examinationModel.setFibrin(fibrin);
+        examinationModel.setAntil(antil);
+        examinationModel.setDimer(dimer);
+        examinationModel.setTotalChol(totalChol);
+        examinationModel.setTricer(tricer);
+        examinationModel.setHighDens(highDens);
+        examinationModel.setLowDens(lowDens);
+        examinationModel.setApolipa(apolipa);
+        examinationModel.setApolipb(apolipb);
+        examinationModel.setElectr(electr);
+
         examinationModel.setHighriskDesc(highriskDesc);
         examinationModel.setLisCheckItems(lisCheckItems);
         examinationModel.setGenRemark(genRemark);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
index c3500ed..0c0b9a0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
@@ -126,9 +126,13 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
 
     private Map<String, List<String>> treatmentOpinion2;
     private List<String> treatmentOpinion2Types;
-    /** 胎动 */
+    /**
+     * 胎动
+     */
     private String quicken;
-    /** 胎动备注 */
+    /**
+     * 胎动备注
+     */
     private String quickenRemark;
 
     public String getCweight() {
@@ -299,7 +303,7 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     private String cDueWeek;
 
     //初诊其他信息
-   private List<AntExcAddOther> antExcAddOthers;
+    private List<AntExcAddOther> antExcAddOthers;
     //存活胎儿数
     private Integer survFetus;
 
@@ -385,7 +389,57 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     //甲状腺功能
     private String jzxgn;
 
-
+    /***新增辅助检查项***/
+    /***甲状腺功能***/
+    //总三碘甲状腺原氨酸（TT3）
+    public String ttita;
+    //总甲状腺素(TT4)
+    public String totalThy;
+    //游离三碘甲状腺原氨酸（FT3）
+    public String ftita;
+    //游离甲状腺素（FT4）
+    public String freeThy;
+    //促甲状腺激素(TSH)
+    public String thyStim;
+    //抗甲状腺球蛋白抗体（TGA）
+    public String antGlan;
+    //抗甲状腺微粒体抗体(TMA)
+    public String tmab;
+    //甲状腺过氧化物酶抗体（TPOA）
+    public String thyPerAnt;
+    /***凝血功能***/
+    //凝血酶原时间（PT-S）
+    public String prothTime;
+    //国际标准化比值（INR）
+    public String interStan;
+    //凝血酶原活动度（PT%）
+    public String pta;
+    //活化部分凝血活酶时间（APTT）
+    public String actPar;
+    //凝血酶时间（TT）
+    public String thrTime;
+    //纤维蛋白原（FIB）
+    public String fibrin;
+    //抗凝血酶III活性（AT-III）
+    public String antil;
+    //D-二聚体（D-Dimer）
+    public String dimer;
+    /***血脂***/
+    //总胆固醇（TC）
+    public String totalChol;
+    //甘油三酯（TG）
+    public String tricer;
+    //高密度脂蛋白胆固醇（HDL-C）
+    public String highDens;
+    //低密度脂蛋白胆固醇（LDL-C）
+    public String lowDens;
+    //载脂蛋白A1（ApoA1）
+    public String apolipa;
+    //载脂蛋白B（ApoB）
+    public String apolipb;
+    //心电图
+    public String electr;
+    /***新增辅助检查项***/
     /**
      * 辅助检查中
      */
@@ -401,6 +455,190 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     //浮肿
     private String edema;
 
+    public String getTtita() {
+        return ttita;
+    }
+
+    public void setTtita(String ttita) {
+        this.ttita = ttita;
+    }
+
+    public String getTotalThy() {
+        return totalThy;
+    }
+
+    public void setTotalThy(String totalThy) {
+        this.totalThy = totalThy;
+    }
+
+    public String getFtita() {
+        return ftita;
+    }
+
+    public void setFtita(String ftita) {
+        this.ftita = ftita;
+    }
+
+    public String getFreeThy() {
+        return freeThy;
+    }
+
+    public void setFreeThy(String freeThy) {
+        this.freeThy = freeThy;
+    }
+
+    public String getThyStim() {
+        return thyStim;
+    }
+
+    public void setThyStim(String thyStim) {
+        this.thyStim = thyStim;
+    }
+
+    public String getAntGlan() {
+        return antGlan;
+    }
+
+    public void setAntGlan(String antGlan) {
+        this.antGlan = antGlan;
+    }
+
+    public String getTmab() {
+        return tmab;
+    }
+
+    public void setTmab(String tmab) {
+        this.tmab = tmab;
+    }
+
+    public String getThyPerAnt() {
+        return thyPerAnt;
+    }
+
+    public void setThyPerAnt(String thyPerAnt) {
+        this.thyPerAnt = thyPerAnt;
+    }
+
+    public String getProthTime() {
+        return prothTime;
+    }
+
+    public void setProthTime(String prothTime) {
+        this.prothTime = prothTime;
+    }
+
+    public String getInterStan() {
+        return interStan;
+    }
+
+    public void setInterStan(String interStan) {
+        this.interStan = interStan;
+    }
+
+    public String getPta() {
+        return pta;
+    }
+
+    public void setPta(String pta) {
+        this.pta = pta;
+    }
+
+    public String getActPar() {
+        return actPar;
+    }
+
+    public void setActPar(String actPar) {
+        this.actPar = actPar;
+    }
+
+    public String getThrTime() {
+        return thrTime;
+    }
+
+    public void setThrTime(String thrTime) {
+        this.thrTime = thrTime;
+    }
+
+    public String getFibrin() {
+        return fibrin;
+    }
+
+    public void setFibrin(String fibrin) {
+        this.fibrin = fibrin;
+    }
+
+    public String getAntil() {
+        return antil;
+    }
+
+    public void setAntil(String antil) {
+        this.antil = antil;
+    }
+
+    public String getDimer() {
+        return dimer;
+    }
+
+    public void setDimer(String dimer) {
+        this.dimer = dimer;
+    }
+
+    public String getTotalChol() {
+        return totalChol;
+    }
+
+    public void setTotalChol(String totalChol) {
+        this.totalChol = totalChol;
+    }
+
+    public String getTricer() {
+        return tricer;
+    }
+
+    public void setTricer(String tricer) {
+        this.tricer = tricer;
+    }
+
+    public String getHighDens() {
+        return highDens;
+    }
+
+    public void setHighDens(String highDens) {
+        this.highDens = highDens;
+    }
+
+    public String getLowDens() {
+        return lowDens;
+    }
+
+    public void setLowDens(String lowDens) {
+        this.lowDens = lowDens;
+    }
+
+    public String getApolipa() {
+        return apolipa;
+    }
+
+    public void setApolipa(String apolipa) {
+        this.apolipa = apolipa;
+    }
+
+    public String getApolipb() {
+        return apolipb;
+    }
+
+    public void setApolipb(String apolipb) {
+        this.apolipb = apolipb;
+    }
+
+    public String getElectr() {
+        return electr;
+    }
+
+    public void setElectr(String electr) {
+        this.electr = electr;
+    }
+
     public String getHighriskDesc() {
         return highriskDesc;
     }
@@ -1347,6 +1585,32 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     @Override
     public AntExChuModel convertToDataModel() {
         AntExChuModel antExChuModel = new AntExChuModel();
+        antExChuModel.setTtita(ttita);
+        antExChuModel.setTotalThy(totalThy);
+        antExChuModel.setFtita(ftita);
+        antExChuModel.setFreeThy(freeThy);
+        antExChuModel.setThyStim(thyStim);
+        antExChuModel.setAntGlan(antGlan);
+        antExChuModel.setTmab(tmab);
+        antExChuModel.setThyPerAnt(thyPerAnt);
+        antExChuModel.setProthTime(prothTime);
+        antExChuModel.setInterStan(interStan);
+        antExChuModel.setPta(pta);
+        antExChuModel.setActPar(actPar);
+        antExChuModel.setThrTime(thrTime);
+        antExChuModel.setFibrin(fibrin);
+        antExChuModel.setAntil(antil);
+        antExChuModel.setDimer(dimer);
+        antExChuModel.setTotalChol(totalChol);
+        antExChuModel.setTricer(tricer);
+        antExChuModel.setHighDens(highDens);
+        antExChuModel.setLowDens(lowDens);
+        antExChuModel.setApolipa(apolipa);
+        antExChuModel.setApolipb(apolipb);
+        antExChuModel.setElectr(electr);
+
+
+
         antExChuModel.setHighriskDesc(highriskDesc);
         antExChuModel.setLisCheckItems(lisCheckItems);
         antExChuModel.setGenRemark(genRemark);
@@ -1472,7 +1736,7 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
         }
         antExChuModel.setHighriskSocre(highriskSocre);
 
-        if(CollectionUtils.isNotEmpty(otherHighRisk)){
+        if (CollectionUtils.isNotEmpty(otherHighRisk)) {
             antExChuModel.setOtherHighRisk(JsonUtil.array2JsonString(otherHighRisk));
         }
         if (null != diagnosis) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
index 3c12878..4fb9e15 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
@@ -170,7 +170,6 @@ public class BabyCheckRequest {
     private String platelet;
     //血常规其他
     private String otherBlood;
-
     //尿常规：尿蛋白
     private String urineProtein;
     //尿常规：尿糖
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 c0a6c8d..ad084d7 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
@@ -625,6 +625,61 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         //病历号(住院号)
         private String blNo;
 
+        /***畸形详情****/
+        //无脑畸形
+        public Integer jxWn;
+        //脊柱裂
+        public Integer jxJzl;
+        //脑彭出
+        public Integer jxNpc;
+        //先天性脑积水
+        public Integer jxNjs;
+        //腭裂
+        public String jxEl;
+        //唇裂
+        public String jxCl;
+        //唇裂合并腭裂
+        public String jxClhb;
+        //小耳(包括无耳)
+        public String jxXe;
+        //外耳其他畸形(小耳、无耳除外)
+        public String jxWe;
+        //食道闭锁或狭窄
+        public Integer jxSdbs;
+        //直肠肛门闭锁或狭窄(包括无肛)
+        public Integer jxZcgm;
+        //尿道下裂
+        public Integer jxNdxl;
+        //膀胱外翻
+        public Integer jxPwwf;
+        //马蹄内翻足
+        public String jxMtn;
+        //多指
+        public String jxDz;
+        //多趾
+        public String jxDc;
+        //并指
+        public String jxBz;
+        //并趾
+        public String jxBc;
+        //肢体短缩包括缺指(趾)、裂手(足)]
+        public String jxZtds;
+        //先天性隔疝
+        public Integer jxXtxe;
+        //脐膨出
+        public Integer jxQpc;
+        //腹裂
+        public Integer jxFl;
+        //联体双胎
+        public Integer jxLtst;
+        //唐氏综合征(21-三体综合征)
+        public Integer jxTszh;
+        //先天性心脏病
+        public Integer jxXtx;
+        //其他(写明病名并详细描述)
+        public Integer jxOther;
+        /***畸形详情结束****/
+
         @Override
         public MaternalDeliverModel.Baby convertToDataModel() {
             MaternalDeliverModel.Baby baby= new MaternalDeliverModel.Baby();
@@ -648,6 +703,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
             return baby;
         }
 
+
         public String getBabyDiagnosis() {
             return babyDiagnosis;
         }
-- 
1.8.3.1