Commit 54289bbc4cd86c3aa1b38b862493458e5b2ebf1e
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
View file @
54289bb
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | import com.lyms.platform.common.utils.DateUtil; |
| 5 | 5 | import com.lyms.platform.common.utils.StringUtils; |
| 6 | 6 | import com.lyms.platform.pojo.Patients; |
| 7 | +import org.codehaus.jackson.annotate.JsonIgnore; | |
| 7 | 8 | |
| 8 | 9 | import java.util.Date; |
| 9 | 10 | |
| 10 | 11 | |
| ... | ... | @@ -34,9 +35,19 @@ |
| 34 | 35 | |
| 35 | 36 | //联系方式 |
| 36 | 37 | private String phone; |
| 38 | + @JsonIgnore | |
| 39 | + private String realPhone; | |
| 37 | 40 | private String nextCheckTime; |
| 38 | 41 | private String pid; |
| 39 | 42 | |
| 43 | + public String getRealPhone() { | |
| 44 | + return realPhone; | |
| 45 | + } | |
| 46 | + | |
| 47 | + public void setRealPhone(String realPhone) { | |
| 48 | + this.realPhone = realPhone; | |
| 49 | + } | |
| 50 | + | |
| 40 | 51 | public int getcHTimes() { |
| 41 | 52 | return cHTimes; |
| 42 | 53 | } |
| ... | ... | @@ -158,6 +169,7 @@ |
| 158 | 169 | setId(destModel.getId()); |
| 159 | 170 | setAge(DateUtil.getAge(destModel.getBirth(),destModel.getFmDate())); |
| 160 | 171 | setName(destModel.getUsername()); |
| 172 | + setRealPhone(destModel.getPhone()); | |
| 161 | 173 | setPhone(StringUtils.encryPhone(destModel.getPhone())); |
| 162 | 174 | |
| 163 | 175 | if (null != destModel.getFmDate()) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
View file @
54289bb
| ... | ... | @@ -6,6 +6,7 @@ |
| 6 | 6 | import com.lyms.platform.common.utils.JsonUtil; |
| 7 | 7 | import com.lyms.platform.common.utils.StringUtils; |
| 8 | 8 | import com.lyms.platform.pojo.Patients; |
| 9 | +import org.codehaus.jackson.annotate.JsonIgnore; | |
| 9 | 10 | |
| 10 | 11 | import java.util.Date; |
| 11 | 12 | import java.util.List; |
| 12 | 13 | |
| ... | ... | @@ -42,12 +43,22 @@ |
| 42 | 43 | |
| 43 | 44 | //联系方式 |
| 44 | 45 | private String phone; |
| 46 | + @JsonIgnore | |
| 47 | + private String realPhone; | |
| 45 | 48 | //预约产检时间 |
| 46 | 49 | private String cTime; |
| 47 | 50 | //服务类型 |
| 48 | 51 | private String serviceType; |
| 49 | 52 | private String pid; |
| 50 | 53 | |
| 54 | + public String getRealPhone() { | |
| 55 | + return realPhone; | |
| 56 | + } | |
| 57 | + | |
| 58 | + public void setRealPhone(String realPhone) { | |
| 59 | + this.realPhone = realPhone; | |
| 60 | + } | |
| 61 | + | |
| 51 | 62 | public int getcHTimes() { |
| 52 | 63 | return cHTimes; |
| 53 | 64 | } |
| ... | ... | @@ -192,7 +203,7 @@ |
| 192 | 203 | int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date()); |
| 193 | 204 | this.dueWeek=StringUtils.dueWeek(days); |
| 194 | 205 | } |
| 195 | - | |
| 206 | + setRealPhone(destModel.getPhone()); | |
| 196 | 207 | // setrLevel(destModel.getRiskLevelId()); |
| 197 | 208 | if(null!=destModel.getNextCheckTime()) { |
| 198 | 209 | setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime())); |