From ef694faa923def97aa885121079f47c41e5ba5fd Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 24 Jan 2022 17:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=88=9D=E8=AF=8A?=
 =?UTF-8?q?=20=E5=A4=8D=E8=AF=8A=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ViewFacade.java    |  16 +++
 .../web/result/AntenatalExaminationResult.java     |  37 ++++++
 .../operate/web/result/AntexChuResult.java         | 126 +++++++++++++++++++++
 3 files changed, 179 insertions(+)

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 48dfc5f..4778bda 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
@@ -2509,6 +2509,18 @@ public class ViewFacade {
         //围场孕妇产检新加字段nt
         map.put("wcNt",data.getWcNt());
 
+        map.put("jw", data.getJw());
+        map.put("yw", data.getYw());
+        map.put("bun", data.getBun());
+        map.put("cr", data.getCr());
+        map.put("ua", data.getUa());
+        map.put("rgaxa", data.getRgaxa());
+        map.put("tf3", data.getTf3());
+        map.put("tf4", data.getTf4());
+        map.put("ctsh", data.getCtsh());
+        map.put("ctgab", data.getCtgab());
+
+
         //医生所在团队
         if(StringUtils.isNotEmpty(data.getTeamId())){
             DoctorTeam doctorTeam=new DoctorTeam();
@@ -3429,6 +3441,10 @@ public class ViewFacade {
         map.put("szy", szy); // 血压
         map.put("yn", data.getYn()); //
 
+        map.put("bloodSugarKf", data.getBloodSugarKf());
+        map.put("bloodSugar1h", data.getBloodSugar1h());
+        map.put("bloodSugar2h", data.getBloodSugar2h());
+
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         br.setData(map);
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 83083da..681fe6a 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
@@ -119,6 +119,8 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     //羊水量
     private String bamnio;
 
+
+
     public String getBamnio() {
         return bamnio;
     }
@@ -1160,6 +1162,38 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         this.secondaryDiagnosis = secondaryDiagnosis;
     }
 
+    //血糖
+    //空腹
+    private String bloodSugarKf;
+    //1h
+    private String bloodSugar1h;
+    //2h
+    private String bloodSugar2h;
+
+    public String getBloodSugarKf() {
+        return bloodSugarKf;
+    }
+
+    public void setBloodSugarKf(String bloodSugarKf) {
+        this.bloodSugarKf = bloodSugarKf;
+    }
+
+    public String getBloodSugar1h() {
+        return bloodSugar1h;
+    }
+
+    public void setBloodSugar1h(String bloodSugar1h) {
+        this.bloodSugar1h = bloodSugar1h;
+    }
+
+    public String getBloodSugar2h() {
+        return bloodSugar2h;
+    }
+
+    public void setBloodSugar2h(String bloodSugar2h) {
+        this.bloodSugar2h = bloodSugar2h;
+    }
+
     @Override
     public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
 
@@ -1330,6 +1364,9 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         }
         setTeamId(destModel.getTeamId());
         setReason(destModel.getReason());
+        setBloodSugarKf(destModel.getBloodSugarKf());
+        setBloodSugar1h(destModel.getBloodSugar1h());
+        setBloodSugar2h(destModel.getBloodSugar2h());
         return this;
     }
 
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 cfc2a44..631549c 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
@@ -674,6 +674,120 @@ public class AntexChuResult {
     private String teamId;//医生团队
     private String reason;//换团队的原因
 
+    //颈围
+    private String jw;
+    //腰围
+    private String yw;
+
+
+
+    //BUN    尿素氮
+    private String bun;
+    //Cr肌酐
+    private String cr;
+    //UA尿酸
+    private String ua;
+    //r-谷氨酰胺转移酶
+    private String rgaxa;
+
+    //FT3游离三碘甲状腺氨酸
+    public String tf3;
+    //FT4血清游离甲状腺素
+    public String tf4;
+    //促甲状腺激素(TSH)
+    public String ctsh;
+    //TGAb甲状腺球蛋白
+    public String ctgab;
+    //TPOAb抗甲状腺过氧化物抗体
+    public String ctpoab;
+
+    public String getJw() {
+        return jw;
+    }
+
+    public void setJw(String jw) {
+        this.jw = jw;
+    }
+
+    public String getYw() {
+        return yw;
+    }
+
+    public void setYw(String yw) {
+        this.yw = yw;
+    }
+
+    public String getBun() {
+        return bun;
+    }
+
+    public void setBun(String bun) {
+        this.bun = bun;
+    }
+
+    public String getCr() {
+        return cr;
+    }
+
+    public void setCr(String cr) {
+        this.cr = cr;
+    }
+
+    public String getUa() {
+        return ua;
+    }
+
+    public void setUa(String ua) {
+        this.ua = ua;
+    }
+
+    public String getRgaxa() {
+        return rgaxa;
+    }
+
+    public void setRgaxa(String rgaxa) {
+        this.rgaxa = rgaxa;
+    }
+
+    public String getTf3() {
+        return tf3;
+    }
+
+    public void setTf3(String tf3) {
+        this.tf3 = tf3;
+    }
+
+    public String getTf4() {
+        return tf4;
+    }
+
+    public void setTf4(String tf4) {
+        this.tf4 = tf4;
+    }
+
+    public String getCtsh() {
+        return ctsh;
+    }
+
+    public void setCtsh(String ctsh) {
+        this.ctsh = ctsh;
+    }
+
+    public String getCtgab() {
+        return ctgab;
+    }
+
+    public void setCtgab(String ctgab) {
+        this.ctgab = ctgab;
+    }
+
+    public String getCtpoab() {
+        return ctpoab;
+    }
+
+    public void setCtpoab(String ctpoab) {
+        this.ctpoab = ctpoab;
+    }
 
     public String getTeamId() {
         return teamId;
@@ -2308,6 +2422,18 @@ public class AntexChuResult {
 
             setTeamId(antExChuModel.getTeamId());
             setReason(antExChuModel.getReason());
+           setJw(antExChuModel.getJw());
+           setYw(antExChuModel.getYw());
+           setBun(antExChuModel.getBun());
+           setCr(antExChuModel.getCr());
+           setUa(antExChuModel.getUa());
+           setRgaxa(antExChuModel.getRgaxa());
+           setTf3(antExChuModel.getTf3());
+           setTf4(antExChuModel.getTf4());
+           setCtsh(antExChuModel.getCtsh());
+           setCtgab(antExChuModel.getCtgab());
+           setCtpoab(antExChuModel.getCtpoab());
+
         }
         return this;
     }
-- 
1.8.3.1