Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r26394 -r26424
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 26394)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 26424)
@@ -1049,24 +1049,6 @@
 	}
 	
 	@Override
-	public List<OrgUnit> searchApplicationOrgUnitByRoomTypeSpellOrWbCode(String simpleSpell, Integer roomType, boolean useSequence) {
-		if (BooleanUtils.isFalse(useSequence)){
-			return this.searchOrgUnitByRoomTypeSpellOrWbCode(simpleSpell, roomType);
-		}
-		simpleSpell = simpleSpell.toUpperCase();
-		String hql = "select po from OrgUnit po, SupplyRoomConfig src where po.orgUnitCoding = src.orgUnitCoding and src.supplyRoomType = " 
-					+ roomType + " and src.supplyRoomType = 3 ";
-		Pattern pat = Pattern.compile("[\\u4E00-\\u9FA5]+"); // 匹配中文字符的正则表达式
-		Matcher m = pat.matcher(simpleSpell);
-		String searchMode = AcegiHelper.getLoginUser().getSearchMode();
-		if (simpleSpell.trim().length() > 0) {
-			hql += m.find() ? " and po.name like '%" + simpleSpell + "%'" : SqlUtils.getSearchSQL(searchMode, simpleSpell);
-		}
-		hql += "order by src.sequence";
-		return objectDao.findByHql(hql,-1,-1);
-	}
-
-	@Override
 	public void save(OrgUnit orgUnit) {
 		if ((orgUnit.getId() == null) || (orgUnit.getId() == 0)) {
 			orgUnit.setId(null);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r26394 -r26424
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 26394)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 26424)
@@ -1081,52 +1081,6 @@
 			e.printStackTrace();
 		}
 	}
-	/**
-	 * 获取申请科室Json
-	 * 中山一院消毒供应项目ZSYY-262
-	 * 自定义发货的接收科室，只允许输入或扫描系统中的申领科室
-	 */
-	public void getApplicationDepartJson2() {
-		String spell = StrutsParamUtils.getPraramValue("spell", "");
-		String departmentCode = StrutsParamUtils.getPraramValue("departmentCode", "");
-		String withoutBaseOrg = StrutsParamUtils.getPraramValue(
-				"withoutBaseOrg", "true");
-		List<OrgUnit> orgUnitList = new ArrayList<OrgUnit>();
-		
-		//如果指定了要加载哪个科室，则直接返回即可
-		if (StringTools.isNotBlank(departmentCode)) {
-			OrgUnit specifyDepartment = orgUnitManager.getByCode(departmentCode);
-			if (specifyDepartment != null) {
-				orgUnitList.add(specifyDepartment);
-			}
-		} else {
-			orgUnitList = orgUnitManager
-					.searchApplicationOrgUnitByRoomTypeSpellOrWbCode(spell, SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY, true);
-		}
-		
-		List<Map<String, Object>> list = new LinkedList<>();
-		if (orgUnitList != null) {
-			for (int j = 0,size = orgUnitList.size(); j < size; j++) {
-				Map<String, Object> reMap = new HashMap<>();
-				String orgCoding = orgUnitList.get(j).getOrgUnitCoding();
-				String orgName = null;
-				if (StringUtils.equals(withoutBaseOrg, "true")) {
-					orgName = orgUnitList.get(j).getName();
-				} else {
-					orgName = orgUnitList.get(j).getCurrentOrgUnitNames();
-					orgName = orgName.replace("组织机构－", "");
-				}
-				orgName = StringEscapeUtils.escapeEcmaScript(orgName);
-				reMap.put("id",orgCoding);
-				reMap.put("departCode",orgCoding);
-				reMap.put("name",orgName);
-				list.add(reMap);
-			}
-		}
-		PageEntity pageEntity = PageUtil.getPagePara();
-        pageEntity.setNeedToEscape(true);
-		PageUtil.outPutResult(pageEntity, list);
-	}
 	
 	/**
 	 * 获取申请科室Json
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r26417 -r26424
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 26417)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 26424)
@@ -6209,7 +6209,7 @@
 	 */
 	private JsonObject getOrgUnitJsonForCustomInvoice(final String barcodeStr) {
 		OrgUnit orgUnit = orgUnitManager.getOrgUnitByBarcode(barcodeStr);
-		if(orgUnit != null){
+		if(orgUnit != null && supplyRoomConfigManager.isApplicationDepartment(orgUnit.getOrgUnitCoding())){
 			JsonObject orgUnitJSONObject = new JsonObject();
 			orgUnitJSONObject.addProperty("depart", orgUnit.getName());
 			orgUnitJSONObject.addProperty("departCode", orgUnit.getOrgUnitCoding());
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
===================================================================
diff -u -r26394 -r26424
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java	(.../OrgUnitManager.java)	(revision 26394)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java	(.../OrgUnitManager.java)	(revision 26424)
@@ -245,16 +245,5 @@
 	 * @return
 	 */
 	public OrgUnit getSettleAccountsDepartment(String departmentCode);
-
-	/**
-	 * 获取申请科室
-	 * 中山一院消毒供应项目ZSYY-262
-	 * 自定义发货的接收科室，只允许输入或扫描系统中的申领科室
-	 * @param simpleSpell
-	 * @param roomType
-	 * @param useSequence
-	 * @return
-	 */
-	List<OrgUnit> searchApplicationOrgUnitByRoomTypeSpellOrWbCode(
-			String simpleSpell, Integer roomType, boolean useSequence);
+	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
===================================================================
diff -u -r26394 -r26424
--- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 26394)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 26424)
@@ -10,7 +10,7 @@
 //申请科室Store
 var appDepartJsonStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson2.do',
+		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
 		method : 'POST'
 	}),
 	reader : new Ext.data.JsonReader({