Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java
===================================================================
diff -u -r40480 -r40483
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java	(.../QualityMonitoringHelper.java)	(revision 40480)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java	(.../QualityMonitoringHelper.java)	(revision 40483)
@@ -188,7 +188,14 @@
 		}
 		String dateColumnName = "抽检日期";
 		String dataType = requestParameters.get("dataType");
-		boolean enableRecordsQualifiedOfQualityMonitoringFunction = CssdUtils.getSystemSetConfigByNameBool("enableRecordsQualifiedOfQualityMonitoringFunction", false);
+		//HZSRMYY-89
+		String enableRecordsQualifiedOfQualityMonitoringFunction = CssdUtils.getSystemSetConfigByName("enableRecordsQualifiedOfQualityMonitoringFunction");
+		int enableRecordsQualifiedOfQualityMonitoringFunctionValue = 0;//ture和1为模式1（启用合格但不能录包） 2为模式2（启用合格能录包） 其它为模式0(不启用合格)
+		if("1".equals(enableRecordsQualifiedOfQualityMonitoringFunction) || "true".equals(enableRecordsQualifiedOfQualityMonitoringFunction)){
+			enableRecordsQualifiedOfQualityMonitoringFunctionValue = 1;
+		}else if("2".equals(enableRecordsQualifiedOfQualityMonitoringFunction)){
+			enableRecordsQualifiedOfQualityMonitoringFunctionValue = 2;
+		}
 		if("监测范围为灭菌炉记录的定期监测数据".equals(dataType)){
 			Map<String, Map<String ,Map<String, List<MonitoringItemBean>>>> dataTimeMap = new HashMap<String, Map<String,Map<String,List<MonitoringItemBean>>>>();
 			Map<String, Integer> dateToFrequencyAmount = new HashMap<String, Integer>();
@@ -238,7 +245,7 @@
 			obj.put("data", JSONObject.fromObject(dataTimeMap).toString());
 			obj.put("dateRowsAmountMap", JSONObject.fromObject(dateToFrequencyAmount));
 			obj.put("totalRows", totalRows);
-			if(enableRecordsQualifiedOfQualityMonitoringFunction){
+			if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 				obj.put("fixedColumnNames", new String[]{dateColumnName,"炉号","炉次","登记人","合格","备注"});
 			}else{
 				obj.put("fixedColumnNames", new String[]{dateColumnName,"炉号","炉次","登记人","备注"});
@@ -308,13 +315,13 @@
 			obj.put("dateRowsAmountMap", JSONObject.fromObject(dateToMaterialNameAmount));
 			obj.put("totalRows", totalRows);
 			if(isShowTousseMaerialSumAmount){
-				if(enableRecordsQualifiedOfQualityMonitoringFunction){
+				if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 					obj.put("fixedColumnNames", new String[]{dateColumnName,"器械包名称","器械包材料总件数","材料名称","包数","件数","位置","登记人","合格","备注"});
 				}else{
 					obj.put("fixedColumnNames", new String[]{dateColumnName,"器械包名称","器械包材料总件数","材料名称","包数","件数","位置","登记人","备注"});
 				}
 			}else{
-				if(enableRecordsQualifiedOfQualityMonitoringFunction){
+				if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 					obj.put("fixedColumnNames", new String[]{dateColumnName,"器械包名称","材料名称","包数","件数","位置","登记人","合格","备注"});
 				}else{
 					obj.put("fixedColumnNames", new String[]{dateColumnName,"器械包名称","材料名称","包数","件数","位置","登记人","备注"});
@@ -352,59 +359,59 @@
 			obj.put("totalRows", totalRows);
 			if("无菌包质量抽查登记表".equals(dataType)){
 				if(hiddenNameAndAmount){
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"灭菌器炉号","炉次","登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"灭菌器炉号","炉次","登记人","备注"});
 					}
 				}else{
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","灭菌器炉号","炉次","数量","登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","灭菌器炉号","炉次","数量","登记人","备注"});
 					}
 				}
 			}else if("质量监测".equals(monitoringType)){
 				if(hiddenNameAndAmount){
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"位置","登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"位置","登记人","备注"});
 					}
 				}else if("材料".equals(scope)){
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","件数","位置","登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","件数","位置","登记人","备注"});
 					}
 				}else if("器械包".equals(scope)){
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","包数","位置","登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","包数","位置","登记人","备注"});
 					}
 				}
 			}else if("定期监测".equals(monitoringType)){
 				if(hiddenNameAndAmount){
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"登记人","备注"});
 					}
 				}else if("材料".equals(scope)){
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","件数","登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","件数","登记人","备注"});
 					}
 				}else if("器械包".equals(scope)){
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","包数","登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","包数","登记人","备注"});
 					}
 				}else if("材料和器械包".equals(scope)){
-					if(enableRecordsQualifiedOfQualityMonitoringFunction){
+					if(enableRecordsQualifiedOfQualityMonitoringFunctionValue > 0){
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","包数","件数","登记人","合格","备注"});
 					}else{
 						obj.put("fixedColumnNames", new String[]{dateColumnName,"物品名称","包数","件数","登记人","备注"});
@@ -990,6 +997,29 @@
 						bean1.setAnswer("");
 						bean1.setPositionMsg("");
 						list.add(bean1);
+					}else if(QualityMonitoringDefinition.SCOPE_MATERIAL_AND_TOUSSE.equals(scope) || QualityMonitoringDefinition.SCOPE_MATERIAL.equals(scope)){//当没有勾选监测元素 也需要显示材料数量汇总行
+						List<MonitoringItemBean> materiaSumBeans = new ArrayList<>();
+						MonitoringItemBean bean2 = new MonitoringItemBean();
+						bean2.setGoodsName("材料数量汇总");
+						bean2.setDateTime("材料数量汇总");
+						bean2.setOrderNumber(0);
+						bean2.setOption("");
+						bean2.setQuestionName("");
+						bean2.setAmount(totalAmount);
+						bean2.setAnswer("");
+						bean2.setPositionMsg("");
+						materiaSumBeans.add(bean2);
+						requestParameters.put("materialSum", JSONArray.fromObject(materiaSumBeans).toString());
+						MonitoringItemBean bean1 = new MonitoringItemBean();
+						bean1.setGoodsName("合计");
+						bean1.setDateTime("合计");
+						bean1.setOrderNumber(0);
+						bean1.setOption("");
+						bean1.setQuestionName("");
+						bean1.setAmount(totalItem);
+						bean1.setAnswer("");
+						bean1.setPositionMsg("");
+						list.add(bean1);
 					}
 					int tousseAmoutSum = amoutSumJson.optInt("tousseAmoutSum");
 					int forgonAmoutSum = amoutSumJson.optInt("forgonAmoutSum");