Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r16398 -r16426
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 16398)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 16426)
@@ -999,6 +999,7 @@
 			Long originalSterilizationRecordId,
 			Map<String,String> barcodePositionMap) {
 		Map<String , Object> result = new HashMap<String, Object>();
+		boolean isNewRecord = false;
 		if(sterilizationRecord.getId() == null || sterilizationRecord.getId() == 0L)
 		{
 			// 新加灭菌记录，校验
@@ -1008,6 +1009,7 @@
 				result.put("error", "灭菌炉正在灭菌中");
 				return result;
 			}
+			isNewRecord = true;
 		}
 		result.put("success", true);
 		//器械包条码增加单引号
@@ -1310,6 +1312,17 @@
 		saveOrUpdate(sterilizationRecord);
 		// 计算并更新器械统计信息
 		updateSterilizationRecordStatisticsInfo(sterilizationRecord,allNewTousseInstances);
+		JSONObject param = getSterilizationRecordParam(sterilizationRecord);
+		String msg = " 界面进来的不入筐器械包条码： " + tousseInstanceBarcodes + " 审核篮筐条码 ： " + containerBarcodes;
+		if(isNewRecord){
+			appLogManager.saveLog(AcegiHelper.getLoginUser(),
+					Log.MODEL_STERILIZATION, "A", "id:" + sterilizationRecord.getId() + ",data:"
+							+ param.toString() + msg);
+		}else{
+			appLogManager.saveLog(AcegiHelper.getLoginUser(),
+					Log.MODEL_STERILIZATION, "U", "id:" + sterilizationRecord.getId() + ",data:"
+							+ param.toString() + msg);
+		}
 		return result;
 	}
 	// 计算并更新灭菌记录的器械统计信息
@@ -1379,7 +1392,7 @@
 		sterilizationRecord.setAmount(amount);
 		saveOrUpdate(sterilizationRecord);
 	}
-
+	
 	/**
 	 * 更新灭菌记录为灭菌失败(灭菌篮筐状态更新为灭菌装载,器械包实例状态更新为已审核)
 	 */
@@ -2434,4 +2447,114 @@
 		}
 		sterilizationRecord.setEndDate(endDate);
 	}
+	/**
+	 * 获取灭菌记录信息
+	 * @param srRecord
+	 * @return
+	 */
+	private JSONObject getSterilizationRecordParam(SterilizationRecord srRecord){
+		JSONObject params = new JSONObject();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if(srRecord != null){
+			String startDateStr = "";
+			String endDaeStr = "";
+			String srSituationComfirmTimeStr = "";
+			String biologicalMonitoringStartDateStr = "";
+			String biologicalMonitoringEndDateStr = "";
+			if(srRecord.getStartDate() != null){
+				startDateStr = sdf.format(srRecord.getStartDate());
+			}
+			if(srRecord.getEndDate() != null){
+				endDaeStr = sdf.format(srRecord.getEndDate());
+			}
+			if(srRecord.getSrSituationComfirmTime() != null){
+				srSituationComfirmTimeStr = sdf.format(srRecord.getSrSituationComfirmTime());
+			}
+			if(srRecord.getBiologicalMonitoringStartDate() != null){
+				biologicalMonitoringStartDateStr = sdf.format(srRecord.getBiologicalMonitoringStartDate());
+			}
+			if(srRecord.getBiologicalMonitoringEndDate() != null){
+				biologicalMonitoringEndDateStr = sdf.format(srRecord.getBiologicalMonitoringEndDate());
+			}
+			
+			params.put("sterilizationRecordId", srRecord.getId());
+			params.put("sterilizationUser", srRecord.getSterilizationUser());
+			params.put("sterilizerName", srRecord.getSterilizerName());
+			params.put("startDate", startDateStr);
+			params.put("endDate", endDaeStr);
+			params.put("status", srRecord.getStatus());
+			params.put("finishOperater", srRecord.getFinishOperater());
+			params.put("finishComfirmer", srRecord.getFinishComfirmer());
+			params.put("srSituationComfirmer", srRecord.getSrSituationComfirmer());
+			params.put("isSituationComfirm", srRecord.getIsSituationComfirm());
+			params.put("srSituationComfirmTime", srSituationComfirmTimeStr);
+			params.put("frequency", srRecord.getFrequency());
+			params.put("cycleCounter", srRecord.getCycleCounter());
+			params.put("sterilizationPurpose", srRecord.getSterilizationPurpose());
+			params.put("sterilizationType", srRecord.getSterilizationType());
+			params.put("sterilizationShelf", srRecord.getSterilizationShelf());
+			params.put("sterilizerRecordAmount", srRecord.getSterilizerRecordAmount());
+			params.put("physicsResult", srRecord.getPhysicsResult());
+			params.put("chemistryResult", srRecord.getChemistryResult());
+			params.put("biologyResult", srRecord.getBiologyResult());
+			params.put("biologicalMonitoringStartDate", biologicalMonitoringStartDateStr);
+			params.put("biologicalMonitoringEndDate", biologicalMonitoringEndDateStr);
+			params.put("monitorUser", srRecord.getMonitorUser());
+			params.put("monitorChecker", srRecord.getMonitorChecker());
+			params.put("tousseAmount", srRecord.getTousseAmount());
+			params.put("foreignTousseAmount", srRecord.getForeignTousseAmount());
+			params.put("dressingTousseAmount", srRecord.getDressingTousseAmount());
+			params.put("proxyTousseAmount", srRecord.getProxyTousseAmount());
+			params.put("amount", srRecord.getAmount());
+			// 添加不入筐灭菌的信息
+			List<TousseInstance> tousseInstanceList = srRecord.getTousseInstanceList();
+			JSONArray tousseArray = new JSONArray();
+			if(tousseInstanceList != null){
+				for(TousseInstance ti : tousseInstanceList){
+					JSONObject obj = new JSONObject();
+					obj.put("tousseId", ti.getId());
+					obj.put("name", ti.getTousseName());
+					obj.put("barcode", ti.getBarcode());
+					tousseArray.add(obj);
+				}
+				params.put("TousseInstanceList", tousseArray);
+			}else{
+				params.put("TousseInstanceList", "");
+			}
+
+			// 添加审核筐信息
+			List<ReviewedBasket> reviewedBaskets = srRecord.getReviewedBaskets();
+			JSONArray basketArray = new JSONArray();
+			if(reviewedBaskets != null && reviewedBaskets.size()>0){
+				for(ReviewedBasket rb : reviewedBaskets){
+					JSONObject obj = new JSONObject();
+					Container contianer = rb.getContainer();
+					if(contianer != null){
+						obj.put("containerName", contianer.getContainerName());
+						obj.put("containerBarcode", contianer.getBarcode());
+					}else{
+						obj.put("containerName", "找不到篮筐");
+						obj.put("containerBarcode", "找不到篮筐");
+					}
+					Set<TousseInstance> tousseInstances = rb.getTousseInstances(objectDao);
+					JSONArray tisArray = new JSONArray();
+					if(tousseInstances != null && tousseInstances.size() > 0){
+						for(TousseInstance ti : tousseInstances){
+							JSONObject ciObj = new JSONObject();
+							ciObj.put("id", ti.getId());
+							ciObj.put("tousseName", ti.getTousseName());
+							ciObj.put("tousseBarcode", ti.getBarcode());
+							tisArray.add(ciObj);
+						}
+					}
+					obj.put("tousseInstancesInReviewBaskets",tisArray);
+					basketArray.add(obj);
+				}
+				params.put("reviewedBasketList", basketArray);
+			}else{
+				params.put("reviewedBasketList", "");
+			}
+		}
+		return params;
+	}
 }