shiyang / regional-platform

Download as
Browse Code »

Commit 0faaaa12b5b63480ed59650029c6b67c33d2d394

Authored by jiangjiazhi
1 parent 511aed0640
Exists in master and in 1 other branch nobuildprocess

增加字段

Showing 4 changed files with 335 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java View file @ 0faaaa1
... ... @@ -12,6 +12,8 @@
12 12 */
13 13 public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNativeQuery {
14 14  
  15 + private String id;
  16 +
15 17 private String parentId;
16 18  
17 19 /**
18 20  
... ... @@ -72,11 +74,22 @@
72 74 this.transferredHospital = transferredHospital;
73 75 }
74 76  
  77 + public String getId() {
  78 + return id;
  79 + }
  80 +
  81 + public void setId(String id) {
  82 + this.id = id;
  83 + }
  84 +
75 85 @Override
76 86 public MongoQuery convertToQuery() {
77 87 MongoCondition condition = MongoCondition.newInstance();
78 88 if(null!=parentId){
79 89 condition=condition.and("parentId",parentId, MongoOper.IS);
  90 + }
  91 + if(null!=id){
  92 + condition=condition.and("id",id, MongoOper.IS);
80 93 }
81 94 if(null!=name){
82 95 condition=condition.and("name",name, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 0faaaa1
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.biz.service.ApplyOrderService;
4 4 import com.lyms.platform.biz.service.PatientsService;
5 5 import com.lyms.platform.common.constants.ErrorCodeConstants;
  6 +import com.lyms.platform.common.enums.YnEnums;
6 7 import com.lyms.platform.common.result.BaseListResponse;
7 8 import com.lyms.platform.common.result.BaseObjectResponse;
8 9 import com.lyms.platform.common.result.BaseResponse;
... ... @@ -11,6 +12,8 @@
11 12 import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
12 13 import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest;
13 14 import com.lyms.platform.operate.web.result.ApplyOrderOutResult;
  15 +import com.lyms.platform.operate.web.result.ReferralApplyOrderResult;
  16 +import com.lyms.platform.operate.web.result.SieveApplyOrderResult;
14 17 import com.lyms.platform.pojo.Patients;
15 18 import com.lyms.platform.pojo.ReferralApplyOrderModel;
16 19 import com.lyms.platform.pojo.SieveApplyOrderModel;
17 20  
18 21  
... ... @@ -89,12 +92,15 @@
89 92 * @param id
90 93 * @return
91 94 */
92   - public BaseListResponse queryReferralApplyOrder(String id) {
  95 + public BaseObjectResponse queryReferralApplyOrder(String id) {
93 96 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
94   - referralApplyOrderQuery.setParentId(id);
  97 + referralApplyOrderQuery.setId(id);
95 98 List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
96   -
97   - return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  99 + ReferralApplyOrderResult referralApplyOrderResult=new ReferralApplyOrderResult();
  100 + if(CollectionUtils.isNotEmpty(list)){
  101 + referralApplyOrderResult.convertToResult(list.get(0));
  102 + }
  103 + return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
98 104 }
99 105  
100 106 /**
101 107  
102 108  
... ... @@ -103,10 +109,18 @@
103 109 * @param id
104 110 * @return
105 111 */
106   - public BaseListResponse querySieveApplyOrder(String id) {
  112 + public BaseResponse querySieveApplyOrder(String id) {
107 113 SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
  114 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  115 + sieveApplyOrderQuery.setId(id);
108 116 List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
109   - return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  117 + SieveApplyOrderResult sieveApplyOrderResult = new SieveApplyOrderResult();
  118 + SieveApplyOrderModel sieveApplyOrderModel = null;
  119 + if (CollectionUtils.isNotEmpty(list)) {
  120 + sieveApplyOrderModel = list.get(0);
  121 + sieveApplyOrderResult.convertToResult(sieveApplyOrderModel);
  122 + }
  123 + return new BaseObjectResponse().setData(sieveApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
110 124 }
111 125  
112 126 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java View file @ 0faaaa1
  1 +package com.lyms.platform.operate.web.result;
  2 +
  3 +import com.lyms.platform.common.base.IBasicResultConvert;
  4 +import com.lyms.platform.common.utils.DateUtil;
  5 +import com.lyms.platform.pojo.ReferralApplyOrderModel;
  6 +import com.lyms.platform.pojo.SieveApplyOrderModel;
  7 +
  8 +import java.util.Date;
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * Created by Administrator on 2016/7/7 0007.
  13 + */
  14 +public class ReferralApplyOrderResult implements IBasicResultConvert<ReferralApplyOrderResult, ReferralApplyOrderModel> {
  15 +
  16 + private String id;
  17 + //患者id
  18 + private String parentId;
  19 + //患者名字
  20 + private String name;
  21 + //患者年龄
  22 + private Integer age;
  23 + //孕周
  24 + private String dueWeek;
  25 + //身份证号
  26 + private String cardNo;
  27 + //预产期
  28 + private String dueDate;
  29 + //高危分级
  30 + private String rLevel;
  31 + //高危风险因素
  32 + private List rRisk;
  33 + //高危评分
  34 + private Integer score;
  35 + //转入医院
  36 + private String transferredHospital;
  37 + //转出医院id
  38 + private String outHospitalId;
  39 +
  40 + //转入科室
  41 + private String transferredDepartment;
  42 + //病情描述
  43 + private String diseaseDesc;
  44 + //转院必要性
  45 + private String transferredDisease;
  46 + // 潜在风险
  47 + private String potentialRisk;
  48 + //转院方式
  49 + private String transferMode;
  50 + //申请医生
  51 + private String applyDoctor;
  52 +
  53 + public Integer getAge() {
  54 + return age;
  55 + }
  56 +
  57 + public void setAge(Integer age) {
  58 + this.age = age;
  59 + }
  60 +
  61 + public String getApplyDoctor() {
  62 + return applyDoctor;
  63 + }
  64 +
  65 + public void setApplyDoctor(String applyDoctor) {
  66 + this.applyDoctor = applyDoctor;
  67 + }
  68 +
  69 + public String getCardNo() {
  70 + return cardNo;
  71 + }
  72 +
  73 + public void setCardNo(String cardNo) {
  74 + this.cardNo = cardNo;
  75 + }
  76 +
  77 + public String getDiseaseDesc() {
  78 + return diseaseDesc;
  79 + }
  80 +
  81 + public void setDiseaseDesc(String diseaseDesc) {
  82 + this.diseaseDesc = diseaseDesc;
  83 + }
  84 +
  85 + public String getDueDate() {
  86 + return dueDate;
  87 + }
  88 +
  89 + public void setDueDate(String dueDate) {
  90 + this.dueDate = dueDate;
  91 + }
  92 +
  93 + public String getDueWeek() {
  94 + return dueWeek;
  95 + }
  96 +
  97 + public void setDueWeek(String dueWeek) {
  98 + this.dueWeek = dueWeek;
  99 + }
  100 +
  101 + public String getId() {
  102 + return id;
  103 + }
  104 +
  105 + public void setId(String id) {
  106 + this.id = id;
  107 + }
  108 +
  109 + public String getName() {
  110 + return name;
  111 + }
  112 +
  113 + public void setName(String name) {
  114 + this.name = name;
  115 + }
  116 +
  117 + public String getOutHospitalId() {
  118 + return outHospitalId;
  119 + }
  120 +
  121 + public void setOutHospitalId(String outHospitalId) {
  122 + this.outHospitalId = outHospitalId;
  123 + }
  124 +
  125 + public String getParentId() {
  126 + return parentId;
  127 + }
  128 +
  129 + public void setParentId(String parentId) {
  130 + this.parentId = parentId;
  131 + }
  132 +
  133 + public String getPotentialRisk() {
  134 + return potentialRisk;
  135 + }
  136 +
  137 + public void setPotentialRisk(String potentialRisk) {
  138 + this.potentialRisk = potentialRisk;
  139 + }
  140 +
  141 + public String getrLevel() {
  142 + return rLevel;
  143 + }
  144 +
  145 + public void setrLevel(String rLevel) {
  146 + this.rLevel = rLevel;
  147 + }
  148 +
  149 + public List getrRisk() {
  150 + return rRisk;
  151 + }
  152 +
  153 + public void setrRisk(List rRisk) {
  154 + this.rRisk = rRisk;
  155 + }
  156 +
  157 + public Integer getScore() {
  158 + return score;
  159 + }
  160 +
  161 + public void setScore(Integer score) {
  162 + this.score = score;
  163 + }
  164 +
  165 + public String getTransferMode() {
  166 + return transferMode;
  167 + }
  168 +
  169 + public void setTransferMode(String transferMode) {
  170 + this.transferMode = transferMode;
  171 + }
  172 +
  173 + public String getTransferredDepartment() {
  174 + return transferredDepartment;
  175 + }
  176 +
  177 + public void setTransferredDepartment(String transferredDepartment) {
  178 + this.transferredDepartment = transferredDepartment;
  179 + }
  180 +
  181 + public String getTransferredDisease() {
  182 + return transferredDisease;
  183 + }
  184 +
  185 + public void setTransferredDisease(String transferredDisease) {
  186 + this.transferredDisease = transferredDisease;
  187 + }
  188 +
  189 + public String getTransferredHospital() {
  190 + return transferredHospital;
  191 + }
  192 +
  193 + public void setTransferredHospital(String transferredHospital) {
  194 + this.transferredHospital = transferredHospital;
  195 + }
  196 +
  197 + @Override
  198 + public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel) {
  199 + setId(destModel.getId());
  200 + setParentId(destModel.getParentId());
  201 + setName(destModel.getName());
  202 + setAge(destModel.getAge());
  203 + setDueWeek(destModel.getDueWeek());
  204 + setCardNo(destModel.getCardNo());
  205 + setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
  206 + setrLevel(destModel.getrLevel());
  207 + setScore(destModel.getScore());
  208 + setDiseaseDesc(destModel.getDiseaseDesc());
  209 + setTransferredDisease(destModel.getTransferredDisease());
  210 + setPotentialRisk(destModel.getPotentialRisk());
  211 + setTransferMode(destModel.getTransferMode());
  212 + setApplyDoctor(destModel.getApplyDoctor());
  213 + return this;
  214 + }
  215 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java View file @ 0faaaa1
  1 +package com.lyms.platform.operate.web.result;
  2 +
  3 +import com.lyms.platform.common.base.IBasicResultConvert;
  4 +import com.lyms.platform.common.utils.JsonUtil;
  5 +import com.lyms.platform.pojo.Patients;
  6 +import com.lyms.platform.pojo.SieveApplyOrderModel;
  7 +import org.apache.commons.lang.StringUtils;
  8 +
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * Created by Administrator on 2016/7/7 0007.
  13 + */
  14 +public class SieveApplyOrderResult implements IBasicResultConvert<SieveApplyOrderResult, SieveApplyOrderModel> {
  15 + private String id;
  16 + //患者id
  17 + private String parentId;
  18 + //产筛项
  19 + private List checkItem;
  20 + //医生指导
  21 + private String guide;
  22 + // 预约日期
  23 + private String checkDate;
  24 + //申请医生
  25 + private String applyDoctor;
  26 +
  27 + public String getApplyDoctor() {
  28 + return applyDoctor;
  29 + }
  30 +
  31 + public void setApplyDoctor(String applyDoctor) {
  32 + this.applyDoctor = applyDoctor;
  33 + }
  34 +
  35 + public String getCheckDate() {
  36 + return checkDate;
  37 + }
  38 +
  39 + public void setCheckDate(String checkDate) {
  40 + this.checkDate = checkDate;
  41 + }
  42 +
  43 + public List getCheckItem() {
  44 + return checkItem;
  45 + }
  46 +
  47 + public void setCheckItem(List checkItem) {
  48 + this.checkItem = checkItem;
  49 + }
  50 +
  51 + public String getGuide() {
  52 + return guide;
  53 + }
  54 +
  55 + public void setGuide(String guide) {
  56 + this.guide = guide;
  57 + }
  58 +
  59 + public String getId() {
  60 + return id;
  61 + }
  62 +
  63 + public void setId(String id) {
  64 + this.id = id;
  65 + }
  66 +
  67 + public String getParentId() {
  68 + return parentId;
  69 + }
  70 +
  71 + public void setParentId(String parentId) {
  72 + this.parentId = parentId;
  73 + }
  74 +
  75 + @Override
  76 + public SieveApplyOrderResult convertToResult(SieveApplyOrderModel destModel) {
  77 + setId(destModel.getId());
  78 + setParentId(destModel.getParentId());
  79 + setApplyDoctor(destModel.getApplyDoctor());
  80 + setCheckDate(destModel.getCheckDate());
  81 + setGuide(destModel.getGuide());
  82 + if(StringUtils.isNotEmpty(destModel.getCheckItem())){
  83 + setCheckItem(JsonUtil.toList(destModel.getCheckItem(),List.class));
  84 + }
  85 + return this;
  86 + }
  87 +}