From 78590dc4474f07423a1e9cdd603f04092e211895 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 15 Jun 2017 15:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/AntExChuModel.java | 20 ++++++++--------- .../platform/pojo/AntenatalExaminationModel.java | 21 +++++++++--------- .../web/facade/AntenatalExaminationFacade.java | 20 ++++++++--------- .../operate/web/request/AntExAddRequest.java | 25 +++++++++++----------- .../operate/web/request/AntExcAddRequest.java | 24 ++++++++++----------- 5 files changed, 55 insertions(+), 55 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 1a42aa3..5519d38 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 @@ -127,9 +127,9 @@ public class AntExChuModel extends BaseModel { //产捡筛查 private String cjsc; //胎儿系统排畸b吵 - private String text; + private String textpjbc; //75gODTT - private String s75god; + private String s75gdgtt; //甲状腺功能 private String jzxgn; @@ -161,20 +161,20 @@ public class AntExChuModel extends BaseModel { this.cjsc = cjsc; } - public String getText() { - return text; + public String getTextpjbc() { + return textpjbc; } - public void setText(String text) { - this.text = text; + public void setTextpjbc(String textpjbc) { + this.textpjbc = textpjbc; } - public String getS75god() { - return s75god; + public String getS75gdgtt() { + return s75gdgtt; } - public void setS75god(String s75god) { - this.s75god = s75god; + public void setS75gdgtt(String s75gdgtt) { + this.s75gdgtt = s75gdgtt; } public String getJzxgn() { 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 801b9f5..6dc50f9 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 @@ -121,9 +121,9 @@ public class AntenatalExaminationModel extends BaseModel { //产捡筛查 private String cjsc; //胎儿系统排畸b吵 - private String text; + private String textpjbc; //75gODTT - private String s75god; + private String s75gdgtt; //甲状腺功能 private String jzxgn; @@ -151,21 +151,20 @@ public class AntenatalExaminationModel extends BaseModel { this.cjsc = cjsc; } - - public String getText() { - return text; + public String getTextpjbc() { + return textpjbc; } - public void setText(String text) { - this.text = text; + public void setTextpjbc(String textpjbc) { + this.textpjbc = textpjbc; } - public String getS75god() { - return s75god; + public String getS75gdgtt() { + return s75gdgtt; } - public void setS75god(String s75god) { - this.s75god = s75god; + public void setS75gdgtt(String s75gdgtt) { + this.s75gdgtt = s75gdgtt; } public String getJzxgn() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index c48b6bc..dbbc206 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2150,16 +2150,16 @@ public class AntenatalExaminationFacade { String zybd=model.getZyqbd(); String ntjc= model.getNtjc(); String cqsc= model.getCjsc(); - String text= model.getText(); - String s75god= model.getS75god(); + String text= model.getTextpjbc(); + String s75gdgtt= model.getS75gdgtt(); String jzxgn= model.getJzxgn(); if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)|| - StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75god)||StringUtils.isNotEmpty(jzxgn)){ + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75gdgtt)||StringUtils.isNotEmpty(jzxgn)){ m.put("zybd",zybd); m.put("ntjc",ntjc); m.put("cjsc",cqsc); - m.put("text",text); - m.put("s75god",s75god); + m.put("textpjbc",text); + m.put("s75gdgtt",s75gdgtt); m.put("jzxgn",jzxgn); break; } @@ -2175,16 +2175,16 @@ public class AntenatalExaminationFacade { String zybd=chu.getZyqbd(); String ntjc= chu.getNtjc(); String cqsc= chu.getCjsc(); - String text= chu.getText(); - String s75god= chu.getS75god(); + String text= chu.getTextpjbc(); + String s75gdgtt= chu.getS75gdgtt(); String jzxgn= chu.getJzxgn(); if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)|| - StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75god)||StringUtils.isNotEmpty(jzxgn)){ + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75gdgtt)||StringUtils.isNotEmpty(jzxgn)){ m.put("zybd",zybd); m.put("ntjc",ntjc); m.put("cjsc",cqsc); - m.put("text",text); - m.put("s75god",s75god); + m.put("textpjbc",text); + m.put("s75gdgtt",s75gdgtt); m.put("jzxgn",jzxgn); break; } 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 d67915e..dbc9c2f 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 @@ -105,9 +105,9 @@ public class AntExAddRequest implements IBasicRequestConvert { //产前筛查 private String cjsc; //胎儿系统排畸b吵 - private String text; + private String textpjbc; //75gODTT - private String s75god; + private String s75gdgtt; //甲状腺功能 private String jzxgn; @@ -235,20 +235,20 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.cjsc = cjsc; } - public String getText() { - return text; + public String getTextpjbc() { + return textpjbc; } - public void setText(String text) { - this.text = text; + public void setTextpjbc(String textpjbc) { + this.textpjbc = textpjbc; } - public String getS75god() { - return s75god; + public String getS75gdgtt() { + return s75gdgtt; } - public void setS75god(String s75god) { - this.s75god = s75god; + public void setS75gdgtt(String s75gdgtt) { + this.s75gdgtt = s75gdgtt; } public String getJzxgn() { @@ -1059,8 +1059,8 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setZyqbd(zyqbdjc); antExChuModel.setNtjc(ntjc); antExChuModel.setCjsc(cjsc); - antExChuModel.setText(text); - antExChuModel.setS75god(s75god); + antExChuModel.setTextpjbc(textpjbc); + antExChuModel.setS75gdgtt(s75gdgtt); antExChuModel.setJzxgn(jzxgn); antExChuModel.setBarCode(barCode); antExChuModel.setId(id); -- 1.8.3.1