Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java =================================================================== diff -u -r24994 -r25034 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 24994) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 25034) @@ -693,9 +693,12 @@ if(StringUtils.isBlank(firstSupplyRoomConfig.getOrgUnitCoding()) || StringUtils.isBlank(firstSupplyRoomConfig.getOrgUnitName())){ throw new RuntimeException(operationName +"手术预约单同步失败!:处理科室不能为空!"); } + if(StringUtils.isBlank(syncOperationReservation.getOperatingRoom())){ + throw new RuntimeException(operationName +"手术预约单同步失败!:手术间不能为空!"); + } operationReservation.setOperationName(operationName);//手术名称 operationReservation.setSerialNumber(serialNumber);//申请单号 - operationReservation.setOperatingRoom(syncOperationReservation.getOperatingRoom()); + operationReservation.setOperatingRoom(syncOperationReservation.getOperatingRoom());//手术间 operationReservation.setDoctors(syncOperationReservation.getDoctors()); operationReservation.setConsoleName(syncOperationReservation.getConsoleName()); operationReservation.setPatientAge(syncOperationReservation.getPatientAge());//病人年龄