Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
===================================================================
diff -u -r27256 -r28639
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 27256)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 28639)
@@ -104,11 +104,12 @@
 					var currentTime = Ext4.util.Format.date(new Date(),
 							'Y-m-d');
 					// 未签收的器械包不能登记使用记录
-					if(goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord == false){
+					/* if(goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord == false){
 						showResult('该器械包未签收，不能被使用！');
 						return;
-					}
-					if ((goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord != false)|| goodsInfo.status == hadSigned) {
+					} */
+					if ((goodsInfo.status == hadShipped && goodsInfo.registUseRecordAfterSigned  == '否')|| goodsInfo.status == hadSigned) {
+					//if ((goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord != false)|| goodsInfo.status == hadSigned) {
 						if (validTime && !compareDate(currentTime, validTime)) {
 							showResult('该器械包已过期！');
 						} else {
@@ -145,7 +146,8 @@
 							}
 						}
 					} else {
-						if (sstsConfig.notSignedItemsCanRegistUseRecord == false){
+						if (goodsInfo.registUseRecordAfterSigned == '是'){
+						//if (sstsConfig.notSignedItemsCanRegistUseRecord == false){
 							showResult('器械包状态为【' + goodsInfo.status + '】，只能登记已签收并且未被使用的器械包!');
 						}
 						else{
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js
===================================================================
diff -u -r23984 -r28639
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js	(.../interfereUseRecordForm.js)	(revision 23984)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js	(.../interfereUseRecordForm.js)	(revision 28639)
@@ -142,11 +142,11 @@
                         var currentTime = Ext.util.Format.date(new Date(),
                             'Y-m-d');
                         // 未签收的器械包不能登记使用记录
-                        if (goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord == false) {
+                      /*  if (goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord == false) {
                             showResult('该器械包未签收，不能被使用！');
                             return;
-                        }
-                        if ((goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord != false) || goodsInfo.status == hadSigned) {
+                        } */
+                        if ((goodsInfo.status == hadShipped && goodsInfo.registUseRecordAfterSigned == '否') || goodsInfo.status == hadSigned) {
                             if (validTime && !compareDate(currentTime, validTime)) {
                                 showResult('该器械包已过期！');
                             } else {
@@ -193,7 +193,8 @@
                                 }
                             }
                         } else {
-                            if (sstsConfig.notSignedItemsCanRegistUseRecord == false) {
+							if (goodsInfo.registUseRecordAfterSigned == '是') {
+                          //  if (sstsConfig.notSignedItemsCanRegistUseRecord == false) {
                                 showResult('器械包状态为【' + goodsInfo.status + '】，只能登记已签收并且未被使用的器械包!');
                             }
                             else {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r28621 -r28639
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 28621)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 28639)
@@ -2630,6 +2630,30 @@
 							}
 						}
 		    	  }]
+		      },{
+		    	  columnWidth : colWidth,
+		    	  layout : 'form',
+				  labelWidth : fontSize == 12 ? 120 : 160,
+				  labelAlign:"right",
+		    	  items:[{
+		    		  xtype : 'combo',
+		    		  fieldLabel : '签收后录入使用记录',
+		    		  id : 'registUseRecordAfterSigned',
+		    		  name : 'registUseRecordAfterSigned',
+		    		  valueField : 'value',
+		    		  displayField : 'value',
+		    		  store : new Ext.data.SimpleStore( {
+		    				fields : [ 'value'],
+		    				data : [['是'],['否']]
+		    			}),
+		    		  editable : false,
+		    		  forceSelection : true,
+		    		  allowBlank : false,
+		    		  value : '否',
+		    		  mode : 'local',
+		    		  triggerAction : 'all',
+		    		  anchor : '100%'
+		    	  }]
 		      },{
 	        	  columnWidth : 1,
 		    	  layout : 'form',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r28348 -r28639
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 28348)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 28639)
@@ -610,7 +610,30 @@
 				    		  triggerAction : 'all',
 				    		  anchor : '95%'
 				    	  }]
-				      },{
+				      },{
+						  columnWidth : .33,
+						  layout : 'form',
+						  labelWidth :120,
+						  items:[{
+							  xtype : 'combo',
+							  fieldLabel : '签收后录入使用记录',
+							  id : 'registUseRecordAfterSigned',
+							  name : 'registUseRecordAfterSigned',
+							  valueField : 'value',
+							  displayField : 'value',
+							  store : new Ext.data.SimpleStore( {
+									fields : [ 'value'],
+									data : [['是'],['否']]
+								}),
+							  editable : false,
+							  forceSelection : true,
+							  allowBlank : false,
+							  value : '否',
+							  mode : 'local',
+							  triggerAction : 'all',
+							  anchor : '95%'
+						  }]
+					  },{
 			        	  columnWidth : 1,
 				    	  layout : 'form',
 						  labelWidth : 90,
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereReviewView.js
===================================================================
diff -u -r28064 -r28639
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereReviewView.js	(.../interfereReviewView.js)	(revision 28064)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereReviewView.js	(.../interfereReviewView.js)	(revision 28639)
@@ -304,8 +304,10 @@
         {header : "灭菌批号",width : 150,dataIndex : 'sterileFrequency',sortable: false,menuDisabled : true,renderer:nameAndFrequency},
         {header : "发货人",width : 60,dataIndex : 'invoiceSender',sortable: false,menuDisabled : true},
         {header : "发货时间",width : 125,dataIndex : 'invoiceSendTime',menuDisabled : false,renderer:myDateFormatBySecond,sortable: false},
-        {header : "签收人",width : 60,dataIndex : 'signedUser', hidden:sstsConfig.notSignedItemsCanRegistUseRecord!=false, sortable: false,menuDisabled : true},
-        {header : "签收时间",width : 125,dataIndex : 'signedDate', hidden:sstsConfig.notSignedItemsCanRegistUseRecord!=false, menuDisabled : false,renderer:myDateFormatBySecond,sortable: false},
+        /* {header : "签收人",width : 60,dataIndex : 'signedUser', hidden:sstsConfig.notSignedItemsCanRegistUseRecord!=false, sortable: false,menuDisabled : true},
+        {header : "签收时间",width : 125,dataIndex : 'signedDate', hidden:sstsConfig.notSignedItemsCanRegistUseRecord!=false, menuDisabled : false,renderer:myDateFormatBySecond,sortable: false}, */
+		{header : "签收人",width : 60,dataIndex : 'signedUser',sortable: false,menuDisabled : true},
+		{header : "签收时间",width : 125,dataIndex : 'signedDate',menuDisabled : false,renderer:myDateFormatBySecond,sortable: false},
         {header : "废弃时间",width : 125,dataIndex : 'wasteDate',menuDisabled : false,renderer:myDateFormatBySecond,sortable: false},
         {header : "废弃原因",width : 150,dataIndex : 'wasteReason',menuDisabled : false},
         {header : "废弃操作人",width : 70,dataIndex : 'operateUser',menuDisabled : false}
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r28572 -r28639
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 28572)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 28639)
@@ -290,12 +290,15 @@
 						var validTime = goodsInfo.validUntil;
 						var currentTime = Ext.util.Format.date(new Date(),
 								'Y-m-d');
-						// 未签收的器械包不能登记使用记录
-						if(goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord == false){
+						
+						// 未签收的器械包不能登记使用记录 //江门市中心医院JMSZXYY-88，废弃notSignedItemsCanRegistUseRecord这个配置项
+						/* if(goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord == false){
 							showResult('该器械包未签收，不能被使用！');
 							return;
-						}
-						if ((goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord != false)|| goodsInfo.status == hadSigned) {
+						} */
+											
+						//if ((goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord != false)|| goodsInfo.status == hadSigned) {
+						if ((goodsInfo.status == hadShipped && goodsInfo.registUseRecordAfterSigned  == '否')|| goodsInfo.status == hadSigned) {
 							if (validTime && !compareDate(currentTime, validTime)) {
 								showResult('该器械包已过期！');
 							} else {
@@ -353,7 +356,8 @@
 								}
 							}
 						} else {
-							if (sstsConfig.notSignedItemsCanRegistUseRecord == false){
+							//if (sstsConfig.notSignedItemsCanRegistUseRecord == false){
+						    if (goodsInfo.registUseRecordAfterSigned == '是'){
 								showResult('器械包状态为【' + goodsInfo.status + '】，只能登记已签收并且未被使用的器械包!');
 							}
 							else{
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
===================================================================
diff -u -r28582 -r28639
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js	(.../comboTousseForm.js)	(revision 28582)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js	(.../comboTousseForm.js)	(revision 28639)
@@ -1044,7 +1044,30 @@
                         labelWidth: fontSize == 12 ? 90 : 100,
                         labelAlign: "right",
                         items: [crearteHandlerDepartNameCombo(departStore)]
-                    }]
+                    },{
+					  columnWidth : .25,
+					  layout : 'form',
+					  labelWidth : fontSize == 12 ? 120 : 160,
+					  items:[{
+						  xtype : 'combo',
+						  fieldLabel : '签收后录入使用记录',
+						  id : 'registUseRecordAfterSigned',
+						  name : 'registUseRecordAfterSigned',
+						  valueField : 'value',
+						  displayField : 'value',
+						  store : new Ext.data.SimpleStore( {
+								fields : [ 'value'],
+								data : [['是'],['否']]
+							}),
+						  editable : false,
+						  forceSelection : true,
+						  allowBlank : false,
+						  value : '否',
+						  mode : 'local',
+						  triggerAction : 'all',
+						  anchor : '95%'
+					  }]
+				  }]
             }, {
                 columnWidth: 0.5,
                 layout: 'form',