Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r35059 -r35061 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 35059) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 35061) @@ -2622,7 +2622,7 @@ return result; } if(StringUtils.isBlank(doctorNameJsonArrayStr)){ - throw new SystemException("手术医生不允许为空!"); + return result; } JSONArray doctorNameJsonArray = new JSONArray(); @@ -2632,7 +2632,7 @@ } if(doctorNameJsonArray.size() == 0){ - throw new SystemException("手术医生不允许为空!"); + return result; } Map tousseInstanceIdDoctorNameMap = new HashMap(); @@ -2645,7 +2645,7 @@ throw new SystemException("器械包实例ID无效!"); } if(StringUtils.isBlank(doctorName)){ - throw new SystemException("手术医生不允许为空!"); + continue; } tousseInstanceIds.add(tousseInstanceId); tousseInstanceIdDoctorNameMap.put(tousseInstanceId, doctorName); @@ -2670,7 +2670,7 @@ return result; } if(MapUtils.isEmpty(tousseInstanceIdDoctorNameMap)){ - throw new SystemException("手术医生不允许为空!"); + return result; } List tousseDefinitionAncestorIdList = new ArrayList(); @@ -2701,6 +2701,9 @@ continue; } String doctorName = tousseInstanceIdDoctorNameMap.get(tousseInstance.getId()); + if(StringUtils.isBlank(doctorName)){ + continue; + } if(doctorNameList.contains(doctorName)){ continue; }