shiyang / regional-platform

Download as
Browse Code »

Commit f4531d81db11ee9fb63db7e716afac616cc9ff2e

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

座机号 替换的问题

Showing 3 changed files with 39 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ f4531d8
... ... @@ -83,7 +83,16 @@
83 83 //本院最后一次产检时间
84 84 private Date lastCTimeStart;
85 85 private Date lastCTimeEnd;
  86 + private Integer postViewTimes;
86 87  
  88 + public Integer getPostViewTimes() {
  89 + return postViewTimes;
  90 + }
  91 +
  92 + public void setPostViewTimes(Integer postViewTimes) {
  93 + this.postViewTimes = postViewTimes;
  94 + }
  95 +
87 96 public Date getLastMensesNeEnd() {
88 97 return lastMensesNeEnd;
89 98 }
... ... @@ -670,6 +679,9 @@
670 679 if (-1 != type) {
671 680 condition = condition.and("type", type, MongoOper.IS);
672 681 }
  682 + if(null!=postViewTimes){
  683 + condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS);
  684 + }
673 685  
674 686 if (null != lastRhTimeStart) {
675 687 if (null != c1) {
... ... @@ -678,6 +690,7 @@
678 690 c1 = Criteria.where("lastRhTime").gte(lastRhTimeStart);
679 691 }
680 692 }
  693 +
681 694 if (null != lastRhTimeEnd) {
682 695 if (null != c1) {
683 696 c1 = c1.lte(lastRhTimeEnd);
... ... @@ -722,6 +735,21 @@
722 735 MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
723 736 MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE);
724 737 condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2});
  738 + }
  739 +
  740 + if(null != lastCTimeStart){
  741 + if (null != c1) {
  742 + c1 = c1.and("lastCTime").gte(lastCTimeStart);
  743 + } else {
  744 + c1 = Criteria.where("lastCTime").gte(lastCTimeStart);
  745 + }
  746 + }
  747 + if (null != lastCTimeEnd) {
  748 + if (c1 != null) {
  749 + c1 = c1.lte(lastCTimeEnd);
  750 + } else {
  751 + c1 = Criteria.where("lastCTime").lte(lastCTimeEnd);
  752 + }
725 753 }
726 754  
727 755 if (null != lastMensesStart) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ f4531d8
... ... @@ -212,6 +212,8 @@
212 212 patientsQuery.setrFactor(riskPatientsQueryRequest.getrFacotr());
213 213 Date currentDate = DateUtil.formatDate(new Date());
214 214  
  215 + patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes());
  216 +
215 217 //服务类型
216 218 if (null != riskPatientsQueryRequest.getServiceType() && ServiceTypeEnums.ALL_SERVICE.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceType())) {
217 219 patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ f4531d8
... ... @@ -69,10 +69,19 @@
69 69 private String lastCTime;
70 70 //预产期
71 71 private String dueDate;
  72 + //复查次数
  73 + private Integer postViewTimes;
72 74  
73 75 // 0 高危孕妇 1 全部孕妇 2全部产妇
74 76 private Integer queryType;
75 77  
  78 + public Integer getPostViewTimes() {
  79 + return postViewTimes;
  80 + }
  81 +
  82 + public void setPostViewTimes(Integer postViewTimes) {
  83 + this.postViewTimes = postViewTimes;
  84 + }
76 85  
77 86 public String getLastCTime() {
78 87 return lastCTime;