Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
===================================================================
diff -u -r41254 -r41503
--- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 41254)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 41503)
@@ -173,6 +173,8 @@
   enableElementAssociation:true,
   //清洗消毒的控件格式
   controlFormatInWashanddisinfect:[{"personInCharge":1}],
+  //启用器械丢失报表显示误差类型模式
+  enableInstrumentLossReportErrorTypeMode:true,
   //禁用基数限制
   disableCardinalNumLimit: true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissItemView.js
===================================================================
diff -u -r34013 -r41503
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissItemView.js	(.../materialMissItemView.js)	(revision 34013)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissItemView.js	(.../materialMissItemView.js)	(revision 41503)
@@ -36,8 +36,17 @@
 		if("statDepart" == statType){
 			jasreportName = "materialMissView.jasper";
 		}
-		if(sstsConfig.hasOwnProperty('showRemarkColumnOfMaterialMissingOrDamageDetailReports') && sstsConfig.showRemarkColumnOfMaterialMissingOrDamageDetailReports){
+		var errorType = '';
+		if(sstsConfig.enableInstrumentLossReportErrorTypeMode){
 			if(jasreportName == "materialMissItemView.jasper"){
+				jasreportName = "materialMissItemViewShowErrorType.jasper";
+			}else if(jasreportName == "materialMissView.jasper"){
+				jasreportName = "materialMissViewShowErrorType.jasper";
+			}
+			errorType = Ext.getCmp('errorType').getValue();
+			errorType = (errorType == '全部') ? '' : errorType;
+		}else if(sstsConfig.showRemarkColumnOfMaterialMissingOrDamageDetailReports){
+			if(jasreportName == "materialMissItemView.jasper"){
 				jasreportName = "materialMissItemShowRemarkView.jasper";
 			}else if(jasreportName == "materialMissView.jasper"){
 				jasreportName = "materialMissShowRemarkView.jasper";
@@ -54,9 +63,9 @@
 			circuitNurse : circuitNurse,
 			doctorName : doctorName,
 			ancestorID : ancestorID,
+			errorType:errorType,
 			reportName:'materialMissItemView'
 		}
-
 		searchReport(url,params);
 	}
 	var userReader = new Ext.data.JsonReader( {
@@ -178,7 +187,7 @@
 						allowBlank : true
 					}]
 				}, {
-					columnWidth : .4,
+					columnWidth : .21,
 					layout : 'form',
 					items : [{
 						xtype : 'combo',
@@ -189,7 +198,7 @@
 						minChars : 0,
 						valueField : 'name',
 						displayField : 'name',
-						anchor : '48%',
+						anchor : '96%',
 						store : tousseAndDiposableGoodsStore,
 						lazyInit : true,
 						triggerAction : 'all',
@@ -203,6 +212,31 @@
 						}
 					}]
 				},{
+					layout:'form',
+					columnWidth:.19,
+					hidden:!sstsConfig.enableInstrumentLossReportErrorTypeMode,
+					items:[{
+						xtype : 'combo',
+						id : 'errorType',
+						name : 'errorType',
+						fieldLabel : '误差类型',
+						minChars : 0,
+						valueField : 'value',
+						displayField : 'value',
+						store : new Ext.data.SimpleStore({
+							fields : [ 'value'],
+							data : [['全部'],['缺失'],['增加']]
+						}),
+						mode : 'local',
+						forceSelection : true,
+						lazyInit : true,
+						anchor : '95%',
+						editable:false,
+						triggerAction : 'all',
+						typeAhead : false,
+						value: '全部'
+					}]
+				},{
 					columnWidth : .2,
 					layout : 'form',
 					items : [{
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.jsp
===================================================================
diff -u -r29513 -r41503
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.jsp	(.../materialMissTotalView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.jsp	(.../materialMissTotalView.jsp)	(revision 41503)
@@ -6,7 +6,7 @@
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="materialMissTotalView.js?version=${svnRevision}"></script>
-
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript">
 
 </script>
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.js
===================================================================
diff -u -r34013 -r41503
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.js	(.../materialMissTotalView.js)	(revision 34013)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.js	(.../materialMissTotalView.js)	(revision 41503)
@@ -28,16 +28,24 @@
 			removeMask: true
 		});
 		myMask.show();
-//		window.open(WWWROOT + "/jasperreports/jasperreportsAction!createJasperPrint.do?jasperreportName=materialMissTotalView.jasper&reportName=materialMissTotalView&startDay=" + startDate + "&endDay=" +endDate
-//					+ "&departSearch=" + departSearch + "&goodsName=" +goodsName,'thisIframe', '_self');
-		
-		
+
+		var errorType = '';
 		var statisticsType = Ext.getCmp('statisticsType').getValue();
 		var jasperreportName = 'materialErrorDamageDetail.jasper';
 		if (statisticsType == '科室') {
 			jasperreportName = 'materialErrorDamageSummaryOfDepartment.jasper';
 		}
 
+		if(sstsConfig.enableInstrumentLossReportErrorTypeMode){
+			if(jasperreportName == "materialErrorDamageDetail.jasper"){
+				jasperreportName = "materialErrorDamageDetailShowErrorType.jasper";
+			}else if(jasperreportName == "materialErrorDamageSummaryOfDepartment.jasper"){
+				jasperreportName = "materialErrorDamageSummaryOfDepartmentShowErrorType.jasper";
+			}
+			errorType = Ext.getCmp('errorType').getValue();
+			errorType = (errorType == '全部') ? '' : errorType;
+		}
+
 		var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do';
 		var params = {
 			jasperreportName : jasperreportName,
@@ -92,7 +100,7 @@
 			border : 0,
 			frame : true,
 			bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-			height : 110,
+			height : 140,
 			labelWidth : 80,
 			items : [{
 				layout : 'column',
@@ -109,7 +117,7 @@
 						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',
 						allowBlank : false,
 						value: new Date(),
-						anchor : '100%'
+						anchor : '95%'
 					}]
 				}, {
 					columnWidth:.2,
@@ -123,7 +131,7 @@
 						format:'Y-m-d',
 						allowBlank : false,
 						value: new Date(),
-						anchor : '100%'
+						anchor : '95%'
 					}]
 				} ,{
 					columnWidth:.2,
@@ -197,6 +205,31 @@
 							}
 						}
 					}]
+				},{
+					layout:'form',
+					columnWidth:.2,
+					hidden:!sstsConfig.enableInstrumentLossReportErrorTypeMode,
+					items:[{
+						xtype : 'combo',
+						id : 'errorType',
+						name : 'errorType',
+						fieldLabel : '误差类型',
+						minChars : 0,
+						valueField : 'value',
+						displayField : 'value',
+						store : new Ext.data.SimpleStore({
+							fields : [ 'value'],
+							data : [['全部'],['缺失'],['增加']]
+						}),
+						mode : 'local',
+						forceSelection : true,
+						lazyInit : true,
+						anchor : '95%',
+						editable:false,
+						triggerAction : 'all',
+						typeAhead : false,
+						value: '全部'
+					}]
 				}]
 			}],
 			buttons:[{