Index: ssts-web/src/main/webapp/common/selOrgUnitByExt.jsp =================================================================== diff -u -r13689 -r26903 --- ssts-web/src/main/webapp/common/selOrgUnitByExt.jsp (.../selOrgUnitByExt.jsp) (revision 13689) +++ ssts-web/src/main/webapp/common/selOrgUnitByExt.jsp (.../selOrgUnitByExt.jsp) (revision 26903) @@ -183,6 +183,9 @@ url : WWWROOT + '/systemmanage/getOrgNameBySpellingAndWB!getOrgNameBySpellingAndWB.do', method : 'POST' }), + baseParams :{ + type : 'user' + }, reader : new Ext.data.JsonReader({ root : 'data' },[ Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r26834 -r26903 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 26834) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 26903) @@ -28,6 +28,8 @@ import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; +import com.forgon.directory.model.OrgUnit; +import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.container.service.ReviewedBasketManager; @@ -98,6 +100,8 @@ private StorageLocationManager storageLocationManager; + private OrgUnitManager orgUnitManager; + public void setExpirationDateInfoManager( ExpirationDateInfoManager expirationDateInfoManager) { this.expirationDateInfoManager = expirationDateInfoManager; @@ -146,6 +150,10 @@ StorageLocationManager storageLocationManager) { this.storageLocationManager = storageLocationManager; } + + public void setOrgUnitManager(OrgUnitManager orgUnitManager) { + this.orgUnitManager = orgUnitManager; + } @Override public void endForeignProxyDisinfection(String id) { @@ -900,6 +908,12 @@ // 保存外部代理灭菌单 @Override public void saveOrUpdateProxyDisinfection(ForeignProxyDisinfection modifiedForeignProxyDisinfection,JSONObject params){ + // 已停用的科室不能进行科室申领(新建申请单时做判断GYEY-727) + String orgUnitCode = AcegiHelper.getCurrentOrgUnitCode(); + OrgUnit ou = orgUnitManager.getByCode(orgUnitCode); + if (ou != null && OrgUnit.STATUS_DISABLED.equals(ou.getStatus())) { + throw new RuntimeException("当前申请科室已停用,不能进行申领!"); + } ForeignProxyDisinfection foreignProxyDisinfection = modifiedForeignProxyDisinfection; Long id = modifiedForeignProxyDisinfection.getId(); if(DatabaseUtil.isPoIdValid(id)){ Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java =================================================================== diff -u -r26419 -r26903 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java (.../CustomRecyclingApplicationAction.java) (revision 26419) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java (.../CustomRecyclingApplicationAction.java) (revision 26903) @@ -21,7 +21,10 @@ import org.apache.struts2.convention.annotation.ParentPackage; import org.springframework.beans.BeanUtils; +import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.CssdHandleTousses; +import com.forgon.directory.model.OrgUnit; +import com.forgon.directory.service.OrgUnitManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.taskGroup.service.TaskGroupManager; import com.forgon.disinfectsystem.common.CssdUtils; @@ -74,6 +77,8 @@ private ObjectDao objectDao; + private OrgUnitManager orgUnitManager; + public void setObjectDao(ObjectDao objectDao) { this.objectDao = objectDao; } @@ -111,6 +116,9 @@ this.recyclingApplicationManager = recyclingApplicationManager; } + public void setOrgUnitManager(OrgUnitManager orgUnitManager) { + this.orgUnitManager = orgUnitManager; + } /** * 保存自定义申请单 * @@ -130,6 +138,17 @@ } catch (IOException e2) { e2.printStackTrace(); } + // 已停用的科室不能进行科室申领 + String orgUnitCode = AcegiHelper.getCurrentOrgUnitCode(); + OrgUnit ou = orgUnitManager.getByCode(orgUnitCode); + if (ou != null && OrgUnit.STATUS_DISABLED.equals(ou.getStatus())) { + JSONObject json = new JSONObject(); + json.put("success", false); + json.put("message", "当前申请科室已停用,不能进行申领!"); + printWriter.print(json.toString()); + printWriter.close(); + return null; + } if (recyclingApplication.getId() != null && recyclingApplication.getId() == 0) { Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js =================================================================== diff -u -r26419 -r26903 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js (.../customTousseForm.js) (revision 26419) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js (.../customTousseForm.js) (revision 26903) @@ -776,7 +776,7 @@ grid.dwrReload(); }, failure : function(form, action) { - showResult(action.failureType); + showResult(action.result.message); } }); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r25708 -r26903 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 25708) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 26903) @@ -264,6 +264,12 @@ public void saveOrUpdate(ForeignTousseApplication application, String foreignTousseTreeData,String actionType) { + // 已停用的科室不能进行科室申领 + String orgUnitCode = AcegiHelper.getCurrentOrgUnitCode(); + OrgUnit ou = orgUnitManager.getByCode(orgUnitCode); + if (ou != null && OrgUnit.STATUS_DISABLED.equals(ou.getStatus())) { + throw new RuntimeException("当前申请科室已停用,不能进行申领!"); + } SupplyRoomConfig systemParams = supplyRoomConfigManager .getSystemParamsObj(); //外来器械包处理科室名称与编码 Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js =================================================================== diff -u -r23775 -r26903 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 23775) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 26903) @@ -801,7 +801,7 @@ } }, failure : function(form, action) { - showResult(action.failureType); + showResult(action.result.msg); } }); }