From c4926b19aa6aa609673233ed9c0cd81675acbe35 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 14 Jul 2016 16:27:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/pojo/ReferralApplyOrderModel.java | 41 +++++- .../web/controller/ApplyOrderController.java | 20 ++- .../operate/web/facade/ApplyOrderFacade.java | 35 ++++- .../web/request/BabyApplyOrderQueryRequest.java | 151 +++++++++++++++++++ .../operate/web/result/ApplyOrderOutResult.java | 12 +- .../operate/web/result/BabyApplyOrderResult.java | 161 +++++++++++++++++++++ 6 files changed, 414 insertions(+), 6 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index 90655f2..b640e4c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -18,12 +18,18 @@ public class ReferralApplyOrderModel { private String parentId; //患者名字 private String name; + private String mname; //患者年龄 private Integer age; - //孕周 -// private String dueWeek; + //联系方式 + private String phone; + //生日 + private Date birth; + //身份证号 private String cardNo; + //母亲身份证号 + private String mCardNo; //预产期 private Date dueDate; //高危分级 @@ -58,6 +64,30 @@ public class ReferralApplyOrderModel { //转诊类型 1 儿童 2 孕妇 private Integer type; + public String getMname() { + return mname; + } + + public String getPhone() { + return phone; + } + + public Date getBirth() { + return birth; + } + + public void setBirth(Date birth) { + this.birth = birth; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public void setMname(String mname) { + this.mname = mname; + } + public Integer getType() { return type; } @@ -98,6 +128,13 @@ public class ReferralApplyOrderModel { this.dueDate = dueDate; } + public String getmCardNo() { + return mCardNo; + } + + public void setmCardNo(String mCardNo) { + this.mCardNo = mCardNo; + } public String getName() { return name; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java index 87a5b09..2b01cbe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java @@ -4,12 +4,12 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.ApplyOrderFacade; import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest; import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest; +import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -48,7 +48,7 @@ public class ApplyOrderController extends BaseController { @TokenRequired public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(),2); + return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(), 2); } //增加转诊申请单 @@ -90,6 +90,22 @@ public class ApplyOrderController extends BaseController { return applyOrderFacade.queryApplyOrder(orderQueryRequest, loginState.getId()); } + + /** + * 高危转诊 + * + * @param orderQueryRequest + * @return + */ + @RequestMapping(method = RequestMethod.GET,value = "/applybabyorder") + @ResponseBody + @TokenRequired + public BaseResponse queryBabyApplyOrder(@Valid BabyApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return applyOrderFacade.queryBabyApplyOrder(orderQueryRequest, loginState.getId()); + } + + @RequestMapping(method = RequestMethod.GET,value = "/applyorderEnums") @ResponseBody public BaseResponse getEnums(){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 00a2174..684d9b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -15,6 +15,8 @@ import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest; import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest; import com.lyms.platform.operate.web.result.ApplyOrderOutResult; +import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest; +import com.lyms.platform.operate.web.result.BabyApplyOrderResult; import com.lyms.platform.operate.web.result.ReferralApplyOrderResult; import com.lyms.platform.operate.web.result.SieveApplyOrderResult; import com.lyms.platform.permission.model.Organization; @@ -143,7 +145,7 @@ public class ApplyOrderFacade { if(null!=zhuanc1){ zhuanRname =zhuanc1.getName(); } - referralApplyOrderResult.convertToResult(list.get(0), patients,zhuanCName,zhuanRname); + referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname); } return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -168,7 +170,38 @@ public class ApplyOrderFacade { } return new BaseObjectResponse().setData(sieveApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + /** + * 查询儿童的转诊申请 + * + */ + public BaseListResponse queryBabyApplyOrder(BabyApplyOrderQueryRequest applyOrderQueryRequest, Integer userId){ + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setType(2); + List babyApplyOrderResults=new ArrayList<>(); + + //1 转入 0转出 + if ("1".equals(applyOrderQueryRequest.getAction())) { + List data = autoMatchFacade.matchOrgId(userId); + if (CollectionUtils.isNotEmpty(data)) { + referralApplyOrderQuery.setTransferredHospital(data.get(0) + ""); + } + } else if ("0".equals(applyOrderQueryRequest.getAction())) { + List data = autoMatchFacade.matchOrgId(userId); + if (CollectionUtils.isNotEmpty(data)) { + referralApplyOrderQuery.setOutHospitalId(data.get(0) + ""); + } + } + List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if(CollectionUtils.isNotEmpty(orderModels)){ + for(ReferralApplyOrderModel applyOrderModel:orderModels){ + BabyApplyOrderResult babyApplyOrderResult=new BabyApplyOrderResult(); + babyApplyOrderResult.convert(applyOrderModel); + babyApplyOrderResults.add(babyApplyOrderResult); + } + } + return new BaseListResponse().setData(babyApplyOrderResults).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } /** * 高危转诊列表 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java new file mode 100644 index 0000000..47ae4ea --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java @@ -0,0 +1,151 @@ +package com.lyms.platform.operate.web.request; + +/** + * + * 儿童高危转诊查询 + * + * Created by Administrator on 2016/7/14 0014. + */ +public class BabyApplyOrderQueryRequest { + + //母亲身份证号 + private String mCardNo; + //儿童身份证号 + private String cardNo; + //儿童姓名 + private String name; + //联系方式 + private String phone; + //月龄开始 + private String ylStart; + //月龄结束 + private String ylEnd; + //高危id + private String highRisk; + //预约检查日期 + private String nextCheckTime; + //生日 + private String birth; + //服务类型 + private Integer serviceType; + //接受日期 + private String reviced; + //转出日期 + private String transferred; + //体验会员 + private String tyVip; + //0转入 1 转出 + private String action; + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getBirth() { + return birth; + } + + public void setBirth(String birth) { + this.birth = birth; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getHighRisk() { + return highRisk; + } + + public void setHighRisk(String highRisk) { + this.highRisk = highRisk; + } + + public String getmCardNo() { + return mCardNo; + } + + public void setmCardNo(String mCardNo) { + this.mCardNo = mCardNo; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNextCheckTime() { + return nextCheckTime; + } + + public void setNextCheckTime(String nextCheckTime) { + this.nextCheckTime = nextCheckTime; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getReviced() { + return reviced; + } + + public void setReviced(String reviced) { + this.reviced = reviced; + } + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + + public String getTransferred() { + return transferred; + } + + public void setTransferred(String transferred) { + this.transferred = transferred; + } + + public String getTyVip() { + return tyVip; + } + + public void setTyVip(String tyVip) { + this.tyVip = tyVip; + } + + public String getYlEnd() { + return ylEnd; + } + + public void setYlEnd(String ylEnd) { + this.ylEnd = ylEnd; + } + + public String getYlStart() { + return ylStart; + } + + public void setYlStart(String ylStart) { + this.ylStart = ylStart; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 599c124..3dbd41b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -41,11 +41,20 @@ public class ApplyOrderOutResult implements IBasicResultConvert + * Created by Administrator on 2016/7/14 0014. + */ +public class BabyApplyOrderResult { + private String id; + //名字 + private String name; + //高危转诊 + private String hRisk; + //性别 + private String sex; + //月龄 + private String yl; + //生日 + private String birth; + //母亲姓名 + private String mName; + + //转入医院 + private String transferredHospital; + + //转出时间 + private String created; + //转院必要性 + private String transferredDisease; + //潜在风险 + private String potentialRisk; + //申请医生 + private String applyDoctor; + //接收日期 + private String received; + private String phone; + + + public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel) { + setId(referralApplyOrderModel.getId()); + setName(referralApplyOrderModel.getName()); + setmName(referralApplyOrderModel.getMname()); + setSex("女"); + setPhone(referralApplyOrderModel.getPhone()); + return this; + } + + public String getApplyDoctor() { + return applyDoctor; + } + + public void setApplyDoctor(String applyDoctor) { + this.applyDoctor = applyDoctor; + } + + public String getBirth() { + return birth; + } + + public void setBirth(String birth) { + this.birth = birth; + } + + public String getCreated() { + return created; + } + + public void setCreated(String created) { + this.created = created; + } + + public String gethRisk() { + return hRisk; + } + + public void sethRisk(String hRisk) { + this.hRisk = hRisk; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getmName() { + return mName; + } + + public void setmName(String mName) { + this.mName = mName; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPotentialRisk() { + return potentialRisk; + } + + public void setPotentialRisk(String potentialRisk) { + this.potentialRisk = potentialRisk; + } + + public String getReceived() { + return received; + } + + public void setReceived(String received) { + this.received = received; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getTransferredDisease() { + return transferredDisease; + } + + public void setTransferredDisease(String transferredDisease) { + this.transferredDisease = transferredDisease; + } + + public String getTransferredHospital() { + return transferredHospital; + } + + public void setTransferredHospital(String transferredHospital) { + this.transferredHospital = transferredHospital; + } + + public String getYl() { + return yl; + } + + public void setYl(String yl) { + this.yl = yl; + } +} -- 1.8.3.1