Commit f9ca556785f549f3157e1049d7dea54109d7ca3e
1 parent
996ea85884
Exists in
master
and in
6 other branches
update code
Showing 2 changed files with 66 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
f9ca556
| ... | ... | @@ -4157,6 +4157,17 @@ |
| 4157 | 4157 | hRisk.add(risk.get("id")); |
| 4158 | 4158 | score+= StringUtils.isNotEmpty(risk.get("code")) ? Integer.parseInt(risk.get("code")) : 0; |
| 4159 | 4159 | } |
| 4160 | + | |
| 4161 | + if (StringUtils.isNotEmpty(fid)) | |
| 4162 | + { | |
| 4163 | + Query query = new Query(); | |
| 4164 | + query.addCriteria(Criteria.where("fid").is(fid)); | |
| 4165 | + AutoRiskRecord autoRisk = mongoTemplate.findOne(query, AutoRiskRecord.class); | |
| 4166 | + if (autoRisk != null) | |
| 4167 | + { | |
| 4168 | + return; | |
| 4169 | + } | |
| 4170 | + } | |
| 4160 | 4171 | AutoRiskRecord riskRecord = new AutoRiskRecord(); |
| 4161 | 4172 | riskRecord.setPatientId(patientId); |
| 4162 | 4173 | riskRecord.setFid(fid); |
| 4163 | 4174 | |
| ... | ... | @@ -5445,9 +5456,17 @@ |
| 5445 | 5456 | query.addCriteria(Criteria.where("created").gte(dayFirstSecond).lte(dayLastSecond)); |
| 5446 | 5457 | } |
| 5447 | 5458 | if (antExManagerQueryRequest.getStatus() != null) { |
| 5448 | - query.addCriteria(Criteria.where("status").in(antExManagerQueryRequest.getStatus())); | |
| 5459 | + query.addCriteria(Criteria.where("status").is(antExManagerQueryRequest.getStatus())); | |
| 5449 | 5460 | } |
| 5450 | 5461 | |
| 5462 | + if (antExManagerQueryRequest.getLevel() != null) { | |
| 5463 | + query.addCriteria(Criteria.where("hLevel").in(antExManagerQueryRequest.getLevel())); | |
| 5464 | + } | |
| 5465 | + | |
| 5466 | + if (antExManagerQueryRequest.getRiskFactorId() != null) { | |
| 5467 | + query.addCriteria(Criteria.where("hRisk").in(antExManagerQueryRequest.getRiskFactorId())); | |
| 5468 | + } | |
| 5469 | + | |
| 5451 | 5470 | long count = mongoTemplate.count(query, AutoRiskRecord.class); |
| 5452 | 5471 | |
| 5453 | 5472 | BaseQuery baseQuery = new BaseQuery(); |
| ... | ... | @@ -5478,7 +5497,7 @@ |
| 5478 | 5497 | |
| 5479 | 5498 | map.put("risk",risk); |
| 5480 | 5499 | map.put("score",model.gethScore()); |
| 5481 | - map.put("score",model.getStatus() == 0 ? "未确诊" : "已确诊"); | |
| 5500 | + map.put("status",model.getStatus() == 0 ? "未确诊" : "已确诊"); | |
| 5482 | 5501 | riskList.add(map); |
| 5483 | 5502 | } |
| 5484 | 5503 | } |
| 5485 | 5504 | |
| ... | ... | @@ -5536,10 +5555,53 @@ |
| 5536 | 5555 | AntExChuModel model = list.get(0); |
| 5537 | 5556 | AntExcAddRequest excAddRequest = new AntExcAddRequest(); |
| 5538 | 5557 | excAddRequest.setId(model.getId()); |
| 5539 | - excAddRequest.setHighrisk(autoRisk.gethRisk()); | |
| 5558 | + List li = null; | |
| 5559 | + try { | |
| 5560 | + li = JsonUtil.toList(model.getHighrisk(), List.class); | |
| 5561 | + } catch (Exception e) { | |
| 5562 | + } | |
| 5563 | + List<String> riskList = autoRisk.gethRisk(); | |
| 5564 | + if (CollectionUtils.isNotEmpty(li)) | |
| 5565 | + { | |
| 5566 | + riskList.addAll(li); | |
| 5567 | + } | |
| 5568 | + | |
| 5569 | + excAddRequest.setHighrisk(riskList); | |
| 5540 | 5570 | excAddRequest.setParentId(autoRisk.getPatientId()); |
| 5541 | 5571 | addOneAnetExChu(excAddRequest, userId); |
| 5542 | 5572 | } |
| 5573 | + else if (autoRisk.getType() == 2) | |
| 5574 | + { | |
| 5575 | + | |
| 5576 | + AntExQuery antExQuery = new AntExQuery(); | |
| 5577 | + antExQuery.setId(autoRisk.getFid()); | |
| 5578 | + antExQuery.setYn(YnEnums.YES.getId()); | |
| 5579 | + List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "created")); | |
| 5580 | + if (CollectionUtils.isNotEmpty(examinationModelList)) | |
| 5581 | + { | |
| 5582 | + AntenatalExaminationModel model = examinationModelList.get(0); | |
| 5583 | + AntExAddRequest excAddRequest = new AntExAddRequest(); | |
| 5584 | + excAddRequest.setId(model.getId()); | |
| 5585 | + List li = null; | |
| 5586 | + try { | |
| 5587 | + li = JsonUtil.toList(model.getRiskFactor(), List.class); | |
| 5588 | + } catch (Exception e) { | |
| 5589 | + } | |
| 5590 | + List<String> riskList = autoRisk.gethRisk(); | |
| 5591 | + if (CollectionUtils.isNotEmpty(li)) | |
| 5592 | + { | |
| 5593 | + riskList.addAll(li); | |
| 5594 | + } | |
| 5595 | + excAddRequest.setRiskFactor(riskList); | |
| 5596 | + excAddRequest.setParentId(autoRisk.getPatientId()); | |
| 5597 | + addOneAntEx(excAddRequest,userId); | |
| 5598 | + } | |
| 5599 | + } | |
| 5600 | + Query updateQuery = Query.query(Criteria.where("_id").is(autoRisk.getId())); | |
| 5601 | + autoRisk.setStatus(1); //设置为已确诊 | |
| 5602 | + Update update = MongoConvertHelper | |
| 5603 | + .convertToNativeUpdate(ReflectionUtils.getUpdateField(autoRisk)); | |
| 5604 | + mongoTemplate.updateFirst(updateQuery, update, AutoRiskRecord.class); | |
| 5543 | 5605 | } |
| 5544 | 5606 | } |
| 5545 | 5607 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |