Commit 7ed329dbeb435e504a57629327f6b6f30f392cc4
1 parent
750ea274f6
Exists in
master
and in
6 other branches
update code
Showing 2 changed files with 21 additions and 1 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java
View file @
7ed329d
| ... | ... | @@ -22,6 +22,7 @@ |
| 22 | 22 | import java.util.ArrayList; |
| 23 | 23 | import java.util.Date; |
| 24 | 24 | import java.util.List; |
| 25 | +import java.util.Map; | |
| 25 | 26 | |
| 26 | 27 | /** |
| 27 | 28 | * Created by Administrator on 2016/9/13 0013. |
| ... | ... | @@ -116,6 +117,15 @@ |
| 116 | 117 | } else if (action.startsWith("Mysql")) { |
| 117 | 118 | return syncMysqlData(action,id,className,json); |
| 118 | 119 | } else if ("POSTMSG".equals(action)) { |
| 120 | +// String result = HttpClientUtil.doPostSSL(CENTER_BASE_URL + "/biz-push-web/push", LymsEncodeUtil.aesDecrypt(json, mongo_crypto_key)); | |
| 121 | +// if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(result)) | |
| 122 | +// { | |
| 123 | +// Map<String,Integer> map = JsonUtil.str2Obj(result, Map.class); | |
| 124 | +// if ("0".equals(map.get("errorcode").toString())) | |
| 125 | +// { | |
| 126 | +// return true; | |
| 127 | +// } | |
| 128 | +// } | |
| 119 | 129 | String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", LymsEncodeUtil.aesDecrypt(json, mongo_crypto_key), CENTER_TOKEN); |
| 120 | 130 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(result)) |
| 121 | 131 | { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
7ed329d
| ... | ... | @@ -247,7 +247,17 @@ |
| 247 | 247 | patientsQuery.setLikeName(riskPatientsQueryRequest.getName()); |
| 248 | 248 | patientsQuery.sethScoreStart(riskPatientsQueryRequest.getStrtHScore()); |
| 249 | 249 | patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore()); |
| 250 | - patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(),String.class)); | |
| 250 | + | |
| 251 | + //高危统计中的自定义高危 | |
| 252 | + if ("otherRiskId".equals(riskPatientsQueryRequest.getrFacotr())) | |
| 253 | + { | |
| 254 | + patientsQuery.setoRiskFactor("true"); | |
| 255 | + } | |
| 256 | + else | |
| 257 | + { | |
| 258 | + patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(),String.class)); | |
| 259 | + } | |
| 260 | + | |
| 251 | 261 | Date currentDate = DateUtil.formatDate(new Date()); |
| 252 | 262 | |
| 253 | 263 | patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes()); |