Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r35426 -r35432 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 35426) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 35432) @@ -67,6 +67,7 @@ import com.forgon.disinfectsystem.basedatamanager.invoice.service.InvoiceUtils; import com.forgon.disinfectsystem.basedatamanager.operationroom.service.OperationRoomManager; import com.forgon.disinfectsystem.basedatamanager.position.service.PositionManager; +import com.forgon.disinfectsystem.basedatamanager.specialInfection.service.SpecialInfectionManager; import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.taskGroup.service.TaskGroupManager; @@ -381,6 +382,8 @@ private OperationRoomManager operationRoomManager; @Autowired private InstrumentSetTypeManager instrumentSetTypeManager; + @Autowired + private SpecialInfectionManager specialInfectionManager; /** * 库位管理manager @@ -7235,7 +7238,8 @@ public String getSpecialInfectionList(JSONObject params){ JSONObject resultObj = null; try { - List specialInfectionList = httpOptionManager.getHttpOptionTextById(HttpOption.SYSTEMSETTING_SPECIALINFECTION); + //List specialInfectionList = httpOptionManager.getHttpOptionTextById(HttpOption.SYSTEMSETTING_SPECIALINFECTION); + List specialInfectionList = specialInfectionManager.getByHql("enable = '"+Constants.STR_YES+"'"); resultObj = JSONUtil.buildJsonObject(true, JSONArray.fromObject(specialInfectionList)); } catch (Exception e) { e.printStackTrace(); Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_beta_20230316_v4_1_6p_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_beta_20230316_v4_1_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_beta_20230316_v4_1_nologo_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json =================================================================== diff -u -r35232 -r35432 --- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 35232) +++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 35432) @@ -1,7 +1,7 @@ { "success":"true", - "version":"4.7.32", - "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_release.apk", - "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_nologo_release.apk", - "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_6p_release.apk", + "version":"4.7.32_beta", + "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.32_beta_20230316_v4_1_release.apk", + "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.32_beta_20230316_v4_1_nologo_release.apk", + "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.32_beta_20230316_v4_1_6p_release.apk", } \ No newline at end of file