Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r31639 -r31657
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 31639)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 31657)
@@ -21,6 +21,136 @@
 	singleSelect : false
 });
 
+//XJJQZYY-104:使用记录增加必填项配置
+	//住院号
+	var hospitalNumAllowBlank = true
+	//诊疗号
+	var treatmentNumAllowBlank = true;
+	//洗手护士
+	var washHandNurseAllowBlank = true;
+	//巡回护士
+	var circuitNurseAllowBlank = true;
+	//手术间
+	var operationRoomAllowBlank = true;
+	//姓名
+	var patientNameAllowBlank = true;
+	//年龄
+	var patientAgeAllowBlank = true;
+	//性别
+	var patientSexAllowBlank = true;
+	//病区
+	var patientAreaAllowBlank = true;
+	//病人所在科室
+	var departNameOfpatientAllowBlank = true;
+	//病室
+	var roomNumberAllowBlank = true;
+	//床位
+	var bedNumberAllowBlank = true;
+	//身份证
+	var patientIDCardAllowBlank = true;
+	//手术医生
+	var doctorNameAllowBlank = true;
+	//主刀医生
+	var surgeonAllowBlank = true;
+	//麻醉医生
+	var anesthetistAllowBlank = true;
+	//麻醉方式
+	var anesthesiaModeAllowBlank = true;
+	//手术名称
+	var operationNameAllowBlank = true;
+	//手术单号
+	var operationScheduleIdAllowBlank = true;
+	//手术时间
+	var operationTimeAllowBlank = true;
+	//住院次数
+	var visitIdAllowBlank = true;
+	//特殊感染类型
+	var specialInfectionAllowBlank = true;
+	//备注
+	var remarkAllowBlank = true;
+
+	if(sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object'){
+		if(sstsConfig.notAllowBlankFieldsOnUseRecordPage.length > 0){
+			for(var i=0;i<sstsConfig.notAllowBlankFieldsOnUseRecordPage.length;i++){
+				var fieldName = sstsConfig.notAllowBlankFieldsOnUseRecordPage[i];
+				if(fieldName == 'hospitalNum'){
+					hospitalNumAllowBlank = false;
+				}
+				if(fieldName == 'treatmentNum'){
+					treatmentNumAllowBlank = false;
+				}
+				if(fieldName == 'washHandNurse'){
+					washHandNurseAllowBlank = false;
+				}
+				if(fieldName == 'circuitNurse'){
+					circuitNurseAllowBlank = false;
+				}
+				if(fieldName == 'operationRoom'){
+					operationRoomAllowBlank = false;
+				}
+				if(fieldName == 'patientName'){
+					patientNameAllowBlank = false;
+				}
+				if(fieldName == 'patientAge'){
+					patientAgeAllowBlank = false;
+				}
+				if(fieldName == 'patientSex'){
+					patientSexAllowBlank = false;
+				}
+				if(fieldName == 'patientArea'){
+					patientAreaAllowBlank = false;
+				}
+				if(fieldName == 'departNameOfpatient'){
+					departNameOfpatientAllowBlank = false;
+				}
+				if(fieldName == 'roomNumber'){
+					roomNumberAllowBlank = false;
+				}
+				if(fieldName == 'bedNumber'){
+					bedNumberAllowBlank = false;
+				}
+				if(fieldName == 'patientIDCard'){
+					patientIDCardAllowBlank = false;
+				}
+				if(fieldName == 'doctorName'){
+					doctorNameAllowBlank = false;
+				}
+				if(fieldName == 'surgeon'){
+					surgeonAllowBlank = false;
+				}
+				if(fieldName == 'anesthetist'){
+					anesthetistAllowBlank = false;
+				}
+				if(fieldName == 'anesthesiaMode'){
+					anesthesiaModeAllowBlank = false;
+				}
+				if(fieldName == 'operationName'){
+					operationNameAllowBlank = false;
+				}
+				if(fieldName == 'operationScheduleId'){
+					operationScheduleIdAllowBlank = false;
+				}
+				if(fieldName == 'operationTime'){
+					operationTimeAllowBlank = false;
+				}
+				if(fieldName == 'visitId'){
+					visitIdAllowBlank = false;
+				}
+				if(fieldName == 'specialInfection'){
+					specialInfectionAllowBlank = false;
+				}
+				if(fieldName == 'remark'){
+					remarkAllowBlank = false;
+				}
+			}
+		}
+	}else {
+		hospitalNumAllowBlank = fromDepartmentUseRecord || getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true);
+		washHandNurseAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false));
+		circuitNurseAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false));
+		operationRoomAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : useRecordOperationRoomAllowBlank)
+	}
+
 /**
  * 加急加急级别数据,格式如下:
  * hasLoaded:true|false, //加载过一次后该值将设为true,后面将不再加载。用于第一次扫物品条码时先进行加载,完成后再调条码接口
@@ -952,35 +1082,176 @@
 	}*/
 	//如果不为科室使用记录时
 	if(!fromDepartmentUseRecord){
-		if(getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true) == false && top.Ext.getCmp('hospitalNum').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){
-			btObj.enable();
-			top.Ext.getCmp('hospitalNum').focus();
-			showResult('住院号不能为空');
-			return result;
+		if(sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object'){
+			if(!hospitalNumAllowBlank && top.Ext.getCmp('hospitalNum').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('hospitalNum').focus();
+				showResult('住院号不能为空');
+				return result;
+			}
+			if(!treatmentNumAllowBlank && top.Ext.getCmp('treatmentNum').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('treatmentNum').focus();
+				showResult('诊疗号不能为空');
+				return result;
+			}
+			if(!washHandNurseAllowBlank && top.Ext.getCmp('washHandNurse').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('washHandNurse').focus();
+				showResult('洗手护士不能为空');
+				return result;
+			}
+			if(!circuitNurseAllowBlank && top.Ext.getCmp('circuitNurse').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('circuitNurse').focus();
+				showResult(circuitNurseLabelName+'不能为空');
+				return result;
+			}
+			if(!operationRoomAllowBlank && top.Ext.getCmp('operationRoom').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('operationRoom').focus();
+				showResult('手术间不能为空');
+				return result;
+			}
+			if(!patientNameAllowBlank && top.Ext.getCmp('patientName').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('patientName').focus();
+				showResult('姓名不能为空');
+				return result;
+			}
+			if(!patientAgeAllowBlank && top.Ext.getCmp('patientAge').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('patientAge').focus();
+				showResult('年龄不能为空');
+				return result;
+			}
+			if(!patientSexAllowBlank && top.Ext.getCmp('patientSex').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('patientSex').focus();
+				showResult('性别不能为空');
+				return result;
+			}
+			if(!patientAreaAllowBlank && top.Ext.getCmp('patientArea').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('patientArea').focus();
+				showResult('病区不能为空');
+				return result;
+			}
+			if(!departNameOfpatientAllowBlank && top.Ext.getCmp('departNameOfpatient').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('departNameOfpatient').focus();
+				showResult('病人所在科室不能为空');
+				return result;
+			}
+			if(!roomNumberAllowBlank && top.Ext.getCmp('roomNumber').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('roomNumber').focus();
+				showResult('病室不能为空');
+				return result;
+			}
+			if(!bedNumberAllowBlank && top.Ext.getCmp('bedNumber').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('bedNumber').focus();
+				showResult('床位不能为空');
+				return result;
+			}
+			if(!patientIDCardAllowBlank && top.Ext.getCmp('patientIDCard').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('patientIDCard').focus();
+				showResult('身份证不能为空');
+				return result;
+			}
+			if(!doctorNameAllowBlank && top.Ext.getCmp('doctorName').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('doctorName').focus();
+				showResult('手术医生不能为空');
+				return result;
+			}
+			if(!surgeonAllowBlank && top.Ext.getCmp('surgeon').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('surgeon').focus();
+				showResult('主刀医生不能为空');
+				return result;
+			}
+			if(!anesthetistAllowBlank && top.Ext.getCmp('anesthetist').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('anesthetist').focus();
+				showResult('麻醉医生不能为空');
+				return result;
+			}
+			if(!anesthesiaModeAllowBlank && top.Ext.getCmp('anesthesiaMode').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('anesthesiaMode').focus();
+				showResult('麻醉方式不能为空');
+				return result;
+			}
+			if(!operationNameAllowBlank && top.Ext.getCmp('operation').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('operation').focus();
+				showResult('手术名称不能为空');
+				return result;
+			}
+			if(!operationScheduleIdAllowBlank && top.Ext.getCmp('operationScheduleId').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('operationScheduleId').focus();
+				showResult('手术单号不能为空');
+				return result;
+			}
+			if(!operationTimeAllowBlank && top.Ext.getCmp('operationTime').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('operationTime').focus();
+				showResult('手术时间不能为空');
+				return result;
+			}
+			if(!visitIdAllowBlank && top.Ext.getCmp('visitId').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('visitId').focus();
+				showResult('住院次数不能为空');
+				return result;
+			}
+			if(!specialInfectionAllowBlank && top.Ext.getCmp('specialInfection').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('specialInfection').focus();
+				showResult('特殊感染类型不能为空');
+				return result;
+			}
+			if(!remarkAllowBlank && top.Ext.getCmp('remark').getValue() == ''){
+				btObj.enable();
+				top.Ext.getCmp('remark').focus();
+				showResult('备注不能为空');
+				return result;
+			}
+		}else {
+			if(getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true) == false && top.Ext.getCmp('hospitalNum').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){
+				btObj.enable();
+				top.Ext.getCmp('hospitalNum').focus();
+				showResult('住院号不能为空');
+				return result;
+			}
+			if(getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false) == false && top.Ext.getCmp('washHandNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){
+				btObj.enable();
+				top.Ext.getCmp('washHandNurse').focus();
+				showResult('洗手护士不能为空');
+				return result;
+			}
+			if(getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false) == false && top.Ext.getCmp('circuitNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){
+				btObj.enable();
+				top.Ext.getCmp('circuitNurse').focus();
+				showResult(circuitNurseLabelName + '不能为空');
+				return result;
+			}
+			if(useRecordOperationRoomAllowBlank == false && top.Ext.getCmp('operationRoom').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ 
+				btObj.enable();
+				top.Ext.getCmp('operationRoom').focus();
+				showResult('手术间不能为空');
+				return result;
+			}
+			if(!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){
+				btObj.enable();
+				showResult('请输入诊疗号或者住院号或者病人姓名');
+				return result;
+			}
 		}
-		if(getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false) == false && top.Ext.getCmp('washHandNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){
-			btObj.enable();
-			top.Ext.getCmp('washHandNurse').focus();
-			showResult('洗手护士不能为空');
-			return result;
-		}
-		if(getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false) == false && top.Ext.getCmp('circuitNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){
-			btObj.enable();
-			top.Ext.getCmp('circuitNurse').focus();
-			showResult(circuitNurseLabelName + '不能为空');
-			return result;
-		}
-		if(useRecordOperationRoomAllowBlank == false && top.Ext.getCmp('operationRoom').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ 
-			btObj.enable();
-			top.Ext.getCmp('operationRoom').focus();
-			showResult('手术间不能为空');
-			return result;
-		}
-		if(!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){
-			btObj.enable();
-			showResult('请输入诊疗号或者住院号或者病人姓名');
-			return result;
-		}
 	}
 	// 获取扫描的物品所有条码
 	var barcodes = getTousseGridData();
@@ -1914,7 +2185,7 @@
 	if(top.screen.height > 800){
 		windowHeight = 720;
 	}
-	
+
 	formObj = new top.Ext.FormPanel({
 		id : 'useRecordForm',
 		frame : true,
@@ -1991,7 +2262,7 @@
 					fieldLabel : '住院号',
 					id : 'hospitalNum',
 					name : 'hospitalNum',
-					allowBlank : fromDepartmentUseRecord || getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true),
+					allowBlank : hospitalNumAllowBlank,
 					enableKeyEvents : true,
 					maxLength:20,
 					maxLengthText :'长度超过限制，不能保存！',
@@ -2032,7 +2303,7 @@
 					fieldLabel : '诊疗号',
 					id : 'treatmentNum',
 					name : 'treatmentNum',
-					allowBlank : true,
+					allowBlank : treatmentNumAllowBlank,
 					maxLength:20,
 					maxLengthText :'长度超过限制，不能保存！',
 					enableKeyEvents : true,
@@ -2083,7 +2354,7 @@
 					triggerAction : 'all',
 					hideTrigger : true,
 					typeAhead : false,
-					allowBlank : fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false)),
+					allowBlank : washHandNurseAllowBlank,
 					anchor : '96%',
 					listeners : {
 						render : function(c){
@@ -2144,7 +2415,7 @@
 					triggerAction : 'all',
 					hideTrigger : true,
 					typeAhead : false,
-					allowBlank : fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false)),
+					allowBlank : circuitNurseAllowBlank,
 					anchor : '96%',
 					listeners : {
 						render : function(c){
@@ -2213,7 +2484,7 @@
 					name : 'operationRoom',
 					maxLength:10,
 					maxLengthText :'长度超过限制，不能保存！',
-					allowBlank : fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : useRecordOperationRoomAllowBlank),
+					allowBlank : operationRoomAllowBlank,
 					anchor : '96%',
 					valueField : 'operationRoomName',
 					displayField : 'operationRoomName',
@@ -2264,6 +2535,7 @@
 					id : 'patientName',
 					name : 'patientName',
 					anchor : '96%',
+					allowBlank : patientNameAllowBlank,
 					listeners : {
 						blur:function(){
 							validPatientInfo();
@@ -2280,8 +2552,7 @@
 					maxLength : '10',
 					id : 'patientAge',
 					name : 'patientAge',
-					//allowDecimals : false,
-					//allowNegative : false,
+					allowBlank : patientAgeAllowBlank,
 					anchor : '96%'
 				}]
 			}, {
@@ -2299,6 +2570,7 @@
 					triggerAction : 'all',
 					forceSelection : true,
 					editable : false,
+					allowBlank : patientSexAllowBlank,
 					store : new Ext.data.SimpleStore( {
 						fields : [ 'typeName' ],
 						autoLoad : true,
@@ -2311,11 +2583,23 @@
 				columnWidth : 0.33,
 				hidden:fromDepartmentUseRecord,
 				items : [{
-					xtype : 'textfield',
+					xtype : 'combo',
 					fieldLabel : '病区',
-					maxLength : '60',
+					valueField : 'patientArea',
+					displayField : 'patientArea',
 					id : 'patientArea',
 					name : 'patientArea',
+					mode : 'local',
+					listWidth :'200',
+					triggerAction : 'all',
+					forceSelection : false,
+					editable : true,
+					allowBlank : patientAreaAllowBlank,
+					store : new Ext.data.SimpleStore({
+						fields : [ 'patientArea' ],
+						autoLoad : false,
+						data :patientAreaList
+					}),
 					anchor : '96%'
 				}]
 			},{
@@ -2336,7 +2620,7 @@
 					lazyInit : true,
 					triggerAction : 'all',
 					typeAhead : false,
-					allowBlank : true,
+					allowBlank : departNameOfpatientAllowBlank,
 					anchor : '96%',
 					listeners : {
                         select : function(combo, record, index) {
@@ -2354,6 +2638,7 @@
 					maxLength : '16',
 					id : 'roomNumber',
 					name : 'roomNumber',
+					allowBlank : roomNumberAllowBlank,
 					anchor : '96%'
 				}]
 			}, {
@@ -2366,6 +2651,7 @@
 					maxLength : '16',
 					id : 'bedNumber',
 					name : 'bedNumber',
+					allowBlank : bedNumberAllowBlank,
 					anchor : '96%'
 				}]
 			}, {
@@ -2380,6 +2666,7 @@
 					name : 'patientIDCard',
 					allowDecimals : false,
 					allowNegative : false,
+					allowBlank : patientIDCardAllowBlank,
 					anchor : '96%'
 				}]
 			}, {
@@ -2392,7 +2679,7 @@
 					maxLength : '16',
 					id : 'doctorName',
 					name : 'doctorName',
-					allowBlank : true,
+					allowBlank : doctorNameAllowBlank,
 					anchor : '96%'
 				}]
 			}, {
@@ -2405,7 +2692,7 @@
 					maxLength : '16',
 					id : 'surgeon',
 					name : 'surgeon',
-					allowBlank : true,
+					allowBlank : surgeonAllowBlank,
 					anchor : '96%'
 				}]
 			}, {
@@ -2418,7 +2705,7 @@
 					maxLength : '16',
 					id : 'anesthetist',
 					name : 'anesthetist',
-					allowBlank : true,
+					allowBlank : anesthetistAllowBlank,
 					anchor : '96%'
 				}]
 			}, {
@@ -2431,7 +2718,7 @@
 					maxLength : '16',
 					id : 'anesthesiaMode',
 					name : 'anesthesiaMode',
-					allowBlank : true,
+					allowBlank : anesthesiaModeAllowBlank,
 					anchor : '96%'
 				}]
 			}, {
@@ -2451,6 +2738,7 @@
 					triggerAction : 'all',
 					hideTrigger : true,
 					typeAhead : false,
+					allowBlank : operationNameAllowBlank,
 					editable : true,
 					name : "operation",
 					id : "operation",
@@ -2466,7 +2754,7 @@
 					maxLength : '16',
 					id : 'operationScheduleId',
 					name : 'operationScheduleId',
-					allowBlank : true,
+					allowBlank : operationScheduleIdAllowBlank,
 					anchor : '96%'
 				}]
 			},{
@@ -2481,10 +2769,10 @@
 					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 					format : 'Y-m-d H:i',
 					readOnly : true,
+					allowBlank : operationTimeAllowBlank,
 					width : 150
                 }]
             },{
-
                 layout : 'form',
                 columnWidth : 0.33,
                 hidden:fromDepartmentUseRecord,
@@ -2493,11 +2781,10 @@
                     fieldLabel : '住院次数',
                     id : 'visitId',
                     name : 'visitId',
-                    allowBlank : true,
+                    allowBlank : visitIdAllowBlank,
                     anchor : '96%'
                 }]
 			},{
-
                 layout : 'form',
 				columnWidth : 0.33,
 				height:26,
@@ -2525,17 +2812,6 @@
 					format : 'Y-m-d H:i',
 					readOnly : true,
 					width : 150
-                	
-                	
-//                	xtype : 'textfield',
-//                    fieldLabel : '录入时间',
-//                    maxLength : '41',
-//                    id : 'enteringTime',
-//                    name : 'enteringTime',
-//                    readOnly : true,
-//                    allowBlank : false,
-//                    anchor : '96%',
-//                    cls : 'fieldReadOnlyNoRemove'
                 }]
             },{
                 layout : 'form',
@@ -2596,6 +2872,7 @@
 					triggerAction : 'all',
 					forceSelection : true,
 					editable : false,
+					allowBlank : specialInfectionAllowBlank,
 					store : new Ext.data.SimpleStore({
 						fields : [ 'specialInfection' ],
 						autoLoad : false,
@@ -2635,6 +2912,7 @@
 					id : 'remark',
 					name : 'remark',
 					anchor : '97%',
+					allowBlank : remarkAllowBlank,
 					height : 25
 				}]
 			},{
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
===================================================================
diff -u -r31639 -r31657
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 31639)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 31657)
@@ -29,6 +29,17 @@
     }
     tem += "]"; 
     request.setAttribute("specialInfectionList", tem);
+
+	List<String> patientAreaList = httpOptionManager.getHttpOptionTextById("patientArea");
+	String tem2 = "[";
+	if(patientAreaList!=null && patientAreaList.size() !=0){
+		for(String patientArea : patientAreaList){
+			tem2 += "['"+patientArea+"'],";
+		}
+		tem2 = tem2.substring(0, tem2.length()-1);
+	}
+	tem2 += "]"; 
+	request.setAttribute("patientAreaList", tem2);
     
     //判断当前科室是否为一级供应室,如果是则parm_s_departCoding的隐藏域不传值
     SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
@@ -57,6 +68,13 @@
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/treepanel/resources/css/column-tree.css?version=${svnRevision}"></link>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <%@ include file="/common/include_Ext42_Js.jsp"%>
+<script>
+	//是否从"科室使用记录"菜单链接过来
+	var fromDepartmentUseRecord;
+	if('${param.departmentUseRecord}' && sstsConfig.enableDepartmentUseRecord){
+		fromDepartmentUseRecord = true;
+	}
+</script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/ext/treepanel/ColumnNodeUI.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/ext/expand/js/RowExpander.js?version=${svnRevision}"></script>
@@ -103,6 +121,8 @@
 //视频类型(申请采集视频)
 var videoTypeApplication = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>';
 var specialInfectionList = ${specialInfectionList};
+var patientAreaList = ${patientAreaList};
+console.log(patientAreaList)
 //1.使用记录(病人使用记录)相关的操作权限
 var SSTS_UseRecord_Create = true;
 <operation:authorize ifAnyGranted="SSTS_UseRecord_Create">
@@ -183,12 +203,6 @@
 	}
 </operation:authorize>
 
-//是否从"科室使用记录"菜单链接过来
-var fromDepartmentUseRecord;
-if('${param.departmentUseRecord}' && sstsConfig.enableDepartmentUseRecord){
-	fromDepartmentUseRecord = true;
-}
-
 //定义源页面,用于同步病人接口
 var sourcePage_useRecord = 1;
 </script>