Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r31089 -r31111
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 31089)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 31111)
@@ -2058,6 +2058,9 @@
             propMap.put("sterileFrequency", sterilizationRecord.getFrequency()+"");
             propMap.put("sterilizationUser", sterilizationRecord.getSterilizationUser());
             propMap.put("sterilizerName", sterilizationRecord.getSterilizerName());
+            if(StringUtils.isNotBlank(tousseInstance.getSterilizerPosition())){
+            	propMap.put("sterilizerPosition", tousseInstance.getSterilizerPosition());
+            }
             if(!SterilizationRecord.STERILIZATION_STATUS_DRAFT.equals(sterilizationRecord.getStatus())){
             	tousseInstance.setSterileStartTime(TousseInstanceUtils.buildSterileStartTime(sterilizationRecord.getStartDate()));
             	propMap.put("sterileStartTime", TousseInstanceUtils.buildSterileStartTime(sterilizationRecord.getStartDate()));
@@ -4839,6 +4842,7 @@
                         obj.put("maxUrgentGrade", urgentGrade);//最高加急等级,用于排序
                         obj.put("sterilingMode", tousse.getSterilingMode());
                         obj.put("scanAmount", itemDefinition.getScanAmount());
+                        obj.put("position", tousse.getSterilizerPosition());
                         //覆盖
                         bMap.put(key, obj);
                     }
@@ -5272,7 +5276,7 @@
         if(reviewedBasket != null && DatabaseUtil.isPoIdValid(reviewedBasket.getId())){
             queryTousseSql.append("select td.id tdId, td.includeImplant, b.barcode,po.tousseName,po.depart,(case when tdAncestor.isTraceable ='" + TousseDefinition.STR_YES + "' then po.sterilingMode else s.sterilizationMode end) sterilingMode,tdAncestor.isTraceable,po.isUrgentTousse,po.sterilingType ");
             queryTousseSql.append(sqlSelect_UrgentLevel);
-            queryTousseSql.append(",po.proxyDisinfection_id,tdAncestor.tousseType,tdAncestor.isForeignTousse,po.proxyDisinfection_id, tdAncestor.scanAmount "
+            queryTousseSql.append(",po.proxyDisinfection_id,tdAncestor.tousseType,tdAncestor.isForeignTousse,po.proxyDisinfection_id, tdAncestor.scanAmount, po.sterilizerPosition "
                     + "from " + TousseInstance.class.getSimpleName() + " po "
                     + sqlJoin_UrgentLevel
                     + "join " + BarcodeDevice.class.getSimpleName() + " b on po.id=b.id "
@@ -5284,7 +5288,7 @@
         }else if(sterilizationRecord != null && DatabaseUtil.isPoIdValid(sterilizationRecord.getId())){
             queryTousseSql.append("select td.id tdId, td.includeImplant, b.barcode,po.tousseName,po.depart,(case when tdAncestor.isTraceable ='" + TousseDefinition.STR_YES + "' then po.sterilingMode else s.sterilizationMode end) sterilingMode,tdAncestor.isTraceable,po.isUrgentTousse,po.sterilingType ");
             queryTousseSql.append(sqlSelect_UrgentLevel);
-            queryTousseSql.append(",po.proxyDisinfection_id,tdAncestor.tousseType,tdAncestor.isForeignTousse,po.proxyDisinfection_id, tdAncestor.scanAmount "
+            queryTousseSql.append(",po.proxyDisinfection_id,tdAncestor.tousseType,tdAncestor.isForeignTousse,po.proxyDisinfection_id, tdAncestor.scanAmount, po.sterilizerPosition "
                     + "from " + TousseInstance.class.getSimpleName() + " po "
                     + sqlJoin_UrgentLevel
                     + "join " + BarcodeDevice.class.getSimpleName() + " b on po.id=b.id "
@@ -5320,6 +5324,7 @@
                 vo.setTousseType(rs.getString("tousseType"));
                 vo.setIsForeignTousse(rs.getString("isForeignTousse"));
                 vo.setProxyDisinfectionId(rs.getLong("proxyDisinfection_Id"));
+                vo.setSterilizerPosition(rs.getString("sterilizerPosition"));
                 try{
                     if(DatabaseUtil.isPoIdValid(rs.getLong("ulId"))){
                     	UrgentLevelVo urgentLevelVo = new UrgentLevelVo();      
@@ -6761,9 +6766,6 @@
 		List<SterilizationFrequecyRemind> sterilizationFrequecyReminds = sr.getSterilizationFrequecyReminds();
 		
 		if(CollectionUtils.isNotEmpty(sterilizationFrequecyReminds)){
-			Date out_beginTime = new Date();
-			Date out_endTime = new Date();
-			supplyRoomConfigManager.getTodayTimeQuantum(out_beginTime, out_endTime);
 			for (SterilizationFrequecyRemind sterilizationFrequecyRemind : sterilizationFrequecyReminds) {
 				// 配置中的炉次或者灭菌程序为空时，不验证
 				if(sterilizationFrequecyRemind.getFrequency() == null || sterilizationFrequecyRemind.getFrequency().intValue() < 1
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r31033 -r31111
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 31033)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 31111)
@@ -358,6 +358,7 @@
 			
 			// 获取固定条码的包实例条码
 			Map<TousseDefinition, Integer> subTdAmountMap = new HashMap<TousseDefinition, Integer>();
+			Map<String, List<String>> fixedBarcodeMap = new HashMap<String, List<String>>();
 			if(CollectionUtils.isNotEmpty(fixedBarcodes)){
 				for (String barcodeStr : fixedBarcodes) {
 					TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByFixedBarcode(barcodeStr);
@@ -379,10 +380,13 @@
 						throw new RuntimeException(td.getName() + "库存不足！剩余库存为：" + arr.size());
 					}
 					if(arr != null && arr.size() > 0){
+						List<String> barcodes = new ArrayList<String>();
 						for (int i=0;i<arr.size();i++) {
 							JSONObject json = arr.getJSONObject(i);
 							tousseInstanceBarcodes.add(json.optString("barcode"));
+							barcodes.add(json.optString("barcode"));
 						}
+						fixedBarcodeMap.put(barcodeStr, barcodes);
 					}
 				}
 			}
@@ -398,6 +402,12 @@
 					String barcode = goodsItem[0];
 					String position = goodsItem[1];
 					barcodePositionMap.put(barcode, position);
+					if(fixedBarcodeMap.containsKey(barcode)){
+						List<String> barcodes = fixedBarcodeMap.get(barcode);
+						for (String code : barcodes) {
+							barcodePositionMap.put(code, position);
+						}
+					}
 				}
 			}
 			//判断是否从干预页面进入