diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 6840513..aa5df98 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -361,10 +361,8 @@ public class TestController { // 查询 List patientsList = patientsService.queryPatient(patientsQuery); System.out.println("本次读取了【" + patientsList.size() + "】条数据"); - int batchSize = StringUtils.isEmpty(size) ? 1000 : Integer.valueOf(size); int end = 0; - for (int i = 0; i < patientsList.size(); i += batchSize) { end = (end + batchSize); if (end > patientsList.size()) { @@ -376,40 +374,34 @@ public class TestController { public void run() { if (CollectionUtils.isNotEmpty(tempList)) { for (Patients patients : tempList) { - - if (StringUtils.isEmpty(patients.getLastCheckEmployeeId())) { - - String id = patients.getId(); - String hospitalId = patients.getHospitalId(); - - String lastCheckEmployeeId = null; - String flag; - - // 查询复诊,如果没有再查询初诊 - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setParentId(id); - antExQuery.setHospitalId(hospitalId); - List antenatalExaminationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (CollectionUtils.isNotEmpty(antenatalExaminationModelList)) { - lastCheckEmployeeId = antenatalExaminationModelList.get(0).getCheckDoctor(); - flag = "复诊"; - } else { - // 查询初诊 - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setParentId(id); - antExChuQuery.setHospitalId(hospitalId); - List antExChuModelList = antenatalExaminationService.queryAntExChu(antExChuQuery); - if (antExChuModelList.size() == 1) { - lastCheckEmployeeId = antExChuModelList.get(0).getProdDoctor(); - } - flag = "初诊"; - } - if (!StringUtils.isEmpty(lastCheckEmployeeId)) { - patientsService.updatePatientLastCheckEmployeeIdOne(id, lastCheckEmployeeId); - System.out.println("更新lyms_patient:id=" + id + ",lastCheckEmployeeId=" + lastCheckEmployeeId + ",来自" + flag); + String id = patients.getId(); + String hospitalId = patients.getHospitalId(); + String lastCheckEmployeeId = null; + String flag; + // 查询复诊,如果没有再查询初诊 + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setParentId(id); + antExQuery.setHospitalId(hospitalId); + List antenatalExaminationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + if (CollectionUtils.isNotEmpty(antenatalExaminationModelList)) { + lastCheckEmployeeId = antenatalExaminationModelList.get(0).getCheckDoctor(); + flag = "复诊"; + } else { + // 查询初诊 + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentId(id); + antExChuQuery.setHospitalId(hospitalId); + List antExChuModelList = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (antExChuModelList.size() == 1) { + lastCheckEmployeeId = antExChuModelList.get(0).getProdDoctor(); } + flag = "初诊"; + } + if (!StringUtils.isEmpty(lastCheckEmployeeId)) { + patientsService.updatePatientLastCheckEmployeeIdOne(id, lastCheckEmployeeId); + System.out.println("更新lyms_patient:id=" + id + ",lastCheckEmployeeId=" + lastCheckEmployeeId + ",来自" + flag); } } }