Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.06_20201014_v4_1_nologo_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.06_20201014_v4_1_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r29099 -r29218
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 29099)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 29218)
@@ -1755,6 +1755,23 @@
         if(CollectionUtils.isNotEmpty(sterilingModeList) && sterilingModeList.size() > 1){
         	throw new SterilingModeNotTheSameException("该炉灭菌记录有多种不同灭菌方式的物品,请先移除其它灭菌方式物品!");
         }
+        
+        //判断灭菌程序的灭菌方式与灭菌物品的灭菌方式是否相同(前提条件:灭菌程序的灭菌方式不为空)
+        String sterilizationType = sterilizationRecord.getSterilizationType();
+        if(StringUtils.isBlank(sterilizationType)){
+        	throw new RuntimeException("灭菌程序为空,不能添加灭菌记录");
+        }
+        Sterilisation sterilisation = sterilisationManager.getSterilisationByName(sterilizationType);
+        if(sterilisation == null){
+        	throw new RuntimeException(String.format("灭菌程序【%s】的定义已经被删除,不能添加灭菌记录",sterilizationType));
+        }
+        String sterilizationMode = sterilisation.getSterilizationMode();
+        if(StringUtils.isNotBlank(sterilizationMode) 
+        		&& CollectionUtils.isNotEmpty(sterilingModeList) 
+        		&& !StringUtils.equals(sterilizationMode, sterilingModeList.get(0))){
+        	throw new SterilingModeNotTheSameException(String.format("该炉灭菌记录的灭菌程序【%s】对应的灭菌方式为【%s】,灭菌物品的灭菌方式为【%s】,两者的灭菌方式不一致,请先移除其它灭菌方式物品!",
+        			sterilizationType,sterilizationMode,sterilingModeList.get(0)));
+        }
 
         for (TousseInstance tousseInstance : allNewTousseInstances) {
             // 如果器械包状态为已灭菌，说明该器械包是重新灭菌
@@ -1832,7 +1849,6 @@
         // 暂存的灭菌记录不可以自动完成灭菌
         if (SterilizationRecord.STERILIZATION_STATUS_BEGIN.equals(sterilizationRecord.getStatus()) && Constants.STR_YES.equals(sterilizer.getTimingCompleteSterilization())) {
         	//定时自动完成灭菌
-            Sterilisation sterilisation = sterilisationManager.getSterilisationByName(sterilizationRecord.getSterilizationType());  //灭菌程序
         	if(sterilisation != null && sterilisation.getUseTime() != null && sterilisation.getUseTime() > 0){
         		timingAutoCompleteSterilization(sterilisation.getUseTime(), sterilizationRecord);
         	}
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.06_20201014_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r29190 -r29218
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 29190)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 29218)
@@ -1,7 +1,7 @@
 {
 	"success":"true",
-	"version":"4.7.05",
-	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.05_20201012_v4_1_release.apk",
-	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.05_20201012_v4_1_nologo_release.apk",
-	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.05_20201012_v4_1_6p_release.apk",
+	"version":"4.7.06",
+	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.06_20201014_v4_1_release.apk",
+	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.06_20201014_v4_1_nologo_release.apk",
+	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.06_20201014_v4_1_6p_release.apk",
 }
\ No newline at end of file