diff --git a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java index 99b15c8..a907cdc 100644 --- a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java +++ b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java @@ -206,7 +206,12 @@ public class SyncBasicFileImpl implements ISyncBasicFileService { ArrayList tbasics = new ArrayList<>(); ArrayList scanAssorts = new ArrayList<>(); String patientId = fileUploadJpg.get(0).getPatientId(); - Integer admissTimes = fileUploadJpg.get(0).getAdmissTimes(); + Integer admissTimes= null; + if (fileUploadJpg.get(0).getAdmissTimes()==null){ + admissTimes= 0; + }else { + admissTimes=fileUploadJpg.get(0).getAdmissTimes(); + } String admissId = fileUploadJpg.get(0).getAdmissId(); Date disDate = fileUploadJpg.get(0).getDisDate(); //组织基础数据 @@ -354,7 +359,7 @@ public class SyncBasicFileImpl implements ISyncBasicFileService { private Tbasic getTbasic(List fileUploadJpg) { FileUploadJpgDto fileUploadJpgDto = fileUploadJpg.get(0); Tbasic tbasic = new Tbasic(); - tbasic.setPatientId(fileUploadJpgDto.getPatientId()); + tbasic.setPatientId(String.valueOf(SnowflakeIdWorker.idWorker.nextId())); tbasic.setAdmissTimes(fileUploadJpgDto.getAdmissTimes()); tbasic.setInpatientNo(fileUploadJpgDto.getInpatientNo()); tbasic.setAdmissId(fileUploadJpgDto.getAdmissId());