Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/orgUnitUserAmountMonthly.xls
===================================================================
diff -u -r36828 -r40385
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/monthlyPeopleCountSetting/monthlyPeopleCountSettingForm.js
===================================================================
diff -u -r36836 -r40385
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/monthlyPeopleCountSetting/monthlyPeopleCountSettingForm.js	(.../monthlyPeopleCountSettingForm.js)	(revision 36836)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/monthlyPeopleCountSetting/monthlyPeopleCountSettingForm.js	(.../monthlyPeopleCountSettingForm.js)	(revision 40385)
@@ -78,14 +78,20 @@
 	var orgUnitCode = top.Ext4.getCmp('orgUnitCode').getValue();
 	var yearMonth = top.Ext4.getCmp('yearMonth').getRawValue() + '-01';
 	var amount = top.Ext4.getCmp('amount').getValue();
+	var continuingEducationAmount = top.Ext4.getCmp('continuingEducationAmount').getValue();
+	var resignationsAmount = top.Ext4.getCmp('resignationsAmount').getValue();
+	var offTheJobAmount = top.Ext4.getCmp('offTheJobAmount').getValue();
 	var id = top.Ext4.getCmp('id').getValue();
 	Ext4.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/report/orgUnitUserAmountMonthlyAction!saveOrgUnitUserAmountMonthly.do',
 		params: {
 			orgUnitCode: orgUnitCode,
 			yearMonth: yearMonth,
 			id: id,
-			amount: amount
+			amount: amount,
+			continuingEducationAmount:continuingEducationAmount,
+			resignationsAmount:resignationsAmount,
+			offTheJobAmount:offTheJobAmount
 		},
 		success: function (response, options) {
 			var result = Ext4.JSON.decode(response.responseText);
@@ -108,10 +114,10 @@
 		frame: true,
 		labelSeparator: ':',
 		bodyStyle: 'padding:5px 5px 0px 5px;',
-		width: 400,
+		width: 500,
 		fieldDefaults: {
 			labelAlign: 'right',
-			labelWidth: 60
+			labelWidth: 90
 		},
 		buttonAlign: 'center',
 		items: [{
@@ -163,7 +169,7 @@
 				style: 'margin-bottom:10px',
 				items: [{
 					xtype: 'numberfield',
-					fieldLabel: '人数',
+					fieldLabel: '在职人数',
 					minValue: 1,
 					maxValue: 9999,
 					allowDecimals: false,
@@ -172,6 +178,54 @@
 					allowBlank: false,
 					anchor: '95%'
 				}]
+			}, {
+				columnWidth: 0.49,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				items: [{
+					xtype: 'numberfield',
+					fieldLabel: '继续教育人数',
+					minValue: 0,
+					maxValue: 9999,
+					allowDecimals: false,
+					id: 'continuingEducationAmount',
+					name: 'continuingEducationAmount',
+					allowBlank: true,
+					anchor: '95%'
+				}]
+			}, {
+				columnWidth: 0.49,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				items: [{
+					xtype: 'numberfield',
+					fieldLabel: '离职人数',
+					minValue: 0,
+					maxValue: 9999,
+					allowDecimals: false,
+					id: 'resignationsAmount',
+					name: 'resignationsAmount',
+					allowBlank: true,
+					anchor: '95%'
+				}]
+			}, {
+				columnWidth: 0.49,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				items: [{
+					xtype: 'numberfield',
+					fieldLabel: '离岗人数',
+					minValue: 0,
+					maxValue: 9999,
+					allowDecimals: false,
+					id: 'offTheJobAmount',
+					name: 'offTheJobAmount',
+					allowBlank: true,
+					anchor: '95%'
+				}]
 			}]
 		}],
 		buttons: [{
@@ -185,7 +239,7 @@
 					return false;
 				}
 				if(parseInt(amount) <= 0){
-					showResult('人数只允许大于或等于1的整数。');
+					showResult('在职人数只允许大于或等于1的整数。');
 					return
 				}
 
@@ -200,8 +254,8 @@
 		id: 'configWin',
 		layout: 'border',
 		title: '月份人数',
-		width: 400,
-		height: 150,
+		width: 500,
+		height: 250,
 		border: false,
 		plain: true,
 		modal: true,
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/monthlyPeopleCountSetting/monthlyPeopleCountSettingView.js
===================================================================
diff -u -r36828 -r40385
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/monthlyPeopleCountSetting/monthlyPeopleCountSettingView.js	(.../monthlyPeopleCountSettingView.js)	(revision 36828)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/monthlyPeopleCountSetting/monthlyPeopleCountSettingView.js	(.../monthlyPeopleCountSettingView.js)	(revision 40385)
@@ -20,7 +20,10 @@
 	var columns = [
 		{ header: "月份", dataIndex: 'yearMonth', width: 100, renderer: modifyRecord },
 		{ header: "科室名称", dataIndex: 'orgUnitName', width: 150 },
-		{ header: "人数统计", dataIndex: 'amount', width: 150 }
+		{ header: "在职人数", dataIndex: 'amount', width: 150 },
+		{ header: "继续教育人数", dataIndex: 'continuingEducationAmount', width: 150 },
+		{ header: "离职人数", dataIndex: 'resignationsAmount', width: 150 },
+		{ header: "离岗人数", dataIndex: 'offTheJobAmount', width: 150 }
 	];
 	var tbar = [{
 		text: '添加',
@@ -64,15 +67,17 @@
 			reader: {
 				root: 'data',
 				totalProperty: 'count'
-			},
-			extraParams: {}
+			}
 		},
 		fields: [
 			{ name: 'id' },
 			{ name: 'yearMonth' },
 			{ name: 'orgUnitName' },
 			{ name: 'orgUnitCode' },
-			{ name: 'amount' }
+			{ name: 'amount' },
+			{ name: 'continuingEducationAmount' },
+			{ name: 'resignationsAmount' },
+			{ name: 'offTheJobAmount' }
 		]
 	});