Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/controller/SterilizationRecordController.java
===================================================================
diff -u -r24396 -r24421
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/controller/SterilizationRecordController.java	(.../SterilizationRecordController.java)	(revision 24396)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/controller/SterilizationRecordController.java	(.../SterilizationRecordController.java)	(revision 24421)
@@ -103,8 +103,8 @@
 		String endDate = SpringUtils.getPraramValue("endDate", null);
 		int limit = SpringUtils.getPraramValue("limit", 20);
 		int offset = SpringUtils.getPraramValue("offset", 0);
-		String sort = SpringUtils.getPraramValue("sort", null);
-		String order = SpringUtils.getPraramValue("order", null);
+		String sort = SpringUtils.getPraramValue("sort", "id");
+		String order = SpringUtils.getPraramValue("order", "desc");
 		String search = SpringUtils.getPraramValue("search", null);
 		String searchFields = SpringUtils.getPraramValue("searchFields", null);
 		JSONObject result = JSONUtil.buildJsonObject(false);
@@ -154,7 +154,7 @@
 		if (count > 0) {
 			list = objectDao.findBySql(
 					SterilizationRecord.class.getSimpleName(), queryCondition,
-					offset, limit, null);
+					offset, limit, sort + " " + order);
 		}
 		JSONUtil.addProperty(result, JSONUtil.JSON_KEY_SUCCESS, true);
 		JSONUtil.addProperty(result, JSONUtil.JSON_KEY_TOTAL, count);
@@ -183,7 +183,7 @@
 					.get(Long.parseLong(id));
 			if (sterilizationRecord == null) {
 				JSONUtil.addProperty(result, JSONUtil.JSON_KEY_MESSAGE,
-						"参数id只能为正整数");
+						"根据参数id未找到对应的灭菌记录");
 			} else {
 				JsonConfig config = new JsonConfig();
 				config.setCycleDetectionStrategy(CycleDetectionStrategy.NOPROP);
@@ -213,7 +213,7 @@
 					.get(Long.parseLong(id));
 			if (sterilizationRecord == null) {
 				JSONUtil.addProperty(result, JSONUtil.JSON_KEY_MESSAGE,
-						"参数id只能为正整数");
+						"根据参数id未找到对应的灭菌记录");
 			} else {
 				JSONArray jsonArray = sterilizationRecordManager.loadSterilizationGoodsForBootStrap(sterilizationRecord);
 				JSONUtil.addProperty(result, JSONUtil.JSON_KEY_SUCCESS, true);
@@ -339,25 +339,31 @@
 				sterilizationRecord.setSterilizationShelf(sterilizationShelf);
 				sterilizationRecord.setSterilizerName(sterilizerName);
 				sterilizationRecord.setSrSituationComfirmer(srSituationComfirmer);
-				sterilizationRecord.setFrequency(StringUtils.isNotBlank(recordId) ? Integer.parseInt(frequency) : null);
-				sterilizationRecord.setCycleCounter(StringUtils.isNotBlank(recordId) ? Long.parseLong(cycleCounter) : null);
+				sterilizationRecord.setFrequency(StringUtils.isNotBlank(frequency) ? Integer.parseInt(frequency) : null);
+				sterilizationRecord.setCycleCounter(StringUtils.isNotBlank(cycleCounter) ? Long.parseLong(cycleCounter) : null);
 				sterilizationRecord.setSterilizationType(sterilizationType);
 				sterilizationRecord.setSterilizationPurpose(sterilizationPurpose);
 				sterilizationRecord.setStartDate(ForgonDateUtils.safelyParseDate(startDate));
 				sterilizationRecord.setRemark(remark);
 			}
 			if(sterilizationRecord != null){
-				
-				
+				if(containerBarcodes == null){
+					containerBarcodes = new ArrayList<String>();
+				}
+				if(tousseInstanceBarcodes == null){
+					tousseInstanceBarcodes = new ArrayList<String>();
+				}
 				Map<String , Object> returnResult = sterilizationRecordManager.saveOrUpdateSterilizationRecord(
 		                 sterilizationRecord, tousseInstanceBarcodes,
 		                 containerBarcodes, StringUtils.isNotBlank(recordId) ? Long.valueOf(recordId) : null,barcodePositionMap);
 				JSONUtil.addProperty(result, JSONUtil.JSON_KEY_SUCCESS, returnResult.get(JSONUtil.JSON_KEY_SUCCESS));
 				JSONUtil.addProperty(result, JSONUtil.JSON_KEY_MESSAGE, returnResult.get(JSONUtil.JSON_KEY_MESSAGE));
 			}
 		}catch(RuntimeException e){
+			e.printStackTrace();
 			JSONUtil.addProperty(result, JSONUtil.JSON_KEY_MESSAGE, e.getMessage());
 		}catch(Exception e){
+			e.printStackTrace();
 			JSONUtil.addProperty(result, JSONUtil.JSON_KEY_MESSAGE, "保存失败!");
 		}
 		SpringUtils.output(result);