Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r34440 -r34491
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 34440)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 34491)
@@ -4883,6 +4883,7 @@
 		String isConvertApplyGoods = modifyTousseDefinitionDto.getIsConvertApplyGoods();//是否转换申请物品
 		String belongOrgUnitCodes = modifyTousseDefinitionDto.getBelongOrgUnitCodes();//所属科室编码：1;2;3
 		String instrumentSetTypeIds = modifyTousseDefinitionDto.getInstrumentSetTypeIds();//器械包所属种类ID：1;2;3
+		Double integral = modifyTousseDefinitionDto.getIntegral();//积分系数
 
 		//改动记录集合
 		List<DataModifyRecord> dataModifyRecordList = new ArrayList<DataModifyRecord>();
@@ -4911,7 +4912,8 @@
 				|| StringUtils.isNotEmpty(barcodePaperType) || StringUtils.isNotEmpty(sterilingMethod)
 				|| StringUtils.isNotEmpty(tousseGroupID) || StringUtils.isNotEmpty(tousseGroupName)
 				|| StringUtils.isNotEmpty(isRecycling) || StringUtils.isNotEmpty(isPacking)
-				|| StringUtils.isNotEmpty(isReview) || StringUtils.isNotEmpty(isConvertApplyGoods))){
+				|| StringUtils.isNotEmpty(isReview) || StringUtils.isNotEmpty(isConvertApplyGoods))
+				|| integral != null){
 			for (TousseDefinition tousseDefinition : needModifys) {
 				//若修改属性不为空则修改
 				if(StringUtils.isNotEmpty(isDisable) && !StringUtils.equals(tousseDefinition.getIsDisable(), isDisable)){//是否停用
@@ -4966,6 +4968,14 @@
 					addDataModifyRecord(dataModifyRecordList, tousseDefinition, tousseDefinition.getIsConvertApplyGoods(), isConvertApplyGoods, modifyDateTime, modifyUserID, "是否转换申请物品", "isConvertApplyGoods");
 					filedValueMap.put("isConvertApplyGoods", isConvertApplyGoods);
 				}
+				if(integral != null){
+					double newIntegral = integral.doubleValue();
+					double oldintegral = tousseDefinition.getIntegral() == null ? 0.0d : tousseDefinition.getIntegral().doubleValue();
+					if(newIntegral != oldintegral){
+						addDataModifyRecord(dataModifyRecordList, tousseDefinition, oldintegral+"", newIntegral+"", modifyDateTime, modifyUserID, "积分系数", "integral");
+						filedValueMap.put("integral", integral);
+					}
+				}
 				// GDSZYY-63 器械包定义管理页面通过批量修改应该不允许修改消毒物品的价格
 				if(StringUtils.isNotEmpty(price) && !StringUtils.equals(price, tousseDefinition.getPrice()+"")
 						&& !StringUtils.equals(tousseDefinition.getTousseType(), TousseDefinition.PACKAGE_TYPE_DISINFECTION)){//价格
@@ -5453,7 +5463,7 @@
 		String sql = String.format("select po.id, po.name, po.tousseType, po.price, po.borrowPrice, po.packageType,"
 				+ "po.packageSize, po.isDisable, po.taskGroup, po.barcodePaperType,"
 				+ "po.sterilingMethod, po.tousseGroupID, po.tousseGroupName, "
-				+ "po.isRecycling, po.isPacking, po.isReview, po.isConvertApplyGoods "
+				+ "po.isRecycling, po.isPacking, po.isReview, po.isConvertApplyGoods, po.integral "
 				+ "from %s po where %s ",
 				TousseDefinition.class.getSimpleName(),
 				SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", tousseDefinitionIds));
@@ -5466,12 +5476,14 @@
 				Double price = map.get("price") == null ? null : ((Number)map.get("price")).doubleValue();
 				Double borrowPrice = map.get("borrowPrice") == null ? null : ((Number)map.get("borrowPrice")).doubleValue();
 				Long tousseGroupID = map.get("tousseGroupID") == null ? null : ((Number)map.get("tousseGroupID")).longValue();
+				Double integral = map.get("integral") == null ? null : ((Number)map.get("integral")).doubleValue();
 				TousseDefinition td = new TousseDefinition();
 				td.setId(id);
 				td.setName(name);
 				td.setTousseType(tousseType);
 				td.setPrice(price);
 				td.setBorrowPrice(borrowPrice);
+				td.setIntegral(integral);
 				td.setPackageType((String) map.get("packageType"));
 				td.setPackageSize((String) map.get("packageSize"));
 				td.setIsDisable((String) map.get("isDisable"));
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java
===================================================================
diff -u -r34157 -r34491
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java	(.../ModifyTousseDefinitionDto.java)	(revision 34157)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java	(.../ModifyTousseDefinitionDto.java)	(revision 34491)
@@ -84,6 +84,11 @@
 	 */
 	private String instrumentSetTypeIds;
 	
+	/**
+	 * 积分HBTSGRYY-7(增加批量修改器械包积分系数)
+	 */
+	private Double integral;
+	
 	public List<Long> getTousseDefinitionIds() {
 		return tousseDefinitionIds;
 	}
@@ -220,4 +225,12 @@
 		this.instrumentSetTypeIds = instrumentSetTypeIds;
 	}
 
+	public Double getIntegral() {
+		return integral;
+	}
+	
+	public void setIntegral(Double integral) {
+		this.integral = integral;
+	}
+
 }