From 733b6ca05c8cae8ba53570e5819e1d4dddbaa36c Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 21 Mar 2018 14:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E4=BF=9D=E6=9C=88=E9=BE=84=E5=A5=97?= =?UTF-8?q?=E9=A4=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/BabyCheckModel.java | 9 +++++++++ .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 9 ++++++--- .../lyms/platform/operate/web/request/BabyCheckRequest.java | 10 ++++++++++ .../com/lyms/platform/operate/web/result/BabyCheckResult.java | 9 +++++++++ .../com/lyms/platform/operate/web/result/BabyPageResult.java | 1 + 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index 22c7e70..2adc507 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -378,7 +378,16 @@ public class BabyCheckModel extends BaseModel { //其他及系统现有的辅助检查项 private String qtfz; + // 纠正月龄||纠正胎龄 + private String correctAge; + public String getCorrectAge() { + return correctAge; + } + + public void setCorrectAge(String correctAge) { + this.correctAge = correctAge; + } public Integer getTcType() { return tcType; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 182529b..1cea818 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -7,9 +7,11 @@ import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BabyCheckRequest; -import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.result.BabyBasicResult; +import com.lyms.platform.operate.web.result.BabyCheckResult; +import com.lyms.platform.operate.web.result.BabyChooseResult; +import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; @@ -20,7 +22,6 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; @@ -159,6 +160,7 @@ public class BabyCheckFacade { BabyCheckModel model = new BabyCheckModel(); //新加字段 + model.setCorrectAge(request.getCorrectAge()); model.setTcType(request.getTcType()); model.setCnqk(request.getCnqk()); model.setMtcnNum(request.getMtcnNum()); @@ -1133,6 +1135,7 @@ public class BabyCheckFacade { model.setId(checkModel.getId()); //新加字段 + model.setCorrectAge(checkModel.getCorrectAge()); model.setTcType(checkModel.getTcType()); model.setCnqk(checkModel.getCnqk()); model.setMtcnNum(checkModel.getMtcnNum()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 9577087..3c12878 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -327,6 +327,8 @@ public class BabyCheckRequest { //是否高危儿童 0 非高危 1高危 private Integer highRisk; /******诊断指导****/ + // 纠正月龄||纠正胎龄 + private String correctAge; @FormParam @NotEmpty(message = "检查日期不能为空") @@ -338,6 +340,14 @@ public class BabyCheckRequest { //使用状态 private Integer couponType; + public String getCorrectAge() { + return correctAge; + } + + public void setCorrectAge(String correctAge) { + this.correctAge = correctAge; + } + public String getWlTong() { return wlTong; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 984ae63..e0f4b96 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -388,7 +388,16 @@ public class BabyCheckResult { //其他及系统现有的辅助检查项 private String qtfz; + // 纠正月龄||纠正胎龄 + private String correctAge; + public String getCorrectAge() { + return correctAge; + } + + public void setCorrectAge(String correctAge) { + this.correctAge = correctAge; + } public Integer getTcType() { return tcType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 6b67729..4f8c589 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -181,6 +181,7 @@ public class BabyPageResult implements IBasicResultConvert getPatientSerResults() { return patientSerResults; } -- 1.8.3.1