Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java
===================================================================
diff -u -r38144 -r38233
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java	(.../ModifyTousseDefinitionDto.java)	(revision 38144)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java	(.../ModifyTousseDefinitionDto.java)	(revision 38233)
@@ -108,6 +108,12 @@
 	 * 资产归属(科室编码)
 	 */
 	private String assetsBelongCode;
+	
+	/**
+	 * “配包注意事项提醒”,用于控制当前器械包在装配时，是否弹出查看配包注意事项提示框，默认值为是(ZJYY-153)
+	 */
+	private String showTousseNote;
+	
 	public List<Long> getTousseDefinitionIds() {
 		return tousseDefinitionIds;
 	}
@@ -286,4 +292,12 @@
 		this.optionalSterilizationIds = optionalSterilizationIds;
 	}
 
+	public String getShowTousseNote() {
+		return showTousseNote;
+	}
+	
+	public void setShowTousseNote(String showTousseNote) {
+		this.showTousseNote = showTousseNote;
+	}
+
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r37446 -r38233
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 37446)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 38233)
@@ -468,6 +468,11 @@
 	private TousseDefinitionNote tdNote;
 	
 	/**
+	 * “配包注意事项提醒”,用于控制当前器械包在装配时，是否弹出查看配包注意事项提示框，默认值为是(ZJYY-153)
+	 */
+	private String showTousseNote = Constants.STR_YES;
+	
+	/**
 	 * 配包教学视频名称,目前只支持一个
 	 */
 	private String uuid_vedioNames;
@@ -1502,6 +1507,15 @@
 		this.tdNote = tdNote;
 	}
 
+	@Column(columnDefinition=" varchar(20) default '" + Constants.STR_YES + "' not null ")
+	public String getShowTousseNote() {
+		return showTousseNote;
+	}
+
+	public void setShowTousseNote(String showTousseNote) {
+		this.showTousseNote = showTousseNote;
+	}
+
 	public String getUuid_vedioNames() {
 		return uuid_vedioNames;
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r38144 -r38233
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 38144)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 38233)
@@ -5437,6 +5437,7 @@
 		String registUseRecordAfterSigned = modifyTousseDefinitionDto.getRegistUseRecordAfterSigned();//签收后录入使用记录
 		Integer printAmount = modifyTousseDefinitionDto.getPrintAmount();//打印份数
 		String assetsBelongCode = modifyTousseDefinitionDto.getAssetsBelongCode();//资产归属
+		String showTousseNote = modifyTousseDefinitionDto.getShowTousseNote();//“配包注意事项提醒”
 		//改动记录集合
 		List<DataModifyRecord> dataModifyRecordList = new ArrayList<DataModifyRecord>();
 		Date modifyDateTime = new Date();
@@ -5468,7 +5469,8 @@
 				|| integral != null
 				|| StringUtils.isNotBlank(registUseRecordAfterSigned)
 				|| printAmount != null
-				|| StringUtils.isNotBlank(assetsBelongCode)){
+				|| StringUtils.isNotBlank(assetsBelongCode)
+				|| StringUtils.isNotBlank(showTousseNote)){
 			for (TousseDefinition tousseDefinition : needModifys) {
 				//若修改属性不为空则修改
 				if(StringUtils.isNotEmpty(isDisable) && !StringUtils.equals(tousseDefinition.getIsDisable(), isDisable)){//是否停用
@@ -5557,6 +5559,11 @@
 						filedValueMap.put("printAmount", printAmount);
 					}
 				}
+				//“批量修改”功能中新增字段“配包注意事项提醒”ZJYY-153
+				if(StringUtils.isNotEmpty(showTousseNote) && !StringUtils.equals(tousseDefinition.getShowTousseNote(), showTousseNote)){//showTousseNote
+					addDataModifyRecord(dataModifyRecordList, tousseDefinition, tousseDefinition.getShowTousseNote(), showTousseNote, modifyDateTime, modifyUserID, "配包注意事项提醒", "showTousseNote");
+					filedValueMap.put("showTousseNote", showTousseNote);
+				}
 			}
 		}
 		
@@ -6240,7 +6247,8 @@
 		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.integral, po.printAmount, po.registUseRecordAfterSigned "
+				+ "po.isRecycling, po.isPacking, po.isReview, po.isConvertApplyGoods, po.integral, po.printAmount, po.registUseRecordAfterSigned"
+				+ ", po.assetsBelongCode, po.showTousseNote "
 				+ "from %s po where %s ",
 				TousseDefinition.class.getSimpleName(),
 				SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", tousseDefinitionIds));
@@ -6276,6 +6284,8 @@
 				Integer printAmount = map.get("printAmount") == null ? null : ((Number)map.get("printAmount")).intValue();
 				td.setPrintAmount(printAmount);
 				td.setRegistUseRecordAfterSigned((String) map.get("registUseRecordAfterSigned"));
+				td.setAssetsBelongCode((String) map.get("assetsBelongCode"));
+				td.setShowTousseNote((String) map.get("showTousseNote"));
 				result.add(td);
 			}
 		}