Commit fe5e748b402049067bdf734997a9d5c922362061
1 parent
6a18cf2d2b
Exists in
master
and in
6 other branches
产后随访
Showing 3 changed files with 29 additions and 1 deletions
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
View file @
fe5e748
| ... | ... | @@ -46,6 +46,11 @@ |
| 46 | 46 | private Integer contactReason; |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | + * 访视状态(1-待访视、2-已访视) | |
| 50 | + */ | |
| 51 | + private Integer visitStatus; | |
| 52 | + | |
| 53 | + /** | |
| 49 | 54 | * 访视结果(1-成功、2-失败) |
| 50 | 55 | */ |
| 51 | 56 | private Integer visitResult; |
| ... | ... | @@ -59,6 +64,14 @@ |
| 59 | 64 | */ |
| 60 | 65 | private String matFollowId; |
| 61 | 66 | |
| 67 | + public Integer getVisitStatus() { | |
| 68 | + return visitStatus; | |
| 69 | + } | |
| 70 | + | |
| 71 | + public void setVisitStatus(Integer visitStatus) { | |
| 72 | + this.visitStatus = visitStatus; | |
| 73 | + } | |
| 74 | + | |
| 62 | 75 | public Integer getContactResult() { |
| 63 | 76 | return contactResult; |
| 64 | 77 | } |
| ... | ... | @@ -216,6 +229,9 @@ |
| 216 | 229 | } |
| 217 | 230 | if (null != contactReason) { |
| 218 | 231 | condition = condition.and("contactReason", contactReason, MongoOper.IS); |
| 232 | + } | |
| 233 | + if (null != visitStatus) { | |
| 234 | + condition = condition.and("visitStatus", visitStatus, MongoOper.IS); | |
| 219 | 235 | } |
| 220 | 236 | if (null != visitResult) { |
| 221 | 237 | condition = condition.and("visitResult", visitResult, MongoOper.IS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
fe5e748
| ... | ... | @@ -1223,6 +1223,7 @@ |
| 1223 | 1223 | |
| 1224 | 1224 | matDeliverQuery.setVisitResult(matdeliverFollowRequest.getVisitResult()); |
| 1225 | 1225 | matDeliverQuery.setVisitAffirm(matdeliverFollowRequest.getVisitAffirm()); |
| 1226 | + matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus()); | |
| 1226 | 1227 | matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit()); |
| 1227 | 1228 | matDeliverQuery.setPage(matdeliverFollowRequest.getPage()); |
| 1228 | 1229 | matDeliverQuery.setNeed("need"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java
View file @
fe5e748
| ... | ... | @@ -51,8 +51,11 @@ |
| 51 | 51 | * 预约失败理由(1-无人接听电话、2-拒绝访视、3-其他) |
| 52 | 52 | */ |
| 53 | 53 | private Integer contactReason; |
| 54 | - | |
| 55 | 54 | /** |
| 55 | + * 访视状态(1-待访视、2-已访视) | |
| 56 | + */ | |
| 57 | + private Integer visitStatus; | |
| 58 | + /** | |
| 56 | 59 | * 访视结果(1-成功、2-失败) |
| 57 | 60 | */ |
| 58 | 61 | private Integer visitResult; |
| ... | ... | @@ -60,6 +63,14 @@ |
| 60 | 63 | * 产妇随访确认(1-待确认、2-已确认) |
| 61 | 64 | */ |
| 62 | 65 | private Integer visitAffirm; |
| 66 | + | |
| 67 | + public Integer getVisitStatus() { | |
| 68 | + return visitStatus; | |
| 69 | + } | |
| 70 | + | |
| 71 | + public void setVisitStatus(Integer visitStatus) { | |
| 72 | + this.visitStatus = visitStatus; | |
| 73 | + } | |
| 63 | 74 | |
| 64 | 75 | public Integer getOperatorId() { |
| 65 | 76 | return operatorId; |