Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
===================================================================
diff -u -r30465 -r30481
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 30465)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 30481)
@@ -8,11 +8,19 @@
 var ALL = '全部';
 var enableMultipleBranchesOfHospital = false;
 var departSearchName = "科室";
+var limitDepart = true;
+var departMode;
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	if(sstsConfig.hasOwnProperty('enableMultipleBranchesOfHospital') && sstsConfig.enableMultipleBranchesOfHospital){
 		enableMultipleBranchesOfHospital = true;
 	}
+	if(supplyRoomType == supplyRoomTypeFirstSupplyRoom || supplyRoomType == supplyRoomTypeSecondSupplyRoom || supplyRoomType == supplyRoomTypeExpensiveGoods){
+		limitDepart = false;
+		departMode = "remote";
+	}else{
+		departMode = "local";
+	}
 	//院区数据源
 	var testRecord = Ext.data.Record.create([
 		                                		{name: 'id', type: 'long'},
@@ -64,20 +72,68 @@
 			}
 		}
 	});
-	//Ext4 申请科室Store
-	var appDepartJsonStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do?onlyOneself=false&showDisableOrgUnit=false',
-			method : 'POST'
-		}),
-		reader : new Ext.data.JsonReader({
-			root : 'data'
-		},[
-		    {name : 'id',mapping : 'departmentCode'},
-		    {name : 'name',mapping : 'departmentName'}
-		  ]
-		)
-	});
+	var departJsonStore = null;
+	var appDepartJsonStore = null;
+	if(limitDepart){
+		var departProperties = [{name : 'id'},
+		                  		{name : 'name'},
+		                  		{name : 'orgUnitName'}]
+		departJsonStore = new Ext.data.Store({
+		 	reader : new Ext.data.JsonReader({
+		 		fields : departProperties
+		 	})
+		 });
+		 var DepartRecord = Ext.data.Record.create(departProperties);
+ 		 var departRecord = new DepartRecord({
+ 			 id : orgUnitCoding,
+ 			 name : orgUnitName,
+ 			 orgUnitName : orgUnitName
+ 		 });
+ 		departJsonStore.add(departRecord);
+ 		
+ 		var appDepartProperties = [{name : 'id'},
+		                  		{name : 'name'}]
+ 		appDepartJsonStore = new Ext.data.Store({
+		 	reader : new Ext.data.JsonReader({
+		 		fields : appDepartProperties
+		 	})
+		 });
+		 var appDepartRecord = Ext.data.Record.create(appDepartProperties);
+ 		 var appDepartRecord = new DepartRecord({
+ 			 id : orgUnitCoding,
+ 			 name : orgUnitName
+ 		 });
+ 		appDepartJsonStore.add(appDepartRecord);
+	}else{
+		departJsonStore = new Ext.data.Store({
+			proxy : new Ext.data.HttpProxy({
+				url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
+				method : 'POST'
+			}),
+			reader : new Ext.data.JsonReader({
+				root : 'data'
+			},[
+			    {name : 'id',mapping : 'id'}, 
+			    {name : 'name',mapping : 'name'},
+			    {name : 'orgUnitName',mapping : 'orgUnitName'}
+			  ]
+			)
+		});
+		//Ext4 申请科室Store
+		appDepartJsonStore = new Ext.data.Store({
+			proxy : new Ext.data.HttpProxy({
+				url : WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do?onlyOneself=false&showDisableOrgUnit=false',
+				method : 'POST'
+			}),
+			reader : new Ext.data.JsonReader({
+				root : 'data'
+			},[
+			    {name : 'id',mapping : 'departmentCode'},
+			    {name : 'name',mapping : 'departmentName'}
+			  ]
+			)
+		});
+	}
 	diposableGooodsStore.load();
 	reportTypeJson = sstsConfig.patternOfAccountingMonthlyReport;
 	if(!enableMultipleBranchesOfHospital && reportTypeJson != null){
@@ -173,16 +229,19 @@
 			showResult('请选择报表格式。');
 			return false;
 		}
+		if(limitDepart){//临床科室登录,申请科室或结算科室必须有值且只能为登录科室,且不能同时为空
+			if(invoicePlanDepartCoding == '' && departSearch == ''){
+				Ext.getCmp('invoicePlanDepartSearch').focus();
+				showResult('请选择科室。');
+				return false;
+			}
+		}
 		//物品类型
 		var tousseType = $Id('tousseType').value;
 		if(tousseType == "全部"){
 			tousseType = "";
 		}
-		myMask = new Ext.LoadMask(Ext.getBody(), {
-			msg: '正在加载，请稍候！',
-			removeMask: true
-		});
-		myMask.show();
+		
 		var showCustonTousseAmount = false;
 		if(sstsConfig.hasOwnProperty('isMonthReportShowCustonTousseAmount') && sstsConfig.isMonthReportShowCustonTousseAmount){
 			showCustonTousseAmount = true;
@@ -229,7 +288,18 @@
 		}else{
 			jasperreportName = "monthReport.jasper";
 		}
-		
+		if(limitDepart){//临床科室登录,申请科室或结算科室必须有值且只能为登录科室,且不能同时为空
+			if(invoicePlanDepartCoding == '' && departSearch == ''){
+				Ext.getCmp('invoicePlanDepartSearch').focus();
+				showResult('请选择科室。');
+				return false;
+			}
+		}
+		myMask = new Ext.LoadMask(Ext.getBody(), {
+			msg: '正在加载，请稍候！',
+			removeMask: true
+		});
+		myMask.show();
 		var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do';
 		var params = {
 			jasperreportName : jasperreportName,
@@ -304,17 +374,6 @@
 			name : 'orgUnitName'
 		} ]);
 		
-		var departJsonStore = new Ext.data.Store({
-			proxy : new Ext.data.HttpProxy({
-				url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
-				method : 'POST'
-			}),
-			reader : new Ext.data.JsonReader({
-				root : 'data'
-			},departRecord
-			)
-		});
-		
 		var dt = new Date();
 		var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/1";
 		
@@ -467,59 +526,29 @@
 						queryParam : 'spell',
 						allowBlank : true,
 						store : appDepartJsonStore,
-						mode : 'remote',
+						mode : departMode,
 						triggerAction : 'all',
-						anchor : '95%',
-						listeners: {
-							select: function (combo, record, index) {
-								//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
-								/*
-								if (record.get('name') == ALL) {
-									if (record.get('checked')) {
-										combo.selectAll();
-									} else {
-										combo.deselectAll();
-									}
-								}
-								//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
-								var selectAll = true;
-								combo.store.each(function(record) {
-									if (record.get('name') != ALL && !record.get(this.checkField)) {
-										selectAll = false;
-										return;
-									}
-								}, combo);
-								var all = combo.store.getAt(0);
-								if (selectAll) {
-									all.set(combo.checkField, true);
-								} else {
-									all.set(combo.checkField, false);
-								}
-								combo.setValue(combo.getCheckedValue());*/
-							}
-						}
+						anchor : '95%'
 					}]
 				},{
 					columnWidth : .2,
 					layout : 'form',
 					labelWidth : 60,
+					labelSeparator : departSearchName+':',
 					items : [{
 						xtype : 'combo',
 						id : 'departSearch',
 						name : 'departSearch',
-						queryParam : 'spell',
-						fieldLabel : departSearchName,
-						minChars : 0,
 						valueField : 'orgUnitName',
 						displayField : 'name',
-						anchor : '95%',
-						listWidth:370,
+						minChars : 0,
+						queryParam : 'spell',
+						allowBlank : true,
 						store : departJsonStore,
-						lazyInit : true,
+						mode : departMode,
+						//listWidth:370,
 						triggerAction : 'all',
-						hideTrigger : false,
-						typeAhead : false,
-						allowBlank : true
+						anchor : '95%'
 					}]
 				},{
 					columnWidth : .2,
@@ -703,14 +732,8 @@
 	   }
 	   if(supplyRoomType == supplyRoomTypeFirstSupplyRoom || supplyRoomType == supplyRoomTypeSecondSupplyRoom || supplyRoomType == supplyRoomTypeExpensiveGoods){
 			departJsonStore.load();
+			appDepartJsonStore.load();
 	   }else{
-			Ext.getCmp('departSearch').setValue(orgUnitName);
-			var departSearch = Ext.getCmp('departSearch');
-			departSearch.setValue(orgUnitName);
-			departSearch.disable();
-			var invoicePlanDepartSearch = Ext.getCmp('invoicePlanDepartSearch');
-			invoicePlanDepartSearch.setValue(orgUnitName);
-			invoicePlanDepartSearch.disable();			
+			Ext.getCmp('invoicePlanDepartSearch').setValue(orgUnitCoding);	
 	   }
-	   appDepartJsonStore.load();
 	});
\ No newline at end of file
Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml
===================================================================
diff -u -r30464 -r30481
--- ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml	(.../monthReportHideApplicationDepart.jrxml)	(revision 30464)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml	(.../monthReportHideApplicationDepart.jrxml)	(revision 30481)
@@ -120,7 +120,9 @@
 								<bottomPen lineWidth="0.5"/>
 								<rightPen lineWidth="0.5"/>
 							</box>
-							<textElement verticalAlignment="Middle"/>
+							<textElement verticalAlignment="Middle">
+								<font size="12" isBold="false" isItalic="false"/>
+							</textElement>
 							<textFieldExpression><![CDATA[$P{setDepartShowNameParam}]]></textFieldExpression>
 						</textField>
 					</cellContents>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jasper
===================================================================
diff -u -r30464 -r30481
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp
===================================================================
diff -u -r29996 -r30481
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp	(.../departmentMonthlyView.jsp)	(revision 29996)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp	(.../departmentMonthlyView.jsp)	(revision 30481)
@@ -33,9 +33,11 @@
    		request.setAttribute("orgUnitName",orgUnitName);
 	}
     request.setAttribute("supplyRoomType",supplyRoomType);
+    request.setAttribute("orgUnitCoding",orgUnitCoding);
  %>
  <script type="text/javascript">
     var orgUnitName = '${orgUnitName}';
+    var orgUnitCoding = '${orgUnitCoding}';
     var supplyRoomTypeFirstSupplyRoom = '<%=SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM %>';
     var supplyRoomTypeSecondSupplyRoom = '<%=SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM %>';
     var supplyRoomTypeExpensiveGoods = '<%=SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY %>';