Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/datamodifyrecord/service/DataModifyRecordManagerImpl.java
===================================================================
diff -u -r34157 -r34958
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/datamodifyrecord/service/DataModifyRecordManagerImpl.java	(.../DataModifyRecordManagerImpl.java)	(revision 34157)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/datamodifyrecord/service/DataModifyRecordManagerImpl.java	(.../DataModifyRecordManagerImpl.java)	(revision 34958)
@@ -68,7 +68,7 @@
 			return;
 		}
 		//构造DataModifyRecord对象
-		List<DataModifyRecord> dataModifyRecordList = getDataModifyRecordList(oldObject, resultMap, modifyType);
+		List<DataModifyRecord> dataModifyRecordList = getDataModifyRecordList(newObject, resultMap, modifyType);
 		if(CollectionUtils.isNotEmpty(dataModifyRecordList)){
 			for (DataModifyRecord dataModifyRecord : dataModifyRecordList) {
 				if(CollectionUtils.isNotEmpty(ignoreCompareField)
@@ -108,12 +108,12 @@
 
 	/**
 	 * 构造DataModifyRecord
-	 * @param oldObject
+	 * @param newObject
 	 * @param resultMap
 	 * @param modifyType
 	 * @return
 	 */
-	private List<DataModifyRecord> getDataModifyRecordList(Object oldObject, Map<String, Map<String, String>> resultMap, String modifyType) {
+	private List<DataModifyRecord> getDataModifyRecordList(Object newObject, Map<String, Map<String, String>> resultMap, String modifyType) {
 		List<DataModifyRecord> dataModifyRecordList = new ArrayList<DataModifyRecord>();
 		if(MapUtils.isEmpty(resultMap)){
 			return null;
@@ -136,39 +136,39 @@
 			dataModifyRecordList.add(dataModifyRecord);
 		}
 		
-		return setModifyDetail(dataModifyRecordList, oldObject, modifyType);
+		return setModifyDetail(dataModifyRecordList, newObject, modifyType);
 	}
 
 	/**
 	 * 增加修改字段的中文说明
 	 * @param dataModifyRecordList
-	 * @param oldObject
+	 * @param newObject
 	 */
-	private List<DataModifyRecord> setModifyDetail(List<DataModifyRecord> dataModifyRecordList, Object oldObject, String modifyType) {
+	private List<DataModifyRecord> setModifyDetail(List<DataModifyRecord> dataModifyRecordList, Object newObject, String modifyType) {
 		List<DataModifyRecord> newDataModifyRecordList = new ArrayList<DataModifyRecord>();
-		if(CollectionUtils.isEmpty(dataModifyRecordList) || oldObject== null){
+		if(CollectionUtils.isEmpty(dataModifyRecordList) || newObject== null){
 			return newDataModifyRecordList;
 		}
 		Long objectID = null;
 		String modifyRecordModel = "";
-		if(oldObject instanceof TousseDefinition){
-			TousseDefinition td = (TousseDefinition) oldObject;
+		if(newObject instanceof TousseDefinition){
+			TousseDefinition td = (TousseDefinition) newObject;
 			objectID = td.getId();
 			modifyRecordModel = DataModifyRecord.MODEL_TOUSSEDEFINITION;
 		}
 		if(objectID == null){
 			return newDataModifyRecordList;
 		}
 		//修改字段的中文名称
-		Map<String, String> chineseFiledNameMap = getChineseFiledNameMap(oldObject, modifyType);
+		Map<String, String> chineseFiledNameMap = getChineseFiledNameMap(newObject, modifyType);
 		for (DataModifyRecord dataModifyRecord : dataModifyRecordList) {
 			dataModifyRecord.setModifyRecordModel(modifyRecordModel);
 			dataModifyRecord.setObjectID(objectID);
 			String chineseFieldName = chineseFiledNameMap.get(dataModifyRecord.getModifyField());
 			if(chineseFieldName != null){
 				dataModifyRecord.setModifyDetail(chineseFieldName);
+				newDataModifyRecordList.add(dataModifyRecord);
 			}
-			newDataModifyRecordList.add(dataModifyRecord);
 		}
 		return newDataModifyRecordList;
 	}
@@ -221,7 +221,7 @@
 			chineseFiledNameMap.put("isUploadImage", "是否已上传图片");
 			chineseFiledNameMap.put("isUploadVideo", "是否已上传视频");
 			chineseFiledNameMap.put("limitInvoiceDepart", "是否限制发货科室");
-			chineseFiledNameMap.put("materialsMD5", "materialsMD5");
+			chineseFiledNameMap.put("materialsMD5", "材料MD5码");
 			chineseFiledNameMap.put("moreBoxPacked", "是否多层盒装");
 			
 			chineseFiledNameMap.put("maintainIntervalCount", "保养间隔次数");
@@ -265,6 +265,40 @@
 			chineseFiledNameMap.put("isApplyEntireTousse", "是否整包申请");
 			chineseFiledNameMap.put("integral", "积分系数");
 			
+			chineseFiledNameMap.put("spelling", "拼音码");
+			chineseFiledNameMap.put("wbCode", "五笔码");
+			chineseFiledNameMap.put("weight", "重量");
+			chineseFiledNameMap.put("allowModifyPackageType", "允许修改包装类型");
+			chineseFiledNameMap.put("hideAuxiliaryInvoice", "是否隐藏辅助发货物品");
+			
+			chineseFiledNameMap.put("isForDisplay", "是否显示");
+			chineseFiledNameMap.put("expressInvoice", "是否快速发货");
+			chineseFiledNameMap.put("isPriorConvertApplyGoods", "是否优先转换");
+			chineseFiledNameMap.put("recyclingApplicationID", "回收申请单ID");
+			chineseFiledNameMap.put("invoicePlanID", "申请单ID");
+			
+			chineseFiledNameMap.put("parentID", "父包定义ID");
+			chineseFiledNameMap.put("ancestorID", "祖先包定义ID");
+			chineseFiledNameMap.put("foreignToussePrintAmount", "外来器械包所在的申请单打印份数");
+			chineseFiledNameMap.put("printAmountSource", "打印份数来源");
+			chineseFiledNameMap.put("autoDiscardCount", "自动废弃标识牌的次数");
+			
+			chineseFiledNameMap.put("urgentWarningValue", "加急预警值");
+			chineseFiledNameMap.put("hidePackingTask", "是否隐藏装配任务");
+			chineseFiledNameMap.put("splitNumber", "外来器械包在装配时拆分的份数");
+			chineseFiledNameMap.put("invoiceAmountMode", "发货数量计算方式");
+			chineseFiledNameMap.put("maxIDCardNum", "最大标识牌数量");
+			
+			chineseFiledNameMap.put("needInspectMaterials", "装配时需要检查材料");
+			chineseFiledNameMap.put("printBOMwhenPrintLabel", "打印标签同时打印包内清单");
+			chineseFiledNameMap.put("temporaryPurchase", "是否临购");
+			chineseFiledNameMap.put("guid", "图片GUID名称");
+			chineseFiledNameMap.put("materialAmount", "材料实例的总数量");
+			
+			chineseFiledNameMap.put("materialSplitAmount", "材料实例的总数量(按材料拆分数量来算)");
+			chineseFiledNameMap.put("disposableGoodsAmount", "一次性物品的总数量");
+			chineseFiledNameMap.put("foreignComboId", "外来器械组合表id");
+			
 		}
 		return chineseFiledNameMap;
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r34913 -r34958
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 34913)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 34958)
@@ -4095,7 +4095,6 @@
 		if(origineTdRiskLevel.intValue() != tousseDefinitionRiskLevel.intValue()){
 			modifyContent.append("字段：风险级别，原值：").append(origineTd.getRiskLevel()).append("，新值：").append(tousseDefinition.getRiskLevel()).append("。");
 		}
-		dataModifyRecordManager.saveObjectModifyRecord(origineTd, tousseDefinition, DataModifyRecord.MODIFY_TYPE_MANUAL);
 		return modifyContent.toString();
 	}
 	
@@ -4126,8 +4125,12 @@
 	    boolean isUpdate = false;
 	    //是否启用\停用器械包(自定义器械包)
 	    boolean disableOrEnable = false;
+	    //保存包定义修改前的基础属性
+	    TousseDefinition origineTdForModifyRecord = new TousseDefinition();
 		if(origineTd != null){
 			isUpdate = true;
+			//保存包定义修改前的基础属性
+			BeanUtils.copyProperties(origineTd, origineTdForModifyRecord, "id","materialInstances","diposableGoodsItems");
 			// 包类型能否修改
 			if(!StringUtils.equals(origineTd.getTousseType(), tousseDefinition.getTousseType())){
 				// 是否有固定条码之外的包实例
@@ -4395,6 +4398,8 @@
 					tousseDefinition.setTousseDefinitionNote(null);
 					objectDao.delete(note);
 				}
+				//保存包定义基础属性的修改记录
+				dataModifyRecordManager.saveObjectModifyRecord(origineTdForModifyRecord, tousseDefinition, DataModifyRecord.MODIFY_TYPE_MANUAL);
 			}
 			if(newTousse){
 				dataModifyRecordManager.saveNewDataRecord(tousseDefinition, DataModifyRecord.MODIFY_TYPE_MANUAL);