Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r27770 -r27896
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 27770)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 27896)
@@ -1739,8 +1739,9 @@
 	public void loadSupplyRoomConfig(){
 		int type = StrutsParamUtils.getPraramValue("type", -1);
 		// 科室供应室设置的科室申领配置和结算科室配置，不显示停用的科室
-		List<SupplyRoomConfig> supplyRoomConfigList = supplyRoomConfigManager.getSupplyRoomWithoutDisableOrgUnit(type);
-		StrutsResponseUtils.output(supplyRoomConfigListToJSONArray(supplyRoomConfigList));
+		//List<SupplyRoomConfig> supplyRoomConfigList = supplyRoomConfigManager.getSupplyRoomWithoutDisableOrgUnit(type);
+		JSONArray supplyRoomConfigArr = supplyRoomConfigManager.loadSupplyRoomConfigWithStatus(type);
+		StrutsResponseUtils.output(supplyRoomConfigArr);
 	}
 	
 	/**
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
===================================================================
diff -u -r27812 -r27896
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 27812)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 27896)
@@ -280,5 +280,12 @@
 	 * @return key:orgUnitCoding 科室编码 value:sequence 供应室配置的科室申领配置中的科室对应的序号
 	 */
 	public Map<String, Integer> getOrgUnitCodingAndSequenceMap(int type);
+	
+	/**
+	 * 根据supplyRoomType获取SupplyRoomConfig对象(包含已经停用的科室,根据科室状态判断是否停用)
+	 * @param type
+	 * @return
+	 */
+	public JSONArray loadSupplyRoomConfigWithStatus(int type);
 
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r27812 -r27896
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 27812)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 27896)
@@ -1027,4 +1027,38 @@
 		return map;
 	}
 
+	
+	@Override
+	public JSONArray loadSupplyRoomConfigWithStatus(int type) {
+		JSONArray jsonArray = new JSONArray();
+		String sql = String.format("select src.id, src.orgUnitCoding, src.orgUnitName, src.sequence, src.spelling, "
+				+ "src.disposablePriceFluctuation, src.showInvoicePlan, src.settleAccountsDepart, src.settleAccountsDepartCoding, ou.status "
+				+ "from %s src join %s ou on src.orgUnitCoding = ou.orgUnitCoding where src.supplyRoomType = %d", SupplyRoomConfig.class.getSimpleName(), OrgUnit.class.getSimpleName(), type);
+		ResultSet rs = null;
+		try {
+			rs = objectDao.executeSql(sql);
+			while(rs.next()){
+				JSONObject obj = new JSONObject();
+				obj.put("id", rs.getLong("id"));
+				obj.put("departId", rs.getString("orgUnitCoding"));
+				obj.put("name", rs.getString("orgUnitName"));
+				obj.put("sequence", rs.getInt("sequence"));
+				obj.put("spell", rs.getString("spelling"));
+				BigDecimal disposablePriceFluctuation = rs.getBigDecimal("disposablePriceFluctuation");
+				obj.put("disposablePriceFluctuation", disposablePriceFluctuation == null ? null : disposablePriceFluctuation.toString());
+				obj.put("showInvoicePlan", rs.getString("showInvoicePlan"));
+				obj.put("settleAccountsDepart", rs.getString("settleAccountsDepart"));
+				obj.put("settleAccountsDepartCoding", rs.getString("settleAccountsDepartCoding"));
+				Object status = rs.getObject("status");
+				obj.put("status", status == null ? 1 : status);
+				jsonArray.add(obj);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return jsonArray;
+	}
+
 }