Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java =================================================================== diff -u -r31379 -r31407 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java (.../HIPMessageWebServiceImplV2.java) (revision 31379) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java (.../HIPMessageWebServiceImplV2.java) (revision 31407) @@ -255,6 +255,11 @@ if(materialDefinition == null){ String mdHql = String.format("select po from %s po where po.name = '%s' and po.specification = '%s'", MaterialDefinition.class.getSimpleName(), materialDefinitionName, materialDefinitionSpecification); + if(StringUtils.isBlank(materialDefinitionSpecification)){ + // 材料规格可能为null或者空字符串 + mdHql = String.format("select po from %s po where po.name = '%s' and (po.specification = '' or po.specification is null)", + MaterialDefinition.class.getSimpleName(), materialDefinitionName); + } List mdList = objectDao.findByHql(mdHql); if(CollectionUtils.isEmpty(mdList)){ throw new RuntimeException("找不到" + materialDefinitionName + "[" + materialDefinitionSpecification + "]的材料!");