Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js
===================================================================
diff -u -r23634 -r26771
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js	(.../sterilizationMonitoring.js)	(revision 23634)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js	(.../sterilizationMonitoring.js)	(revision 26771)
@@ -27,6 +27,14 @@
 	var monitorChecker = top.Ext.getCmp('monitorChecker').getValue();
 	var monitorAuditor = top.Ext.getCmp('monitorAuditor').getValue();
 	var endDate = top.Ext.getCmp('endDate').getValue();
+	var cardPosition = top.Ext.getCmp('cardPosition').getValue();
+	var monitoringTubeResult = top.Ext.getCmp('monitoringTubeResult').getValue();
+	var monitoringBatchNum = top.Ext.getCmp('monitoringBatchNum').getValue();
+	var monitoringTubeExpiryDate = top.Ext.getCmp('monitoringTubeExpiryDate').getValue();
+	var cardPositionOfControlTube = top.Ext.getCmp('cardPositionOfControlTube').getValue();
+	var controlTubeResult = top.Ext.getCmp('controlTubeResult').getValue();
+	var controlBatchNum = top.Ext.getCmp('controlBatchNum').getValue();
+	var controlTubeExpiryDate = top.Ext.getCmp('controlTubeExpiryDate').getValue();
 	if (sstsConfig.monitorCheckerMustFill) {  //保存时，需要填写监测核对员
 		if (sstsConfig.needMonitorAuditor) {  //如果有监测审核员也要填写
 			if (""==monitorUser) {
@@ -83,7 +91,8 @@
 			top.Ext.getCmp('cycleCounter').setValue(0);
 		}
 	}
-	SterilizationRecordTableManager.saveMonitorResult(id,physicsResult,chemistryResult,biologyResult,cycleCounter,biologicalObserveDateString,biologicalMonitoringStartDateString,biologicalMonitoringEndDateString,monitorUser,monitorChecker,monitorAuditor,remark,function(result){
+	SterilizationRecordTableManager.saveMonitorResult(id,physicsResult,chemistryResult,biologyResult,cycleCounter,biologicalObserveDateString,biologicalMonitoringStartDateString,biologicalMonitoringEndDateString,monitorUser,monitorChecker,monitorAuditor,remark,
+			cardPosition,monitoringTubeResult,monitoringBatchNum,monitoringTubeExpiryDate,cardPositionOfControlTube,controlTubeResult,controlBatchNum,controlTubeExpiryDate,function(result){
 		if(result){
 			sterilizationRecordWin.close();
 			showResult('保存成功');
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
===================================================================
diff -u -r25988 -r26771
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java	(.../SterilizationRecordTableManager.java)	(revision 25988)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java	(.../SterilizationRecordTableManager.java)	(revision 26771)
@@ -360,11 +360,37 @@
 	public boolean isSterilizerCycleCounterExist(Long id,String sterilizerName,Long cycleCounter) {
 		return sterilizationRecordManager.isSterilizerCycleCounterExist(id,sterilizerName,cycleCounter);
 	};
-
+	/**
+	 * 保存监测结果
+	 * @param recordID
+	 * @param physicsResult
+	 * @param chemistryResult
+	 * @param biologyResult
+	 * @param cycleCounter
+	 * @param biologicalObserveDateString
+	 * @param biologicalMonitoringStartDateString
+	 * @param biologicalMonitoringEndDateString
+	 * @param monitorUser
+	 * @param monitorChecker
+	 * @param monitorAuditor
+	 * @param remark
+	 * 以下参数是20190801新增
+	 * @param cardPosition 监测管卡位
+	 * @param monitoringTubeResult 监测管结果
+	 * @param monitoringBatchNum 监测管批号
+	 * @param monitoringTubeExpiryDate 监测管有效期
+	 * @param cardPositionOfControlTube 对照管卡位
+	 * @param controlTubeResult 对照管结果
+	 * @param controlBatchNum 对照管批号
+	 * @param controlTubeExpiryDate 对照管有效期
+	 * @return
+	 */
 	public boolean saveMonitorResult(String recordID, String physicsResult,
 			String chemistryResult, String biologyResult,long cycleCounter,
 			String biologicalObserveDateString, String biologicalMonitoringStartDateString, String biologicalMonitoringEndDateString,
-			String monitorUser,String monitorChecker,String monitorAuditor,String remark) {
+			String monitorUser,String monitorChecker,String monitorAuditor,String remark,
+			String cardPosition, String monitoringTubeResult, String monitoringBatchNum, String monitoringTubeExpiryDate,
+			String cardPositionOfControlTube, String controlTubeResult, String controlBatchNum, String controlTubeExpiryDate) {
 		
 		if (StringUtils.isNotBlank(recordID)) {
 			SterilizationRecord record = sterilizationRecordManager.getSterilizationRecordById(Long.valueOf(recordID));
@@ -380,7 +406,39 @@
 //					record.setMonitorChecker(monitorChecker);
 //					record.setMonitorAuditor(monitorAuditor);
 //				}
-				
+				//不存''到数据库
+				if("".equals(cardPosition)){
+					cardPosition = null;
+				}
+				if("".equals(monitoringTubeResult)){
+					monitoringTubeResult = null;
+				}
+				if("".equals(monitoringBatchNum)){
+					monitoringBatchNum = null;
+				}
+				if("".equals(monitoringTubeExpiryDate)){
+					monitoringTubeExpiryDate = null;
+				}
+				if("".equals(cardPositionOfControlTube)){
+					cardPositionOfControlTube = null;
+				}
+				if("".equals(controlTubeResult)){
+					controlTubeResult = null;
+				}
+				if("".equals(controlBatchNum)){
+					controlBatchNum = null;
+				}
+				if("".equals(controlTubeExpiryDate)){
+					controlTubeExpiryDate = null;
+				}
+				record.setCardPosition(cardPosition);
+				record.setMonitoringTubeResult(monitoringTubeResult);
+				record.setMonitoringBatchNum(monitoringBatchNum);
+				record.setMonitoringTubeExpiryDate(monitoringTubeExpiryDate);
+				record.setCardPositionOfControlTube(cardPositionOfControlTube);
+				record.setControlTubeResult(controlTubeResult);
+				record.setControlBatchNum(controlBatchNum);
+				record.setControlTubeExpiryDate(controlTubeExpiryDate);
 				record.setMonitorUser(monitorUser);
                 record.setMonitorChecker(monitorChecker);
                 record.setMonitorAuditor(monitorAuditor);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java
===================================================================
diff -u -r26085 -r26771
--- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java	(.../BiologyMonitoringWarningTest.java)	(revision 26085)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java	(.../BiologyMonitoringWarningTest.java)	(revision 26771)
@@ -95,7 +95,7 @@
 		c.add(Calendar.MINUTE, 5);
 		String time = ForgonDateUtils.safelyFormatDate(c.getTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
 		sterilizationRecordTableManager.saveMonitorResult(sr1.getId().toString(), SterilizationRecord.MONITOR_RESULT_QUALIFIED, SterilizationRecord.MONITOR_RESULT_QUALIFIED,
-				SterilizationRecord.MONITOR_RESULT_NO, 10, null,time, time, null, null, null, "备注");
+				SterilizationRecord.MONITOR_RESULT_NO, 10, null,time, time, null, null, null, "备注",null,null,null,null,null,null,null,null);
 		session.flush();
 		biologyMonitorWarningManager.timingUpdateBiologicalMonitoringStatus(Constants.TEST_NG);
 		session.refresh(sr1);
@@ -121,7 +121,7 @@
 		//模拟生物监测“已确认”的场景（此时生物监测状态为“已确认”，定时器不会修改其生物监测的状态）
 		time = ForgonDateUtils.safelyFormatDate(c.getTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
 		sterilizationRecordTableManager.saveMonitorResult(sr1.getId().toString(), SterilizationRecord.MONITOR_RESULT_QUALIFIED, SterilizationRecord.MONITOR_RESULT_QUALIFIED,
-				SterilizationRecord.MONITOR_RESULT_QUALIFIED, 10, null, time, time, userName, userName, userName, "备注");
+				SterilizationRecord.MONITOR_RESULT_QUALIFIED, 10, null, time, time, userName, userName, userName, "备注", null,null,null,null,null,null,null,null);
 		session.flush();
 		assertEquals(sr1.getBiologicalMonitoringStatus(), SterilizationRecord.BIOLOGICALMONITORING_STATUS_CHECK);
 		objectDao.executeUpdate(String.format("delete from BiologyMonitorWarning where userName='%s' and departCode='%s'", userName, currentOrgUnitCode));