shiyang / regional-platform

Download as
Browse Code »

Commit 187053e761bec8e898bc5ca53689328fddcb2ffd

Authored by liquanyu
2 parents 8894e38b97 c3ed464afd
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 187053e
1 1 package com.lyms.platform.query;
2 2  
3 3 import com.lyms.platform.common.base.IConvertToNativeQuery;
  4 +import com.lyms.platform.common.core.annotation.form.FormParam;
4 5 import com.lyms.platform.common.dao.BaseQuery;
5 6 import com.lyms.platform.common.dao.operator.MongoCondition;
6 7 import com.lyms.platform.common.dao.operator.MongoOper;
... ... @@ -29,22 +30,6 @@
29 30  
30 31 private Boolean isHighRisk;
31 32  
32   - public Boolean getIsHighRisk() {
33   - return isHighRisk;
34   - }
35   -
36   - public void setIsHighRisk(Boolean isHighRisk) {
37   - this.isHighRisk = isHighRisk;
38   - }
39   -
40   - public Boolean getIsNull() {
41   - return isNull;
42   - }
43   -
44   - public void setIsNull(Boolean isNull) {
45   - this.isNull = isNull;
46   - }
47   -
48 33 /**
49 34 * 产妇名称
50 35 */
51 36  
... ... @@ -61,8 +46,11 @@
61 46 private String areaId;
62 47 //社区id
63 48 private String areaIdOrRestId;
  49 + //服务状态
  50 + private Integer serviceStatus;
  51 + //体验会员 0非会员 1会员
  52 + private Integer expVip;
64 53  
65   -
66 54 /**
67 55 * 产妇手机号
68 56 */
... ... @@ -106,7 +94,6 @@
106 94 */
107 95 private String serviceType;
108 96  
109   - private String serviceStatus;
110 97  
111 98 /**
112 99 * 风险等级
113 100  
114 101  
... ... @@ -130,12 +117,35 @@
130 117 * 1:孕妇,2:儿童
131 118 */
132 119 private int type = -1;
  120 + public Boolean getIsHighRisk() {
  121 + return isHighRisk;
  122 + }
133 123  
134   - public String getServiceStatus() {
  124 + public void setIsHighRisk(Boolean isHighRisk) {
  125 + this.isHighRisk = isHighRisk;
  126 + }
  127 +
  128 + public Boolean getIsNull() {
  129 + return isNull;
  130 + }
  131 +
  132 + public void setIsNull(Boolean isNull) {
  133 + this.isNull = isNull;
  134 + }
  135 +
  136 + public Integer getExpVip() {
  137 + return expVip;
  138 + }
  139 +
  140 + public void setExpVip(Integer expVip) {
  141 + this.expVip = expVip;
  142 + }
  143 +
  144 + public Integer getServiceStatus() {
135 145 return serviceStatus;
136 146 }
137 147  
138   - public void setServiceStatus(String serviceStatus) {
  148 + public void setServiceStatus(Integer serviceStatus) {
139 149 this.serviceStatus = serviceStatus;
140 150 }
141 151  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 187053e
... ... @@ -205,6 +205,7 @@
205 205 patientsQuery.setLimit(riskPatientsQueryRequest.getLimit());
206 206 patientsQuery.setPage(riskPatientsQueryRequest.getPage());
207 207 patientsQuery.setIsHighRisk(isHighRisk);
  208 + patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus());
208 209 //查询符合条件的孕妇
209 210 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
210 211 List data = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ 187053e
... ... @@ -39,6 +39,36 @@
39 39 //检查时间
40 40 @FormParam
41 41 private String cTime;
  42 + //服务状态
  43 + @FormParam
  44 + private Integer serviceStatus;
  45 + //体验会员 0非会员 1会员
  46 + @FormParam
  47 + private Integer expVip;
  48 +
  49 + public Integer getExpVip() {
  50 + return expVip;
  51 + }
  52 +
  53 + public void setExpVip(Integer expVip) {
  54 + this.expVip = expVip;
  55 + }
  56 +
  57 + public void setAge(Integer age) {
  58 + this.age = age;
  59 + }
  60 +
  61 + public void sethScore(Integer hScore) {
  62 + this.hScore = hScore;
  63 + }
  64 +
  65 + public Integer getServiceStatus() {
  66 + return serviceStatus;
  67 + }
  68 +
  69 + public void setServiceStatus(Integer serviceStatus) {
  70 + this.serviceStatus = serviceStatus;
  71 + }
42 72  
43 73 public int getAge() {
44 74 return age;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ 187053e
... ... @@ -134,7 +134,7 @@
134 134 int day = (days%7);
135 135 this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
136 136 if(null!=patients.getLastMenses()){
137   - setLastMenses(DateUtil.getYmd(patients.getLastMenses()));
  137 + setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
138 138 }
139 139 List<AntData> dataList = new ArrayList<>();
140 140 if(null!=antExChuModel){