diff --git a/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java b/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java index 497f7c21f6f2935daca20f7e5c42a8d2a8628e88..1691b6648d17629def28df8ff550e4a2c2bb2ce2 100644 --- a/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java +++ b/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java @@ -61,7 +61,7 @@ public class PlanServiceImpl implements PlanService { Query countQuery = new Query(); if (Objects.nonNull(lastSynchronizeTime)) { - countQuery.addCriteria(where("last_modified_at").gt(lastSynchronizeTime)); + countQuery.addCriteria(where("lastModifiedAt").gt(lastSynchronizeTime)); } long totalPlanTaskDetailsCount = mongoTemplate.count(countQuery, PlanTaskDetails.class); log.info("PlanTaskDetails 鍦ㄥぇ浜� {} 鏃堕棿鍐呮湭鏌ヨ鍒版暟鎹� {} 鏉�", lastSynchronizeTime, totalPlanTaskDetailsCount); @@ -361,7 +361,7 @@ public class PlanServiceImpl implements PlanService { if (CollectionUtils.isEmpty(planTskDetailIds)) { return new ArrayList<>(); } - return mongoTemplate.find(new Query().addCriteria(where("plan_task_details_id").in(planTskDetailIds)), PlanTaskDetailsModule.class); + return mongoTemplate.find(new Query().addCriteria(where("planTaskDetailsId").in(planTskDetailIds)), PlanTaskDetailsModule.class); } @@ -371,7 +371,7 @@ public class PlanServiceImpl implements PlanService { return new HashMap<>(); } - Map<Long, List<ClinicalTrialsEvent>> eventMap = mongoTemplate.find(new Query().addCriteria(where("plan_details_id").in(planTskDetailIds).and("relation_type").is("DIGITAL_MEDICAL")), ClinicalTrialsEvent.class) + Map<Long, List<ClinicalTrialsEvent>> eventMap = mongoTemplate.find(new Query().addCriteria(where("planDetailsId").in(planTskDetailIds).and("relationType").is("DIGITAL_MEDICAL")), ClinicalTrialsEvent.class) .stream().collect(Collectors.groupingBy(ClinicalTrialsEvent::getPlanDetailsId)); Map<Long, Map<Long, String>> map = new HashMap<>(); @@ -394,7 +394,7 @@ public class PlanServiceImpl implements PlanService { return new HashMap<>(); } - Map<Long, List<ClinicalTrialsEvent>> eventMap = mongoTemplate.find(new Query().addCriteria(where("plan_details_id").in(planTskDetailIds).and("relation_type").is("DIGITAL_MEDICAL")), ClinicalTrialsEvent.class) + Map<Long, List<ClinicalTrialsEvent>> eventMap = mongoTemplate.find(new Query().addCriteria(where("planDetailsId").in(planTskDetailIds).and("relationType").is("DIGITAL_MEDICAL")), ClinicalTrialsEvent.class) .stream().collect(Collectors.groupingBy(ClinicalTrialsEvent::getPlanDetailsId)); Map<Long, Map<Long, Long>> map = new HashMap<>(); @@ -443,7 +443,7 @@ public class PlanServiceImpl implements PlanService { return new HashMap<>(); } - List<CrfAnswer> crfAnswers = mongoTemplate.find(new Query().addCriteria(where("plan_task_details_id").in(planTskDetailIds)), CrfAnswer.class); + List<CrfAnswer> crfAnswers = mongoTemplate.find(new Query().addCriteria(where("planTaskDetailsId").in(planTskDetailIds)), CrfAnswer.class); Map<Long, List<CrfAnswer>> crfAnswersMap = crfAnswers.stream().collect(Collectors.groupingBy(CrfAnswer::getPlanTaskDetailsId)); @@ -482,17 +482,17 @@ public class PlanServiceImpl implements PlanService { return new HashMap<>(); } - List<QuestionnaireAnswerRecord> records = mongoTemplate.find(new Query().addCriteria(where("plan_task_details_id").in(planTskDetailIds)), QuestionnaireAnswerRecord.class); + List<QuestionnaireAnswerRecord> records = mongoTemplate.find(new Query().addCriteria(where("planTaskDetailsId").in(planTskDetailIds)), QuestionnaireAnswerRecord.class); if (CollectionUtils.isEmpty(records)) { return new HashMap<>(); } Set<Long> recordIds = records.stream().map(QuestionnaireAnswerRecord::getId).collect(Collectors.toSet()); - List<QuestionnaireAnswer> answers = mongoTemplate.find(new Query().addCriteria(where("record_id").in(recordIds)), QuestionnaireAnswer.class); + List<QuestionnaireAnswer> answers = mongoTemplate.find(new Query().addCriteria(where("recordId").in(recordIds)), QuestionnaireAnswer.class); Set<Long> ansowerIds = answers.stream().map(QuestionnaireAnswer::getId).collect(Collectors.toSet()); - List<QuestionnaireAnswerOption> answerOptions = mongoTemplate.find(new Query().addCriteria(where("answer_id").in(ansowerIds)), QuestionnaireAnswerOption.class); + List<QuestionnaireAnswerOption> answerOptions = mongoTemplate.find(new Query().addCriteria(where("answerId").in(ansowerIds)), QuestionnaireAnswerOption.class); Map<Long, Map<String, Object>> map = new HashMap<>(); @@ -549,7 +549,7 @@ public class PlanServiceImpl implements PlanService { } Map<Long, List<PatientScaleEvaluatingEntity>> scaleEvaluatMap = - mongoTemplate.find(new Query().addCriteria(where("plan_task_details_id").in(planTskDetailIds)), PatientScaleEvaluatingEntity.class) + mongoTemplate.find(new Query().addCriteria(where("planTaskDetailsId").in(planTskDetailIds)), PatientScaleEvaluatingEntity.class) .stream().collect(Collectors.groupingBy(PatientScaleEvaluatingEntity::getPlanTaskDetailsId)); Map<Long, Map<String, Object>> map = new HashMap<>(); @@ -570,7 +570,7 @@ public class PlanServiceImpl implements PlanService { } if(!StringUtils.isEmpty(item.getScaleCode())) { - List<ScaleQuestionEntity> questions = mongoTemplate.find(new Query().addCriteria(where("scale_code").is(item.getScaleCode())), ScaleQuestionEntity.class); + List<ScaleQuestionEntity> questions = mongoTemplate.find(new Query().addCriteria(where("scaleCode").is(item.getScaleCode())), ScaleQuestionEntity.class); BigDecimal totalScore = questions.stream().map(ScaleQuestionEntity::getScore).reduce(BigDecimal.ZERO, BigDecimal::add); resultMap.put("totalScore", totalScore); } @@ -604,14 +604,14 @@ public class PlanServiceImpl implements PlanService { */ Map<Long, String> map = new HashMap<>(); List<Long> questionnaireIds = planMoudleRelates.stream().filter(relate -> relate.getRelationType().equals("QUESTIONNAIRE")).map(PlanTaskModuleRelate::getRelationId).collect(Collectors.toList()); - Map<Long, String> questionaireMap = mongoTemplate.find(new Query().addCriteria(where("top_id").in(questionnaireIds)), Questionnaire.class) + Map<Long, String> questionaireMap = mongoTemplate.find(new Query().addCriteria(where("topId").in(questionnaireIds)), Questionnaire.class) .stream().collect(Collectors.toMap(Questionnaire::getTopId, Questionnaire::getName, (k1, k2) -> k2)); if (MapUtil.isNotEmpty(questionaireMap)) { map.putAll(questionaireMap); } List<Long> crfTopIds = planMoudleRelates.stream().filter(relate -> relate.getRelationType().equals("CRF")).map(PlanTaskModuleRelate::getRelationId).collect(Collectors.toList()); - Map<Long, String> crfMap = mongoTemplate.find(new Query().addCriteria(where("crf_top_id").in(crfTopIds)), Crf.class) + Map<Long, String> crfMap = mongoTemplate.find(new Query().addCriteria(where("crfTopId").in(crfTopIds)), Crf.class) .stream().collect(Collectors.toMap(Crf::getCrfTopId, Crf::getName, (k1, k2) -> k2)); if (MapUtil.isNotEmpty(crfMap)) { map.putAll(crfMap); @@ -644,7 +644,7 @@ public class PlanServiceImpl implements PlanService { private List<UserArchiveMapping> queryArchiveMapping(List<PlanTaskDetails> planTaskDetails) { List<String> patientCodes = planTaskDetails.stream().map(PlanTaskDetails::getPatientCode).collect(Collectors.toList()); Query archiveMappingquery = new Query(); - archiveMappingquery.addCriteria(where("patient_code").in(patientCodes)); + archiveMappingquery.addCriteria(where("patientCode").in(patientCodes)); return mongoTemplate.find(archiveMappingquery, UserArchiveMapping.class); }