Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/service/OrgUnitPatientAreaRelationManagerImpl.java =================================================================== diff -u -r40720 -r40727 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/service/OrgUnitPatientAreaRelationManagerImpl.java (.../OrgUnitPatientAreaRelationManagerImpl.java) (revision 40720) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/service/OrgUnitPatientAreaRelationManagerImpl.java (.../OrgUnitPatientAreaRelationManagerImpl.java) (revision 40727) @@ -23,6 +23,7 @@ import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.entity.PageEntity; +import com.forgon.exception.ApplyDepartNoMatchParentAreaException; import com.forgon.exception.SystemException; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; @@ -292,7 +293,7 @@ } if(!applyDepartPatientAreaRelation(foreignTousseApplication.getDepartCoding(), foreignTousseApplication.getPatientArea())){ - throw new SystemException(String.format("%s没有和病区“%s”有关联,是否继续操作?", foreignTousseApplication.getDepart(), foreignTousseApplication.getPatientArea())); + throw new ApplyDepartNoMatchParentAreaException(String.format("%s没有和病区“%s”有关联,是否继续操作?", foreignTousseApplication.getDepart(), foreignTousseApplication.getPatientArea())); } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r40716 -r40727 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 40716) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 40727) @@ -40,6 +40,7 @@ import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager; import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; +import com.forgon.exception.ApplyDepartNoMatchParentAreaException; import com.forgon.exception.SystemException; import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; @@ -416,6 +417,11 @@ foreignTousseApplicationManager.saveOrUpdate(origineFta, foreignTousseApplication, foreignTousseInfo, actionType, timeoutHandType, checkApplyDepartPatientAreaRelation); jsonObject.put("id", foreignTousseApplication.getId()); //供前台打印 jsonObject.put("applicationTime", ForgonDateUtils.safelyFormatDate(foreignTousseApplication.getApplicationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "")); //供前台打印 + } catch(ApplyDepartNoMatchParentAreaException e1){ + logger.error("外来器械申请单保存失败:" + e1); + jsonObject.put("success",false); + jsonObject.put("message",e1.getMessage()); + jsonObject.put("applyDepartNoMatchParentArea", true); } catch (Exception e) { logger.error("外来器械申请单保存失败:" + e); jsonObject.put("success",false); Index: forgon-tools/src/main/java/com/forgon/exception/ApplyDepartNoMatchParentAreaException.java =================================================================== diff -u --- forgon-tools/src/main/java/com/forgon/exception/ApplyDepartNoMatchParentAreaException.java (revision 0) +++ forgon-tools/src/main/java/com/forgon/exception/ApplyDepartNoMatchParentAreaException.java (revision 40727) @@ -0,0 +1,14 @@ +package com.forgon.exception; + +/** + * 申请科室没有关联病区的异常 + */ +public class ApplyDepartNoMatchParentAreaException extends RuntimeException { + + private static final long serialVersionUID = 3584291129116743306L; + + public ApplyDepartNoMatchParentAreaException(String message){ + super(message); + } + +}