diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 60c988d..6e97194 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -5633,44 +5633,42 @@ public class AntenatalExaminationFacade { { riskList.addAll(li); } - excAddRequest.setHighrisk(riskList); excAddRequest.setParentId(autoRisk.getPatientId()); addOneAnetExChu(excAddRequest, userId); } - else if (autoRisk.getType() == 2) + } + else if (autoRisk.getType() == 2) + { + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setId(autoRisk.getFid()); + antExQuery.setYn(YnEnums.YES.getId()); + List examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "created")); + if (CollectionUtils.isNotEmpty(examinationModelList)) { - - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setId(autoRisk.getFid()); - antExQuery.setYn(YnEnums.YES.getId()); - List examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "created")); - if (CollectionUtils.isNotEmpty(examinationModelList)) + AntenatalExaminationModel model = examinationModelList.get(0); + AntExAddRequest excAddRequest = new AntExAddRequest(); + excAddRequest.setId(model.getId()); + List li = null; + try { + li = JsonUtil.toList(model.getRiskFactor(), List.class); + } catch (Exception e) { + } + List riskList = autoRisk.gethRisk(); + if (CollectionUtils.isNotEmpty(li)) { - AntenatalExaminationModel model = examinationModelList.get(0); - AntExAddRequest excAddRequest = new AntExAddRequest(); - excAddRequest.setId(model.getId()); - List li = null; - try { - li = JsonUtil.toList(model.getRiskFactor(), List.class); - } catch (Exception e) { - } - List riskList = autoRisk.gethRisk(); - if (CollectionUtils.isNotEmpty(li)) - { - riskList.addAll(li); - } - excAddRequest.setRiskFactor(riskList); - excAddRequest.setParentId(autoRisk.getPatientId()); - addOneAntEx(excAddRequest,userId); + riskList.addAll(li); } + excAddRequest.setRiskFactor(riskList); + excAddRequest.setParentId(autoRisk.getPatientId()); + addOneAntEx(excAddRequest,userId); } - Query updateQuery = Query.query(Criteria.where("_id").is(autoRisk.getId())); - autoRisk.setStatus(1); //设置为已确诊 - Update update = MongoConvertHelper - .convertToNativeUpdate(ReflectionUtils.getUpdateField(autoRisk)); - mongoTemplate.updateFirst(updateQuery, update, AutoRiskRecord.class); } + Query updateQuery = Query.query(Criteria.where("_id").is(autoRisk.getId())); + autoRisk.setStatus(1); //设置为已确诊 + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(autoRisk)); + mongoTemplate.updateFirst(updateQuery, update, AutoRiskRecord.class); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index c1c17ba..2ce2024 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -90,13 +90,13 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { private String autoTime; // 0 未诊断 1已诊断 - private String status; + private Integer status; - public String getStatus() { + public Integer getStatus() { return status; } - public void setStatus(String status) { + public void setStatus(Integer status) { this.status = status; }