Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r34951 -r35602 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 34951) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 35602) @@ -1525,7 +1525,7 @@ operation = operationNameManager.getFirst("operationName", readOperationName); if(operation != null){ //此手术名称已经存在(现在是修改) operationOrg = operation.getOperationOrg(); - if(!operationOrg.getOrgUnitName().equals(orgUnit)){ //手术对应科室有修改 + if(!operationOrg.getOrgUnitName().equals(orgUnit.getName())){ //手术对应科室有修改 operationOrg = (OperationOrg) objectDao.getByProperty(OperationOrg.class.getSimpleName(), "orgUnitName",orgName); if(operationOrg == null){ //没找到该科室对应的operationOrg的记录 operationOrg = new OperationOrg();