Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.93_20200614_v4_1_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r28248 -r28255
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 28248)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 28255)
@@ -1,6 +1,6 @@
 {
 	"success":"true",
-	"version":"4.6.92",
-	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.6.92_20200612_v4_1_release.apk",
-	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.6.92_20200612_v4_1_6p_release.apk",
+	"version":"4.6.93",
+	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.6.93_20200614_v4_1_release.apk",
+	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.6.93_20200614_v4_1_6p_release.apk",
 }
\ No newline at end of file
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r28248 -r28255
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 28248)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 28255)
@@ -34,7 +34,6 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.collections4.Transformer;
-import org.apache.commons.collections4.map.MultiValueMap;
 import org.apache.commons.lang.time.FastDateFormat;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -63,6 +62,7 @@
 import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager;
 import com.forgon.disinfectsystem.basedatamanager.container.service.ReviewedBasketManager;
 import com.forgon.disinfectsystem.basedatamanager.departmentgroup.service.DepartmentGroupManager;
+import com.forgon.disinfectsystem.basedatamanager.operationroom.service.OperationRoomManager;
 import com.forgon.disinfectsystem.basedatamanager.position.service.PositionManager;
 import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
@@ -87,6 +87,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.departmentapplicationtemplate.DepartmentAppTemplate;
 import com.forgon.disinfectsystem.entity.basedatamanager.departmentapplicationtemplate.DiposableGoodsTemplateItem;
 import com.forgon.disinfectsystem.entity.basedatamanager.departmentapplicationtemplate.TousseDefinitionTemplateItem;
+import com.forgon.disinfectsystem.entity.basedatamanager.operationRoom.OperationRoom;
 import com.forgon.disinfectsystem.entity.basedatamanager.position.Position;
 import com.forgon.disinfectsystem.entity.basedatamanager.position.TousseOperation;
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation;
@@ -124,7 +125,6 @@
 import com.forgon.disinfectsystem.entity.urgent.UrgentLevel;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
-import com.forgon.disinfectsystem.exception.RecyclingRecordException;
 import com.forgon.disinfectsystem.goodFilterConfig.service.GoodFilterConfigManager;
 import com.forgon.disinfectsystem.invoicemanager.service.InvoiceDepartmentManage;
 import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager;
@@ -138,15 +138,12 @@
 import com.forgon.disinfectsystem.qualitymonitoring.instance.service.QualityMonitoringInstanceManager;
 import com.forgon.disinfectsystem.recyclingapplication.result.LoadTousseLeaseItemsResultBuilder;
 import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager;
-import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationComparator;
 import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationManager;
-import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationUtils;
 import com.forgon.disinfectsystem.recyclingapplication.updateLog.ApplicationLogManager;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ExpressInvoiceApplicationGoodsVo;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ExpressInvoiceInvoicePlanVo;
 import com.forgon.disinfectsystem.recyclingapplication.vo.InvoicePlanVo;
-import com.forgon.disinfectsystem.recyclingapplication.vo.ReturnGoodVo;
 import com.forgon.disinfectsystem.returngoodsrecord.service.ReturnGoodsRecordManager;
 import com.forgon.disinfectsystem.signRecord.service.SignRecordManager;
 import com.forgon.disinfectsystem.signRecord.vo.SignRecordVo;
@@ -170,7 +167,6 @@
 import com.forgon.disinfectsystem.useRecord.util.UseRecordUtil;
 import com.forgon.disinfectsystem.vo.ApplicationItemVO;
 import com.forgon.disinfectsystem.vo.RecyclingApplicationVo;
-import com.forgon.disinfectsystem.vo.TousseItemVo;
 import com.forgon.disinfectsystem.vo.TousseSimpleVO;
 import com.forgon.disinfectsystem.washTransition.service.WashTransitionItemManager;
 import com.forgon.disinfectsystem.washTransition.service.WashTransitionMaterialManager;
@@ -181,7 +177,6 @@
 import com.forgon.exception.SterilingModeNotTheSameException;
 import com.forgon.exception.SystemException;
 import com.forgon.keyvalue.service.KeyValueManager;
-import com.forgon.log.enums.ApplicationLogStatusEnum;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
 import com.forgon.security.bean.ModelNameBean;
@@ -358,6 +353,8 @@
 	private DiposableGoodsManager diposableGoodsManager;
 	@Autowired
 	private ApplicationLogManager applicationLogManager;
+	@Autowired
+	private OperationRoomManager operationRoomManager;
 
 	/**
 	 * 库位管理manager
@@ -6283,4 +6280,23 @@
 		}
 	}
 
+	/**
+	 * 获取当前登录用户所属科室下的手术间
+	 */
+	public String getOperationRoomByCurrentOrgUnitCode(JSONObject params) {
+		List<OperationRoom>  list = operationRoomManager.getOperationRoomByCurrentOrgUnitCode();
+		JSONObject resultObj = null;
+		try {
+			JSONArray jsonArr = new JSONArray();
+			for (OperationRoom operationRoom : list) {
+				jsonArr.add(operationRoom.getOperationRoomName());
+			}
+			resultObj = JSONUtil.buildJsonObject(true, jsonArr);
+		} catch (Exception e) {
+			e.printStackTrace();
+			resultObj = JSONUtil.buildJsonObject(false, "查询用户出错");
+		}
+		return resultObj.toString();
+	}
+
 }
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.93_20200614_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ