jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d73a92c0ac8865131eb71539bb830a103792de05

Authored by jiangjiazhi
2 parents 6bd4ed4e33 32385af294
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java View file @ d73a92c
... ... @@ -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-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ d73a92c
... ... @@ -166,6 +166,17 @@
166 166 //传染病史
167 167 private String infectDiseases;
168 168  
  169 + //浮肿
  170 + private String edema;
  171 +
  172 + public String getEdema() {
  173 + return edema;
  174 + }
  175 +
  176 + public void setEdema(String edema) {
  177 + this.edema = edema;
  178 + }
  179 +
169 180 public String getInfectDiseases() {
170 181 return infectDiseases;
171 182 }
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ d73a92c
... ... @@ -1449,9 +1449,9 @@
1449 1449  
1450 1450 if (StringUtils.isNotEmpty(oRiskFactor)) {
1451 1451 if (null != c1) {
1452   - c1 = c1.and("oRiskFactor").exists(false);
  1452 + c1 = c1.and("oRiskFactor").exists(true);
1453 1453 } else {
1454   - c1 = Criteria.where("oRiskFactor").exists(false);
  1454 + c1 = Criteria.where("oRiskFactor").exists(true);
1455 1455 }
1456 1456 }
1457 1457  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ d73a92c
... ... @@ -361,6 +361,16 @@
361 361 }
362 362 }
363 363  
  364 +
  365 + //产检日期
  366 + if (StringUtils.isNotEmpty(statisticsQueryRequest.getCheckDate())) {
  367 + String checkDate = statisticsQueryRequest.getCheckDate();
  368 + String[] dates = checkDate.split(" - ");
  369 +
  370 + antExRecordQuery.setCheckTimeStart(DateUtil.parseYMD(dates[0]));
  371 + antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1]));
  372 + }
  373 +
364 374 //预产期查询
365 375 if (org.apache.commons.lang.StringUtils.isNotEmpty(statisticsQueryRequest.getDueDate())) {
366 376 String nextDateStr = statisticsQueryRequest.getDueDate();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ d73a92c
... ... @@ -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());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ d73a92c
... ... @@ -1118,6 +1118,15 @@
1118 1118 /* 基本信息 */
1119 1119 //孕妇基本信息
1120 1120 map.put("id", data.getId());
  1121 + String edema = "";
  1122 + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) {
  1123 + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
  1124 + if (data.getEdema().equals(fuZhongEnums.getId())) {
  1125 + edema = fuZhongEnums.getName();
  1126 + }
  1127 + }
  1128 + }
  1129 + map.put("edema", edema);
1121 1130  
1122 1131 map.put("birthDefectTodo", data.getBirthDefectTodo());
1123 1132 map.put("diagnosisOther", data.getDiagnosisOther());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ d73a92c
... ... @@ -243,6 +243,17 @@
243 243 //甲状腺过氧化物酶抗体
244 244 private String jzxgyhwmkt;
245 245  
  246 + //浮肿
  247 + private String edema;
  248 +
  249 + public String getEdema() {
  250 + return edema;
  251 + }
  252 +
  253 + public void setEdema(String edema) {
  254 + this.edema = edema;
  255 + }
  256 +
246 257 public String getCjzxs() {
247 258 return cjzxs;
248 259 }
... ... @@ -1315,6 +1326,7 @@
1315 1326 antExChuModel.setCjzxs(cjzxs);
1316 1327 antExChuModel.setYljzxs(yljzxs);
1317 1328 antExChuModel.setJzxgyhwmkt(jzxgyhwmkt);
  1329 + antExChuModel.setEdema(edema);
1318 1330  
1319 1331 return antExChuModel;
1320 1332 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CjStatisticsQueryRequest.java View file @ d73a92c
... ... @@ -19,6 +19,17 @@
19 19 //医生id
20 20 private String dId;
21 21  
  22 + //检查日期
  23 + private String checkDate;
  24 +
  25 + public String getCheckDate() {
  26 + return checkDate;
  27 + }
  28 +
  29 + public void setCheckDate(String checkDate) {
  30 + this.checkDate = checkDate;
  31 + }
  32 +
22 33 public String getdId() {
23 34 return dId;
24 35 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ d73a92c
... ... @@ -286,6 +286,17 @@
286 286 //甲状腺过氧化物酶抗体
287 287 private String jzxgyhwmkt;
288 288  
  289 + //浮肿
  290 + private String edema;
  291 +
  292 + public String getEdema() {
  293 + return edema;
  294 + }
  295 +
  296 + public void setEdema(String edema) {
  297 + this.edema = edema;
  298 + }
  299 +
289 300 public String getCjzxs() {
290 301 return cjzxs;
291 302 }
... ... @@ -1345,6 +1356,7 @@
1345 1356 setCjzxs(antExChuModel.getCjzxs());
1346 1357 setYljzxs(antExChuModel.getYljzxs());
1347 1358 setJzxgyhwmkt(antExChuModel.getJzxgyhwmkt());
  1359 + setEdema(antExChuModel.getEdema());
1348 1360  
1349 1361 }
1350 1362 return this;