Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/OrgUnitExaminationAction.java =================================================================== diff -u -r28916 -r28931 --- ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/OrgUnitExaminationAction.java (.../OrgUnitExaminationAction.java) (revision 28916) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/OrgUnitExaminationAction.java (.../OrgUnitExaminationAction.java) (revision 28931) @@ -228,6 +228,7 @@ pintConfigJson.put("orgUnitCode", departCodes); pintConfigJson.put("orgUnitname", departNames); pintConfigJson.put("problemType", OrgUnitExaminationAction.ORGUNITNOTEXIST); + pintConfigJson.put("configName", configName); configArray.add(pintConfigJson); continue; } @@ -241,6 +242,7 @@ pintConfigJson.put("orgUnitCode", departCodes); pintConfigJson.put("orgUnitname", departNames); pintConfigJson.put("problemType", OrgUnitExaminationAction.ORGUNITNOTEXIST); + pintConfigJson.put("configName", configName); configArray.add(pintConfigJson); continue; } @@ -250,13 +252,19 @@ List orgUnitList = objectDao.findByHql(orgUnitHql); if(CollectionUtils.isNotEmpty(orgUnitList)){ for (OrgUnit orgUnit : orgUnitList) { + if(orgUnit.getStatus() != null && orgUnit.getStatus().intValue() == OrgUnit.STATUS_DISABLED.intValue()){ + + } nameToOrgUnitMap.put(orgUnit.getName(), orgUnit); } } List departNameList = Arrays.asList(departNameArray); for (String departName : departNameList) { JSONObject pintConfigJson = null; + if(departName.contains("(已停用)")){ + departName = departName.replace("(已停用)", ""); + } OrgUnit orgUnit = nameToOrgUnitMap.get(departName); if(orgUnit == null){ // 名称不一致就判断科室不存在