From 2b4e41f5889ecb5ae97100fba147ebcd6a06e065 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 22 Jun 2018 16:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/SieveResultModel.java | 27 ++++++++++--------- .../platform/operate/web/facade/SieveFacade.java | 9 ++++--- .../operate/web/request/SieveAddRequest.java | 31 +++++++++++----------- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java index 93863fe..08f48cb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java @@ -43,14 +43,14 @@ public class SieveResultModel{ private Map sjgjxValue;// 神经管畸形 NTD //hCg - private String hCg; + private String hcg; //hafp private String hafp; //hCgMom - private String hCgMom; + private String hcgMom; //hafpMom private String hafpMom; @@ -109,13 +109,6 @@ public class SieveResultModel{ this.sjgjxValue = sjgjxValue; } - public String gethCg() { - return hCg; - } - - public void sethCg(String hCg) { - this.hCg = hCg; - } public String getHafp() { return hafp; @@ -125,12 +118,20 @@ public class SieveResultModel{ this.hafp = hafp; } - public String gethCgMom() { - return hCgMom; + public String getHcg() { + return hcg; + } + + public void setHcg(String hcg) { + this.hcg = hcg; + } + + public String getHcgMom() { + return hcgMom; } - public void sethCgMom(String hCgMom) { - this.hCgMom = hCgMom; + public void setHcgMom(String hcgMom) { + this.hcgMom = hcgMom; } public String getHafpMom() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index fd0503f..592d1f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -660,8 +660,8 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(list)) { SieveResultModel model = list.get(0); - sieveResultEditInfo.put("hcg",model.gethCg() != null ? model.gethCg() : ""); - sieveResultEditInfo.put("hcgMom",model.gethCgMom() != null ? model.gethCgMom() : ""); + sieveResultEditInfo.put("hcg",model.getHcg() != null ? model.getHcg() : ""); + sieveResultEditInfo.put("hcgMom",model.getHcgMom() != null ? model.getHcgMom() : ""); sieveResultEditInfo.put("hafp",model.getHafp() != null ? model.getHafp() : ""); sieveResultEditInfo.put("hafpMom",model.getHafpMom() != null ? model.getHafpMom() : ""); sieveResultEditInfo.put("examineId", model.getExamineId()); @@ -678,6 +678,7 @@ public class SieveFacade { sieveResultEditInfo.put("sbstValue",model.getSbstValue()); sieveResultEditInfo.put("stzhz13Value",model.getStzhz13Value()); sieveResultEditInfo.put("sjgjxValue",model.getSjgjxValue()); + sieveResultEditInfo.put("sjgjxValue",model.getPublishName()); } map.put("sieveResultEditInfo",sieveResultEditInfo); } @@ -768,8 +769,8 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(list)) { SieveResultModel sieveResultModel = list.get(0); - sieveResultInfo.put("hcg",sieveResultModel.gethCg() != null ? sieveResultModel.gethCg()+"ng/ml" : ""); - sieveResultInfo.put("hcgMom",sieveResultModel.gethCgMom() != null ? sieveResultModel.gethCgMom() : ""); + sieveResultInfo.put("hcg",sieveResultModel.getHcg() != null ? sieveResultModel.getHcg()+"ng/ml" : ""); + sieveResultInfo.put("hcgMom",sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : ""); sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : ""); sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : ""); sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java index 825e20e..182718d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java @@ -39,13 +39,13 @@ public class SieveAddRequest implements IBasicRequestConvert { private Map sjgjxValue;// 神经管畸形 NTD //hCg - private String hCg; + private String hcg; //hafp private String hafp; //hCgMom - private String hCgMom; + private String hcgMom; //hafpMom private String hafpMom; @@ -104,12 +104,20 @@ public class SieveAddRequest implements IBasicRequestConvert { this.sjgjxValue = sjgjxValue; } - public String gethCg() { - return hCg; + public String getHcg() { + return hcg; } - public void sethCg(String hCg) { - this.hCg = hCg; + public void setHcg(String hcg) { + this.hcg = hcg; + } + + public String getHcgMom() { + return hcgMom; + } + + public void setHcgMom(String hcgMom) { + this.hcgMom = hcgMom; } public String getHafp() { @@ -120,13 +128,6 @@ public class SieveAddRequest implements IBasicRequestConvert { this.hafp = hafp; } - public String gethCgMom() { - return hCgMom; - } - - public void sethCgMom(String hCgMom) { - this.hCgMom = hCgMom; - } public String getHafpMom() { return hafpMom; @@ -241,8 +242,8 @@ public class SieveAddRequest implements IBasicRequestConvert { sieveModel.setSbstValue(sbstValue); sieveModel.setStzhz13Value(stzhz13Value); sieveModel.setSjgjxValue(sjgjxValue); - sieveModel.sethCg(hCg); - sieveModel.sethCgMom(hCgMom); + sieveModel.setHcg(hcg); + sieveModel.setHcgMom(hcgMom); sieveModel.setHafp(hafp); sieveModel.setHafpMom(hafpMom); sieveModel.setExamineId(examineId); -- 1.8.3.1