Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseApplicationDto.java =================================================================== diff -u -r39758 -r40735 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseApplicationDto.java (.../WeChatMiniProgForeignTousseApplicationDto.java) (revision 39758) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseApplicationDto.java (.../WeChatMiniProgForeignTousseApplicationDto.java) (revision 40735) @@ -38,6 +38,11 @@ private String patient; /** + * 检查申请科室和病区是否有关联,默认不检查DGSETYY-122 + */ + private boolean checkApplyDepartPatientAreaRelation = false; + + /** * 申请的器械包 */ private List foreignTousseInfo; @@ -97,5 +102,13 @@ public void setForeignTousseInfo(List foreignTousseInfo) { this.foreignTousseInfo = foreignTousseInfo; } + + public boolean getCheckApplyDepartPatientAreaRelation() { + return checkApplyDepartPatientAreaRelation; + } + + public void setCheckApplyDepartPatientAreaRelation(boolean checkApplyDepartPatientAreaRelation) { + this.checkApplyDepartPatientAreaRelation = checkApplyDepartPatientAreaRelation; + } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r40716 -r40735 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 40716) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 40735) @@ -5106,7 +5106,7 @@ //申请单物品明细 String foreignTousseInfo = buildForeignTousseInfo(actionType, dto); String timeoutHandType = null; - this.saveOrUpdate(origineFta, foreignTousseApplication, foreignTousseInfo , actionType, timeoutHandType, false); + this.saveOrUpdate(origineFta, foreignTousseApplication, foreignTousseInfo , actionType, timeoutHandType, dto.getCheckApplyDepartPatientAreaRelation()); } /**