diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 4f3477f..273bc08 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -95,12 +95,15 @@ public class PatientSyncMysqlFacade { private void savePatients(Patients patients) { - MysqlPatients mysqlPatientsdb = new MysqlPatients(); - mysqlPatientsdb.setPatientId(patients.getId()); - mysqlPatientsService.deleteMysqlPatients(mysqlPatientsdb); - Map map = viewFacade.getPatientViewData(patients, patients.getId()); - MysqlPatients mysqlPatients = new MysqlPatients(); + try { + + MysqlPatients mysqlPatientsdb = new MysqlPatients(); + mysqlPatientsdb.setPatientId(patients.getId()); + mysqlPatientsService.deleteMysqlPatients(mysqlPatientsdb); + Map map = viewFacade.getPatientViewData(patients, patients.getId()); + MysqlPatients mysqlPatients = new MysqlPatients(); + ConvertUtils.register(new DateLocaleConverter(), Date.class); BeanUtils.populate(mysqlPatients, map); mysqlPatients.setPatientId(patients.getId()); @@ -179,8 +182,14 @@ public class PatientSyncMysqlFacade { mysqlAntexcDb.setCid(antExChuModel.getId()); mysqlAntexcService.deleteMysqlAntexc(mysqlAntexcDb); - Map map = (Map)viewFacade.findAntExChu(antExChuModel.getId()).getData(); + try { + Map map = (Map)viewFacade.findAntExChu(antExChuModel.getId()).getData(); + if (map == null) + { + continue; + } + MysqlAntexc mysqlAntexc = new MysqlAntexc(); ConvertUtils.register(new DateLocaleConverter(), Date.class); BeanUtils.populate(mysqlAntexc, map); @@ -325,8 +334,14 @@ public class PatientSyncMysqlFacade { mysqlAntexcDb.setCid(examinationModel.getId()); mysqlAntexcService.deleteMysqlAntex(mysqlAntexcDb); - Map map = (Map)viewFacade.findAntenatalExamination(examinationModel.getId()).getData(); + try { + Map map = (Map)viewFacade.findAntenatalExamination(examinationModel.getId()).getData(); + if (map == null) + { + continue; + } + MysqlAntex mysqlAntex = new MysqlAntex(); ConvertUtils.register(new DateLocaleConverter(), Date.class); BeanUtils.populate(mysqlAntex, map); @@ -660,8 +675,15 @@ public class PatientSyncMysqlFacade { mysqlBabyDb.setBabyId(babyModel.getId()); mysqlAntexcService.deleteMysqlBaby(mysqlBabyDb); - BabyPageResult map = (BabyPageResult)viewFacade.getBabyBuildInfo(babyModel.getId()).getData(); + try { + + BabyPageResult map = (BabyPageResult)viewFacade.getBabyBuildInfo(babyModel.getId()).getData(); + if (map == null) + { + continue; + } + MysqlBaby mysqlBaby = new MysqlBaby(); ConvertUtils.register(new DateLocaleConverter(), Date.class); BeanUtils.copyProperties(mysqlBaby, map); @@ -728,9 +750,13 @@ public class PatientSyncMysqlFacade { MysqlBabyCheck mysqlBabyCheckdb = new MysqlBabyCheck(); mysqlBabyCheckdb.setCheckId(babyCheckModel.getId()); mysqlAntexcService.deleteMysqlBabyCheck(mysqlBabyCheckdb); - - BabyCheckPageResult map = (BabyCheckPageResult)viewFacade.getBabyCheckPageInfo(babyCheckModel.getId()).getData(); try { + + BabyCheckPageResult map = (BabyCheckPageResult)viewFacade.getBabyCheckPageInfo(babyCheckModel.getId()).getData(); + if (map == null) + { + continue; + } MysqlBabyCheck mysqlBabyCheck = new MysqlBabyCheck(); ConvertUtils.register(new DateLocaleConverter(), Date.class); BeanUtils.copyProperties(mysqlBabyCheck, map);