Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r17562 -r18203
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 17562)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 18203)
@@ -4121,8 +4121,8 @@
 						deleteOldDepart = Constants.STR_YES;
 					}
 					
-					//校验3:如果存在新科室编码,那么该编码对应的组织机构不能为空
-					if (StringUtils.isNotBlank(newOrgUnitCoding)) {
+					//校验3:如果存在新科室编码,那么该编码对应的组织机构不能为空(先注释掉此校验判断)
+					/*if (StringUtils.isNotBlank(newOrgUnitCoding)) {
 						OrgUnit newOrgUnit = orgUnitManager.getByCode(newOrgUnitCoding);
 						if(newOrgUnit == null){
 							// 有空值，记录信息
@@ -4131,10 +4131,10 @@
 							failureCount++;
 							continue;
 						}
-					}
+					}*/
 					
-					//校验4:如果存在新科室名称,那么该名称对应的组织机构不能为空
-					if (StringUtils.isNotBlank(newName)) {
+					//校验4:如果存在新科室名称,那么该名称对应的组织机构不能为空(先注释掉此校验判断)
+					/*if (StringUtils.isNotBlank(newName)) {
 						OrgUnit newOrgUnit = (OrgUnit)objectDao.getByProperty(OrgUnit.class.getSimpleName(), "name", newName);
 						if(newOrgUnit == null){
 							// 有空值，记录信息
@@ -4143,7 +4143,7 @@
 							failureCount++;
 							continue;
 						}
-					}
+					}*/
 					
 					
 					/*OrgUnit oldOrgUnit = orgUnitManager.getByCode(oldOrgUnitCoding);
@@ -4170,6 +4170,11 @@
 					orgUnitChangeMap.put("newOrgUnitCoding", newOrgUnitCoding);
 					orgUnitChangeMap.put("newName", newName);
 					orgUnitChangeMap.put("deleteOldDepart", deleteOldDepart);
+					//如果存在新科室编码且新科室编码与旧科室编码不同,且删除旧科室不为是时,需要设置是否修改科室为是
+					if(StringUtils.isNotBlank(newOrgUnitCoding) && !StringUtils.equals(oldOrgUnitCoding, newOrgUnitCoding) 
+							&& !Constants.STR_YES.equals(deleteOldDepart) && !"Y".equalsIgnoreCase(deleteOldDepart)){
+						orgUnitChangeMap.put("modifyOldDepartCoding", Constants.STR_YES);//是否修改组织机构的编码
+					}
 					orgUnitChangeList.add(orgUnitChangeMap);
 					successCount++;
 				}