From c7d922ef76bf16ac09e67c824a372515b58447f2 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 27 Mar 2018 09:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E8=AF=8A=E3=80=81=E5=A4=8D=E8=AF=8A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=85=E5=8A=A9=E6=A3=80=E6=9F=A5=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/pojo/AntenatalExaminationModel.java   |   6 +-
 .../operate/web/request/AntExAddRequest.java       |   6 +-
 .../web/result/AntenatalExaminationResult.java     | 262 +++++++++++++++++++++
 .../operate/web/result/AntexChuResult.java         | 259 ++++++++++++++++++++
 4 files changed, 527 insertions(+), 6 deletions(-)

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 9af1828..500bc2a 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
@@ -235,7 +235,7 @@ public class AntenatalExaminationModel extends BaseModel {
     //游离甲状腺素（FT4）
     public String freeThy;
     //促甲状腺激素(TSH)
-    public String thyStim;
+    public Map<String,Object> thyStim;
     //抗甲状腺球蛋白抗体（TGA）
     public String antGlan;
     //抗甲状腺微粒体抗体(TMA)
@@ -308,11 +308,11 @@ public class AntenatalExaminationModel extends BaseModel {
         this.freeThy = freeThy;
     }
 
-    public String getThyStim() {
+    public Map<String, Object> getThyStim() {
         return thyStim;
     }
 
-    public void setThyStim(String thyStim) {
+    public void setThyStim(Map<String, Object> thyStim) {
         this.thyStim = thyStim;
     }
 
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 9a65054..fa1d71f 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
@@ -201,7 +201,7 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //游离甲状腺素（FT4）
     public String freeThy;
     //促甲状腺激素(TSH)
-    public String thyStim;
+    public Map<String,Object> thyStim;
     //抗甲状腺球蛋白抗体（TGA）
     public String antGlan;
     //抗甲状腺微粒体抗体(TMA)
@@ -274,11 +274,11 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         this.freeThy = freeThy;
     }
 
-    public String getThyStim() {
+    public Map<String, Object> getThyStim() {
         return thyStim;
     }
 
-    public void setThyStim(String thyStim) {
+    public void setThyStim(Map<String, Object> thyStim) {
         this.thyStim = thyStim;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index 9d86795..04891c1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -198,6 +198,244 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     //            //甲状腺功能
     private String jzxgn;
 
+    /***新增辅助检查项***/
+    /***甲状腺功能***/
+    //总三碘甲状腺原氨酸（TT3）
+    public String ttita;
+    //总甲状腺素(TT4)
+    public String totalThy;
+    //游离三碘甲状腺原氨酸（FT3）
+    public String ftita;
+    //游离甲状腺素（FT4）
+    public String freeThy;
+    //促甲状腺激素(TSH)
+    public Map 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 Map getThyStim() {
+        return thyStim;
+    }
+
+    public void setThyStim(Map 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;
     }
@@ -328,6 +566,30 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
 
     @Override
     public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
+        setTtita(destModel.getTtita());
+        setTotalThy(destModel.getTotalThy());
+        setFtita(destModel.getFtita());
+        setFreeThy(destModel.getFreeThy());
+        setThyStim(destModel.getThyStim());
+        setAntGlan(destModel.getAntGlan());
+        setTmab(destModel.getTmab());
+        setThyPerAnt(destModel.getThyPerAnt());
+        setProthTime(destModel.getProthTime());
+        setInterStan(destModel.getInterStan());
+        setPta(destModel.getPta());
+        setActPar(destModel.getActPar());
+        setThrTime(destModel.getThrTime());
+        setFibrin(destModel.getFibrin());
+        setAntil(destModel.getAntil());
+        setDimer(destModel.getDimer());
+        setTotalChol(destModel.getTotalChol());
+        setTricer(destModel.getTricer());
+        setHighDens(destModel.getHighDens());
+        setLowDens(destModel.getLowDens());
+        setApolipa(destModel.getApolipa());
+        setApolipb(destModel.getApolipb());
+        setElectr(destModel.getElectr());
+
         setHighriskDesc(destModel.getHighriskDesc());
         setGongGaoType(destModel.getGongGaoType());
         setGongGaoSelect(destModel.getGongGaoSelect());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index f0e4136..4fe87a0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -391,6 +391,241 @@ public class AntexChuResult {
     //浮肿
     private String edema;
 
+    /***新增辅助检查项***/
+    /***甲状腺功能***/
+    //总三碘甲状腺原氨酸（TT3）
+    public String ttita;
+    //总甲状腺素(TT4)
+    public String totalThy;
+    //游离三碘甲状腺原氨酸（FT3）
+    public String ftita;
+    //游离甲状腺素（FT4）
+    public String freeThy;
+    //促甲状腺激素(TSH)
+    public Map 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 Map getThyStim() {
+        return thyStim;
+    }
+
+    public void setThyStim(Map 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;
     }
@@ -1295,6 +1530,30 @@ public class AntexChuResult {
 
     public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
         if (null != antExChuModel) {
+            setTtita(antExChuModel.getTtita());
+            setTotalThy(antExChuModel.getTotalThy());
+            setFtita(antExChuModel.getFtita());
+            setFreeThy(antExChuModel.getFreeThy());
+            setThyStim(antExChuModel.getThyStim());
+            setAntGlan(antExChuModel.getAntGlan());
+            setTmab(antExChuModel.getTmab());
+            setThyPerAnt(antExChuModel.getThyPerAnt());
+            setProthTime(antExChuModel.getProthTime());
+            setInterStan(antExChuModel.getInterStan());
+            setPta(antExChuModel.getPta());
+            setActPar(antExChuModel.getActPar());
+            setThrTime(antExChuModel.getThrTime());
+            setFibrin(antExChuModel.getFibrin());
+            setAntil(antExChuModel.getAntil());
+            setDimer(antExChuModel.getDimer());
+            setTotalChol(antExChuModel.getTotalChol());
+            setTricer(antExChuModel.getTricer());
+            setHighDens(antExChuModel.getHighDens());
+            setLowDens(antExChuModel.getLowDens());
+            setApolipa(antExChuModel.getApolipa());
+            setApolipb(antExChuModel.getApolipb());
+            setElectr(antExChuModel.getElectr());
+
             setHighriskDesc(antExChuModel.getHighriskDesc());
             setSurvFetus(antExChuModel.getSurvFetus());
             setAntExcAddOthers(antExChuModel.getAntExcAddOthers());
-- 
1.8.3.1