diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java index b93937a..bcc0614 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java @@ -531,10 +531,10 @@ public class SyncDataWork } String doctorUserName = null; List antExChuModel = antenatalExaminationService.queryAntExChu(antExChuQuery); - logger.info("query antexc" + patients.getId() + ". list size:"+antExChuModel.size()); + logger.info("query antexc" + patients.getId() + ". list size:" + antExChuModel.size()); if (CollectionUtils.isNotEmpty(antExChuModel)) { - logger.info("query antexc" + patients.getId() + ". list size:"+antExChuModel); + logger.info("query antexc" + patients.getId() + ". list size:" + antExChuModel); handLastRisk(patients, mamiPatient.getId()); doctorUserName = null; @@ -555,7 +555,7 @@ public class SyncDataWork Reports reports = ConvertHelper.convertAntExChu(antExChuModel1, patients.getLastMenses(), bgHighRisk, doctorUserName); - logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:"+antExChuModel1.getId()); + logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:" + antExChuModel1.getId()); handleDoctorMemeber(reports, antExChuModel1.getProdDoctor(), mamiPatient, patients, stopWatch3); logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:" + antExChuModel1.getId()); } @@ -620,14 +620,12 @@ public class SyncDataWork .aouDoctorUsersPatientsMaps(reportdoctorUsersPatientsMaps); stopWatch3.stop(); } - - if (null != reports.getNextCheckTime()) - { - com.lymsh.mommybaby.maindata.model.Patients patients1 = new com.lymsh.mommybaby.maindata.model.Patients(); - patients1.setId(mamiPatient.getId()); - patients1.setNextCheckTime(reports.getNextCheckTime()); - patientsService.updatePatients(patients1); - } + stopWatch3.start("updateNextTime by "+mamiPatient.getId()+",next time :" +reports.getNextCheckTime()); + com.lymsh.mommybaby.maindata.model.Patients patients1 = new com.lymsh.mommybaby.maindata.model.Patients(); + patients1.setId(mamiPatient.getId()); + patients1.setNextCheckTime(reports.getNextCheckTime()); + patientsService.updateNextTime(patients1); + stopWatch3.stop(); } /** @@ -652,7 +650,7 @@ public class SyncDataWork List antList = antenatalExaminationService .queryAntenatalExamination(antExQuery.convertToQuery()); String doctorUserName = null; - logger.info("query antex" + patients.getId() + ". list size:"+antList.size()); + logger.info("query antex" + patients.getId() + ". list size:" + antList.size()); if (CollectionUtils.isNotEmpty(antList)) { for (AntenatalExaminationModel ant : antList) @@ -670,9 +668,9 @@ public class SyncDataWork Reports reports = ConvertHelper.convertAntExChu(ant, patients.getLastMenses(), bgHighRisk, doctorUserName); - + logger.info("handleDoctorMemeber antex" + patients.getId() + ". antex id:" + ant.getId()); handleDoctorMemeber(reports, ant.getCheckDoctor(), mamiPatient, patients, stopWatch3); - + logger.info("handleDoctorMemeber antex" + patients.getId() + ". antex id:" + ant.getId()); /* if (NumberUtils.isNumber(ant.getCheckDoctor())) { Users users = usersService.getUsers(Integer.valueOf(ant.getCheckDoctor())); @@ -1224,10 +1222,10 @@ public class SyncDataWork private void bandingMember(com.lymsh.mommybaby.maindata.model.Patients patients) { MembersQuery membersQuery = new MembersQuery(); - if (StringUtils.isEmpty(patients.getPhone()) || 3 == patients.getType()) + /* if (StringUtils.isEmpty(patients.getPhone()) || 3 == patients.getType()) { return; - } + }*/ membersQuery.setPhone(patients.getPhone()); membersQuery.setYn(YnEnum.yes.getId()); List membersList = membersService.queryMembers(membersQuery); @@ -1237,19 +1235,20 @@ public class SyncDataWork membersQuery = new MembersQuery(); membersQuery.setPatientId(patients.getId()); membersQuery.setYn(YnEnum.yes.getId()); - List membersList1 = membersService.queryMembers(membersQuery); + /* List membersList1 = membersService.queryMembers(membersQuery); for (Members members : membersList1) { Members m = new Members(); m.setId(members.getId()); m.setYn(YnEnum.no.getId()); membersService.updateMembers(m); - } + }*/ - Patients p1 =patientsService.findMaxReportPatient(patients.getPhone()); + Patients p1 = patientsService.findMaxReportPatient(patients.getPhone()); - if(null!=p1){ - patients=p1; + if (null != p1) + { + patients = p1; } for (Members members : membersList) @@ -1262,9 +1261,15 @@ public class SyncDataWork temp.setUsername(patients.getUsername()); temp.setDueDate(patients.getDueDate()); //member status 为2时不需要修改 - if (null == members.getStatus() || 2 != members.getStatus()) + if (null != patients.getType()) { - temp.setStatus(patients.getType()); + if (1 == patients.getType()) + { + temp.setStatus(1); + } else if (3 == patients.getType()) + { + temp.setStatus(2); + } } temp.setAge(patients.getAge()); temp.setModified(new Date());