From f2745af7dc3cd910935cb6438af90f49b3a4b1e6 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Tue, 14 May 2019 15:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B8=E5=9F=8E=E4=BA=BA=E6=B0=91=E5=88=9D?= =?UTF-8?q?=E8=AF=8A=E5=A4=8D=E8=AF=8A=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/AntExChuModel.java | 9 +++ .../platform/pojo/AntenatalExaminationModel.java | 10 ++++ .../web/controller/AnnualReportController.java | 4 ++ .../operate/web/request/AntExAddRequest.java | 64 ++++++++++++++------- .../operate/web/request/AntExcAddRequest.java | 65 ++++++++++++++-------- 5 files changed, 110 insertions(+), 42 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 10823e6..bdcdffe 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 @@ -369,8 +369,17 @@ public class AntExChuModel extends BaseModel { private String tpaAb; + private String tgAb; + private String aTSHR; + public String getTgAb() { + return tgAb; + } + + public void setTgAb(String tgAb) { + this.tgAb = tgAb; + } //妊娠方法 private Integer pregnancyMethod; 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 a51a7b6..b6d31a3 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 @@ -297,6 +297,8 @@ public class AntenatalExaminationModel extends BaseModel { private String tpaAb; + private String tgAb; + private String aTSHR; public String getfTthree() { @@ -331,6 +333,14 @@ public class AntenatalExaminationModel extends BaseModel { this.tpaAb = tpaAb; } + public String getTgAb() { + return tgAb; + } + + public void setTgAb(String tgAb) { + this.tgAb = tgAb; + } + public String getaTSHR() { return aTSHR; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AnnualReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AnnualReportController.java index 6777ab5..40c9d90 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AnnualReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AnnualReportController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; @Controller public class AnnualReportController extends BaseController { @@ -42,4 +43,7 @@ public class AnnualReportController extends BaseController { Assert.notNull(loginState, "未登录"); return loginState.getId(); } + + + } 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 33bf573..8695d8f 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 @@ -265,54 +265,63 @@ public class AntExAddRequest implements IBasicRequestConvert { //甲状腺功能 添加 - private String fTthree; + private Double fTthree; - private String fTFour; + private Double fTFour; - private String tSH; + private Double tSH; - private String tpaAb; + private Double tpaAb; - private String aTSHR; + private Double tgAb; + private Double aTSHR; //妊娠方法 private Integer pregnancyMethod; @@ -374,43 +375,51 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String pregnancyExcpetion; - public String getfTthree() { + public Double getfTthree() { return fTthree; } - public void setfTthree(String fTthree) { + public void setfTthree(Double fTthree) { this.fTthree = fTthree; } - public String getfTFour() { + public Double getfTFour() { return fTFour; } - public void setfTFour(String fTFour) { + public void setfTFour(Double fTFour) { this.fTFour = fTFour; } - public String gettSH() { + public Double gettSH() { return tSH; } - public void settSH(String tSH) { + public void settSH(Double tSH) { this.tSH = tSH; } - public String getTpaAb() { + public Double getTpaAb() { return tpaAb; } - public void setTpaAb(String tpaAb) { + public void setTpaAb(Double tpaAb) { this.tpaAb = tpaAb; } - public String getaTSHR() { + public Double getTgAb() { + return tgAb; + } + + public void setTgAb(Double tgAb) { + this.tgAb = tgAb; + } + + public Double getaTSHR() { return aTSHR; } - public void setaTSHR(String aTSHR) { + public void setaTSHR(Double aTSHR) { this.aTSHR = aTSHR; } @@ -1896,13 +1905,25 @@ public class AntExcAddRequest implements IBasicRequestConvert { /** * 产检项 * */ - antExChuModel.setConfigItemId(configItemId); - antExChuModel.setfTFour(fTFour); - antExChuModel.setfTthree(fTthree); - antExChuModel.setaTSHR(aTSHR); - antExChuModel.setTpaAb(tpaAb); - antExChuModel.settSH(tSH); - + java.text.DecimalFormat df = new java.text.DecimalFormat("#.##"); + if (null != fTFour) { + antExChuModel.setfTFour(df.format(fTFour)); + } + if (null != fTthree) { + antExChuModel.setfTthree(df.format(fTthree)); + } + if (null != tSH) { + antExChuModel.settSH(df.format(tSH)); + } + if (null != tpaAb) { + antExChuModel.setTgAb(df.format(tgAb)); + } + if (null != aTSHR) { + antExChuModel.setaTSHR(df.format(aTSHR)); + } + if (null != tgAb) { + antExChuModel.setTgAb(df.format(tgAb)); + } if (null != bp) { antExChuModel.setBp(JsonUtil.obj2JsonString(bp)); -- 1.8.3.1