From 1820a42b1980073ab5a8e0d1218183c9efd62fa2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 21 Jun 2016 11:00:33 +0800 Subject: [PATCH] add conde --- .../main/java/com/lyms/platform/pojo/Patients.java | 8 ++-- .../web/controller/BabyBookbuildingController.java | 17 ++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 41 +++++++++++++++---- .../operate/web/facade/BookbuildingFacade.java | 4 +- .../web/request/YunBookbuildingAddRequest.java | 8 ++-- .../operate/web/result/BabyInfoResult.java | 47 ++++++++++++++++++++++ .../operate/web/result/PregnantInfoResult.java | 8 ++-- 7 files changed, 111 insertions(+), 22 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 0e59187..eb5e3c4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -102,7 +102,7 @@ public class Patients extends BaseModel { private Integer serviceStatus; //体验会员 false非会员 true会员 - private boolean isExpVip; + private boolean expVip; //会员截止时间 private Date vipEndTime; @@ -117,11 +117,11 @@ public class Patients extends BaseModel { } public boolean isExpVip() { - return isExpVip; + return expVip; } - public void setIsExpVip(boolean isExpVip) { - this.isExpVip = isExpVip; + public void setExpVip(boolean expVip) { + this.expVip = expVip; } public Date getVipEndTime() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index 3e326ca..f5883fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -99,6 +99,23 @@ public class BabyBookbuildingController extends BaseController{ /** + * 查询儿童建档记录就诊卡号，母亲身份证 + * @param idCard + * @param vcCardNo + * @return + */ + @RequestMapping(value = "/queryBabyBuildRecord", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse queryBabyBuildRecord(@RequestParam("idCard")String idCard,@RequestParam("vcCardNo")String vcCardNo){ + BookbuildingQueryRequest param = new BookbuildingQueryRequest(); + param.setIdCard(idCard); + param.setVcCardNo(vcCardNo); + return babyBookbuildingFacade.queryBabyBuildRecord(param); + } + + + + /** * 查询儿童建档页面基础数据 * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 4c13f4c..ba6eb07 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -16,10 +16,7 @@ import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; -import com.lyms.platform.operate.web.result.BabyBuildResult; -import com.lyms.platform.operate.web.result.BasicConfigResult; -import com.lyms.platform.operate.web.result.BookbuildingRecordResult; -import com.lyms.platform.operate.web.result.PregnantInfoResult; +import com.lyms.platform.operate.web.result.*; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; @@ -29,10 +26,7 @@ import com.lyms.platform.query.PatientsQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @@ -297,4 +291,35 @@ public class BabyBookbuildingFacade { return objectResponse; } + + public BaseObjectResponse queryBabyBuildRecord(BookbuildingQueryRequest param) { + + List results = new ArrayList<>(); + if (!StringUtils.isEmpty(param.getVcCardNo()) || !StringUtils.isEmpty(param.getIdCard())) + { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setMcertNo(param.getIdCard()); + babyQuery.setVcCardNo(param.getVcCardNo()); + babyQuery.setYn(YnEnums.YES.getId()); + + List models = babyBookbuildingService.queryBabyBuildById(babyQuery); + if (models != null && models.size() > 0) + { + for(BabyModel model : models) + { + + BabyInfoResult result = new BabyInfoResult(); + result.setId(model.getId()); + result.setName(model.getName()); + result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); + } + + } + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index f67932d..a164f77 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -236,7 +236,7 @@ public class BookbuildingFacade { patient.setServiceStatus(yunRequest.getServiceStatus()); patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime())); - patient.setIsExpVip(yunRequest.isExpVip()); + patient.setExpVip(yunRequest.isExpVip()); patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate())); @@ -319,7 +319,7 @@ public class BookbuildingFacade { result.setServiceStatus(p.getServiceStatus()); result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime())); - result.setIsExpVip(p.isExpVip()); + result.setExpVip(p.isExpVip()); //院内信息 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 72bda54..53e7eff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -117,7 +117,7 @@ public class YunBookbuildingAddRequest { private Integer serviceStatus; //体验会员 false非会员 true会员 - private boolean isExpVip; + private boolean expVip; //会员截止时间 private String vipEndTime; @@ -131,11 +131,11 @@ public class YunBookbuildingAddRequest { } public boolean isExpVip() { - return isExpVip; + return expVip; } - public void setIsExpVip(boolean isExpVip) { - this.isExpVip = isExpVip; + public void setExpVip(boolean expVip) { + this.expVip = expVip; } public String getVipEndTime() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java new file mode 100644 index 0000000..2277b44 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java @@ -0,0 +1,47 @@ +package com.lyms.platform.operate.web.result; + +import java.util.Map; + +/** + * Created by Administrator on 2016/6/21. + */ +public class BabyInfoResult { + + private String id; + private String name; + private String monthAge; + + private Map buildRecords; + + public Map getBuildRecords() { + return buildRecords; + } + + public void setBuildRecords(Map buildRecords) { + this.buildRecords = buildRecords; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getMonthAge() { + return monthAge; + } + + public void setMonthAge(String monthAge) { + this.monthAge = monthAge; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 8840009..5dd1fc7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -113,7 +113,7 @@ public class PregnantInfoResult { private Integer serviceStatus; //体验会员 false非会员 true会员 - private boolean isExpVip; + private boolean expVip; //会员截止时间 private String vipEndTime; @@ -127,11 +127,11 @@ public class PregnantInfoResult { } public boolean isExpVip() { - return isExpVip; + return expVip; } - public void setIsExpVip(boolean isExpVip) { - this.isExpVip = isExpVip; + public void setExpVip(boolean expVip) { + this.expVip = expVip; } public String getVipEndTime() { -- 1.8.3.1