Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js
===================================================================
diff -u -r33112 -r33128
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 33112)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 33128)
@@ -38,7 +38,9 @@
 	if (infected == '是') {
 		infectDisease = top.Ext4.getCmp('infectDisease').getValue().value || '';
 		var infectDisease6 = top.Ext4.getCmp('infectDisease6Value').getValue() || '';
-		infectDisease = infectDisease.join(';');
+		if (typeof infectDisease == 'object') {
+			infectDisease = infectDisease.join(';');
+		}
 		if (infectDisease6 !== '') {
 			var value = top.Ext4.getCmp('infectDisease6Value').getValue();
 			if (value !== '') {
@@ -201,13 +203,15 @@
 						top.Ext4.getCmp('materialDefinitionID').setValue(list.materialDefinitionID);
 						top.Ext4.getCmp('tousseDefinitionName').setRawValue(list.tousseDefinitionName);
 						top.Ext4.getCmp('tousseDefinitionID').setValue(list.tousseDefinitionID);
+						top.Ext4.getCmp('hiddenTousseDefinitionName').setValue(list.tousseDefinitionName);
 						top.Ext4.getCmp('amount').setValue(list.amount);
 					} else {
 						addTousseItems(i);
 						top.Ext4.getCmp('materialDefinitionName_' + i).setRawValue(list.materialDefinitionName);
 						top.Ext4.getCmp('materialDefinitionID_' + i).setValue(list.materialDefinitionID);
 						top.Ext4.getCmp('tousseDefinitionName_' + i).setRawValue(list.tousseDefinitionName);
 						top.Ext4.getCmp('tousseDefinitionID_' + i).setValue(list.tousseDefinitionID);
+						top.Ext4.getCmp('hiddenTousseDefinitionName_' + i).setValue(list.tousseDefinitionName);
 						top.Ext4.getCmp('amount_' + i).setValue(list.amount);
 						tousseArray.push(i);
 					}
@@ -259,15 +263,18 @@
 	}
 	if (!timeObj.outHandoverDateTimeIsHidden) {
 		top.Ext4.getCmp('outHandoverDateTime').allowBlank = true;
+		top.Ext4.getCmp('outHandoverDateTime').setValue('');
 	}
 	if (!timeObj.returnHandoverUserNameIsHidden) {
 		top.Ext4.getCmp('returnHandoverUserName').allowBlank = true;
 	}
 	if (!timeObj.returnHandoverDateTimeIsHidden) {
 		top.Ext4.getCmp('returnHandoverDateTime').allowBlank = true;
+		top.Ext4.getCmp('returnHandoverDateTime').setValue('');
 	}
 	if (!timeObj.discardDateTimeIsHidden) {
 		top.Ext4.getCmp('discardDateTime').allowBlank = true;
+		top.Ext4.getCmp('discardDateTime').setValue('');
 	}
 
 	if (status == '维修中') {
@@ -276,17 +283,20 @@
 		}
 		if (!timeObj.outHandoverDateTimeIsHidden) {
 			top.Ext4.getCmp('outHandoverDateTime').allowBlank = false;
+			top.Ext4.getCmp('outHandoverDateTime').setValue(new Date(newDate));
 		}
-	} else if (status == '已修好') {
+	} else if (status == '已维修') {
 		if (!timeObj.returnHandoverUserNameIsHidden) {
 			top.Ext4.getCmp('returnHandoverUserName').allowBlank = false;
 		}
 		if (!timeObj.returnHandoverDateTimeIsHidden) {
 			top.Ext4.getCmp('returnHandoverDateTime').allowBlank = false;
+			top.Ext4.getCmp('returnHandoverDateTime').setValue(new Date(newDate));
 		}
 	} else if (status == '报废') {
 		if (!timeObj.discardDateTimeIsHidden) {
 			top.Ext4.getCmp('discardDateTime').allowBlank = false;
+			top.Ext4.getCmp('discardDateTime').setValue(new Date(newDate));
 		}
 	}
 }
@@ -304,6 +314,10 @@
 			id: 'materialDefinitionID_' + index,
 			name: 'materialDefinitionID_' + index
 		}, {
+			xtype: 'hidden',
+			id: 'hiddenMaterialDefinitionName_' + index,
+			name: 'hiddenMaterialDefinitionName_' + index
+		}, {
 			xtype: 'combo',
 			fieldLabel: '器械名称',
 			id: 'materialDefinitionName_' + index,
@@ -314,7 +328,6 @@
 			displayField: 'name',
 			store: getMaterialDefinition(),
 			lazyInit: true,
-			forceSelection: true,
 			triggerAction: 'all',
 			hideTrigger: true,
 			typeAhead: false,
@@ -323,6 +336,16 @@
 			listeners: {
 				select: function (combo, record, zIndex) {
 					top.Ext4.getCmp('materialDefinitionID_' + index).setValue(record[0].data.id);
+					top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue(record[0].data.name);
+				},
+				blur: function (field) {
+					var hiddenMaterialDefinitionName = top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).getValue();
+					var materialDefinitionName = top.Ext4.getCmp('materialDefinitionName_' + index).getRawValue();
+					if (materialDefinitionName !== hiddenMaterialDefinitionName) {
+						top.Ext4.getCmp('materialDefinitionID_' + index).setValue('');
+						top.Ext4.getCmp('materialDefinitionName_' + index).setValue('');
+						top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue('');
+					}
 				}
 			}
 		}]
@@ -360,6 +383,10 @@
 			id: 'tousseDefinitionID_' + index,
 			name: 'tousseDefinitionID_' + index
 		}, {
+			xtype: 'hidden',
+			id: 'hiddenTousseDefinitionName_' + index,
+			name: 'hiddenTousseDefinitionName_' + index
+		}, {
 			xtype: 'combo',
 			fieldLabel: '所属器械包',
 			id: 'tousseDefinitionName_' + index,
@@ -370,7 +397,7 @@
 			displayField: 'name',
 			store: getTousseDefinition(),
 			lazyInit: true,
-			forceSelection: true,
+			forceSelection: false,
 			triggerAction: 'all',
 			hideTrigger: true,
 			typeAhead: false,
@@ -379,6 +406,16 @@
 			listeners: {
 				select: function (combo, record, zIndex) {
 					top.Ext4.getCmp('tousseDefinitionID_' + index).setValue(record[0].data.id);
+					top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).setValue(record[0].data.name);
+				},
+				blur: function (field) {
+					var hiddenTousseDefinitionName = top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).getValue();
+					var tousseDefinitionName = top.Ext4.getCmp('tousseDefinitionName_' + index).getRawValue();
+					if (tousseDefinitionName !== hiddenTousseDefinitionName) {
+						top.Ext4.getCmp('tousseDefinitionID_' + index).setValue('');
+						top.Ext4.getCmp('tousseDefinitionName_' + index).setValue('');
+						top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).setValue('');
+					}
 				}
 			}
 		}]
@@ -391,12 +428,14 @@
 		items: [{
 			xtype: 'numberfield',
 			allowDecimals: false,
+			minValue: 1,
 			name: 'amount_' + index,
 			id: 'amount_' + index,
 			fieldLabel: "数量",
 			allowBlank: false,
 			blankText: '数量不能为空',
-			anchor: '95%'
+			anchor: '95%',
+			value: 1
 		}]
 	}]
 	top.Ext4.getCmp('tousseItem').add(item);
@@ -423,7 +462,7 @@
 	tousseArray = [];
 	var repairStatusStore = new Ext4.data.Store({
 		fields: [{ name: 'value' }],
-		data: [{ value: '维修中' }, { value: '待维修' }, { value: '已修好' }, { value: '报废' }]
+		data: [{ value: '维修中' }, { value: '待维修' }, { value: '已维修' }, { value: '报废' }]
 	});
 	var roomNumberIsHidden = false;
 	var washHandNurseNameIsHidden = false;
@@ -585,6 +624,10 @@
 					id: 'materialDefinitionID',
 					name: 'materialDefinitionID'
 				}, {
+					xtype: 'hidden',
+					id: 'hiddenMaterialDefinitionName',
+					name: 'hiddenMaterialDefinitionName'
+				}, {
 					xtype: 'combo',
 					fieldLabel: '器械名称',
 					id: 'materialDefinitionName',
@@ -595,7 +638,6 @@
 					displayField: 'name',
 					store: getMaterialDefinition(),
 					lazyInit: true,
-					forceSelection: true,
 					triggerAction: 'all',
 					hideTrigger: true,
 					typeAhead: false,
@@ -604,6 +646,16 @@
 					listeners: {
 						select: function (combo, record, index) {
 							top.Ext4.getCmp('materialDefinitionID').setValue(record[0].data.id);
+							top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue(record[0].data.name);
+						},
+						blur: function (field) {
+							var hiddenMaterialDefinitionName = top.Ext4.getCmp('hiddenMaterialDefinitionName').getValue();
+							var materialDefinitionName = top.Ext4.getCmp('materialDefinitionName').getRawValue();
+							if (materialDefinitionName !== hiddenMaterialDefinitionName) {
+								top.Ext4.getCmp('materialDefinitionID').setValue('');
+								top.Ext4.getCmp('materialDefinitionName').setValue('');
+								top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue('');
+							}
 						}
 					}
 				}]
@@ -640,6 +692,10 @@
 					id: 'tousseDefinitionID',
 					name: 'tousseDefinitionID'
 				}, {
+					xtype: 'hidden',
+					id: 'hiddenTousseDefinitionName',
+					name: 'hiddenTousseDefinitionName'
+				}, {
 					xtype: 'combo',
 					fieldLabel: '所属器械包',
 					id: 'tousseDefinitionName',
@@ -650,7 +706,6 @@
 					displayField: 'name',
 					store: getTousseDefinition(),
 					lazyInit: true,
-					forceSelection: true,
 					triggerAction: 'all',
 					hideTrigger: true,
 					typeAhead: false,
@@ -659,6 +714,16 @@
 					listeners: {
 						select: function (combo, record, index) {
 							top.Ext4.getCmp('tousseDefinitionID').setValue(record[0].data.id);
+							top.Ext4.getCmp('hiddenTousseDefinitionName').setValue(record[0].data.name);
+						},
+						blur: function (field) {
+							var hiddenTousseDefinitionName = top.Ext4.getCmp('hiddenTousseDefinitionName').getValue();
+							var tousseDefinitionName = top.Ext4.getCmp('tousseDefinitionName').getRawValue();
+							if (tousseDefinitionName !== hiddenTousseDefinitionName) {
+								top.Ext4.getCmp('tousseDefinitionID').setValue('');
+								top.Ext4.getCmp('tousseDefinitionName').setValue('');
+								top.Ext4.getCmp('hiddenTousseDefinitionName').setValue('');
+							}
 						}
 					}
 				}]
@@ -670,12 +735,14 @@
 				items: [{
 					xtype: 'numberfield',
 					allowDecimals: false,
+					minValue: 1,
 					name: 'amount',
 					id: 'amount',
 					fieldLabel: "数量",
 					allowBlank: false,
 					blankText: '数量不能为空',
-					anchor: '95%'
+					anchor: '95%',
+					value: 1
 				}]
 			}, {
 				columnWidth: 1,
@@ -938,6 +1005,7 @@
 					id: 'infectDisease',
 					name: 'infectDisease',
 					fieldLabel: '　',
+					labelSeparator: '',
 					labelWidth: 100,
 					xtype: 'checkboxgroup',
 					vertical: true,
@@ -1179,6 +1247,8 @@
 	win.show();
 	if ((id || '') !== '') {
 		loadInstrumentRepair(id);
+	} else {
+		top.Ext4.getCmp('registrantName').setRawValue(currentUserFullName);
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp
===================================================================
diff -u -r33112 -r33128
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp	(.../instrumentRepairManagementView.jsp)	(revision 33112)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp	(.../instrumentRepairManagementView.jsp)	(revision 33128)
@@ -1,10 +1,12 @@
 <%@page import="java.util.Date"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@ page import="com.forgon.directory.acegi.tools.AcegiHelper"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%
     SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy/MM/dd HH:mm");
     request.setAttribute("newDate", dateFormat.format(new Date()));
+    String currentUserFullName = AcegiHelper.getLoginUser().getUserFullName();
 %>
 <html>
 <head>
@@ -16,6 +18,7 @@
 <body>
 <script>
     var newDate = "${newDate}";
+    var currentUserFullName = '<%=currentUserFullName%>';
     /**
      * 《器械维修记录维护》权限
      */
Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.js
===================================================================
diff -u -r33112 -r33128
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.js	(.../instrumentRepairManagementView.js)	(revision 33112)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.js	(.../instrumentRepairManagementView.js)	(revision 33128)
@@ -30,7 +30,7 @@
 		color = "#F7EF18";//黄色
 	} else if (v == '维修中') {
 		color = "#F20B0B";//红色
-	} else if (v == '已修好') {
+	} else if (v == '已维修') {
 		color = "#56D515";//绿色
 	} else {
 		color = "#fff";//白色
@@ -264,6 +264,11 @@
 				text: '状态'
 			}, {
 				xtype: 'menucheckitem',
+				name: 'materialNameAndAmount',
+				checked: true,
+				text: '器械名称'
+			}, {
+				xtype: 'menucheckitem',
 				name: 'roomNumber',
 				checked: true,
 				text: '房间号'