jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b0572e8bb4728095320080d84565bb0b2020e7d4

Authored by jiangjiazhi
1 parent 77350b49de
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

增加设置parentid

Showing 3 changed files with 26 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java View file @ b0572e8
... ... @@ -47,6 +47,8 @@
47 47 private String transferredHospital;
48 48 //转出医院id
49 49 private String outHospitalId;
  50 + //创建医院id
  51 + private String hospitalId;
50 52 //体验会员 0非会员 1会员
51 53 private Integer expVip;
52 54 //转入科室
... ... @@ -71,6 +73,14 @@
71 73 private Integer status;
72 74 //转诊类型 1 儿童 2 孕妇
73 75 private Integer type;
  76 +
  77 + public String getHospitalId() {
  78 + return hospitalId;
  79 + }
  80 +
  81 + public void setHospitalId(String hospitalId) {
  82 + this.hospitalId = hospitalId;
  83 + }
74 84  
75 85 public String getPid() {
76 86 return pid;
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java View file @ b0572e8
... ... @@ -50,11 +50,20 @@
50 50 //转入医院
51 51 private String transferredHospital;
52 52 private String outHospitalId;
  53 + private String hospitalId;
53 54 private String phone;
54 55 private Integer type;
55 56 //体验会员 0非会员 1会员
56 57 private Integer expVip;
57 58  
  59 + public String getHospitalId() {
  60 + return hospitalId;
  61 + }
  62 +
  63 + public void setHospitalId(String hospitalId) {
  64 + this.hospitalId = hospitalId;
  65 + }
  66 +
58 67 public String getHospitalName() {
59 68 return hospitalName;
60 69 }
... ... @@ -167,6 +176,9 @@
167 176  
168 177 if(null!=phone){
169 178 condition=condition.and("phone",phone, MongoOper.IS);
  179 + }
  180 + if(null!=hospitalId){
  181 + condition=condition.and("hospitalId",hospitalId, MongoOper.IS);
170 182 }
171 183  
172 184 //需要修改
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ b0572e8
... ... @@ -171,11 +171,13 @@
171 171 }
172 172  
173 173 //孕妇
  174 + referralApplyOrderModel.setHospitalId(hospital);
174 175 referralApplyOrderModel.setType(type);
175 176 referralApplyOrderModel.setOutHospitalId(hospital);
176 177 applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);
177 178  
178 179 referralApplyOrderModel.setId(null);
  180 + referralApplyOrderModel.setHospitalId(referralApplyOrderModel.getTransferredHospital());
179 181 referralApplyOrderModel.setOutHospitalId(referralApplyOrderModel.getTransferredHospital());
180 182 referralApplyOrderModel.setTransferredHospital(hospital);
181 183  
... ... @@ -327,6 +329,7 @@
327 329 referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo());
328 330 referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone());
329 331 String hospital = autoMatchFacade.getHospitalId(userId);
  332 + referralApplyOrderQuery.setHospitalId(hospital);
330 333 referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
331 334 //1 转入 0转出
332 335 if ("1".equals(applyOrderQueryRequest.getAction())) {
... ... @@ -410,6 +413,7 @@
410 413 referralApplyOrderQuery.setType(applyOrderQueryRequest.getType());
411 414  
412 415 String hospital = autoMatchFacade.getHospitalId(userId);
  416 + referralApplyOrderQuery.setHospitalId(hospital);
413 417 referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
414 418 //1 转入 0转出
415 419 if ("1".equals(applyOrderQueryRequest.getAction())) {