jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f8749ddcf7d57f72aae3bfb7710ce8542b2f65f6

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

1

Showing 4 changed files with 40 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java View file @ f8749dd
... ... @@ -55,6 +55,16 @@
55 55 private Date created;
56 56 //申请单状态 0 已接收 1 已转出 2 建议转诊
57 57 private Integer status;
  58 + //转诊类型 1 儿童 2 孕妇
  59 + private Integer type;
  60 +
  61 + public Integer getType() {
  62 + return type;
  63 + }
  64 +
  65 + public void setType(Integer type) {
  66 + this.type = type;
  67 + }
58 68  
59 69 public String getOutHospitalId() {
60 70 return outHospitalId;
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java View file @ f8749dd
... ... @@ -38,7 +38,16 @@
38 38 private String transferredHospital;
39 39 private String outHospitalId;
40 40 private String phone;
  41 + private Integer type;
41 42  
  43 + public Integer getType() {
  44 + return type;
  45 + }
  46 +
  47 + public void setType(Integer type) {
  48 + this.type = type;
  49 + }
  50 +
42 51 public String getPhone() {
43 52 return phone;
44 53 }
... ... @@ -101,6 +110,9 @@
101 110 }
102 111 if(null!=cardNo){
103 112 condition=condition.and("cardNo",cardNo, MongoOper.IS);
  113 + }
  114 + if(null!=type){
  115 + condition=condition.and("type",type, MongoOper.IS);
104 116 }
105 117 return condition.toMongoQuery();
106 118 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ f8749dd
... ... @@ -62,7 +62,8 @@
62 62 referralApplyOrderModel.setDueDate(patients.getDueDate());
63 63 referralApplyOrderModel.setName(patients.getUsername());
64 64 }
65   -
  65 + //孕妇
  66 + referralApplyOrderModel.setType(2);
66 67 List<Integer> areaId = autoMatchFacade.matchOrgId(userId);
67 68 referralApplyOrderModel.setOutHospitalId(areaId.get(0) + "");
68 69 applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);
... ... @@ -127,6 +128,7 @@
127 128 referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone());
128 129 referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
129 130 referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
  131 + referralApplyOrderQuery.setType(applyOrderQueryRequest.getType());
130 132 //1 转入 0转出
131 133 if ("1".equals(applyOrderQueryRequest.getType())) {
132 134 List data = autoMatchFacade.matchOrgId(userId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java View file @ f8749dd
... ... @@ -39,7 +39,11 @@
39 39 /**
40 40 * 1 转入 0 转出
41 41 */
42   - private String type;
  42 + private String action;
  43 + /**
  44 + * 1 儿童 2 孕妇
  45 + */
  46 + private Integer type;
43 47  
44 48 public String getPhone() {
45 49 return phone;
46 50  
... ... @@ -57,11 +61,19 @@
57 61 this.transferredHospital = transferredHospital;
58 62 }
59 63  
60   - public String getType() {
  64 + public String getAction() {
  65 + return action;
  66 + }
  67 +
  68 + public void setAction(String action) {
  69 + this.action = action;
  70 + }
  71 +
  72 + public Integer getType() {
61 73 return type;
62 74 }
63 75  
64   - public void setType(String type) {
  76 + public void setType(Integer type) {
65 77 this.type = type;
66 78 }
67 79