Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java =================================================================== diff -u -r40550 -r40564 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java (.../ForeignTousseApplicationManager.java) (revision 40550) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java (.../ForeignTousseApplicationManager.java) (revision 40564) @@ -271,4 +271,11 @@ public void confirmReturnOrEarlyReturnPartOfForeignTousse(Long id, List returnTousseDefinitionIdList, String returnType, String returneeOfSupplier, String returneeOfSupplierPhoneNumber, String returnMan, String completeness, String cleanQualified); + /** + * 查询外来器械包申请单的供应室接收人 + * @param foreignTousseApplication 外来器械包申请单 + * @return 供应室接收人 + */ + public String getSterileSupplyRecipient(ForeignTousseApplication foreignTousseApplication); + } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r40559 -r40564 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 40559) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 40564) @@ -5957,5 +5957,17 @@ List tousseItemIds = new ArrayList(tousseItemIdStrSet); this.confirmReturnOrEarlyReturnPartOfTousseItem(id, tousseItemIds , returnSplitTousseDefinitionIdList, returnType, returneeOfSupplier, returneeOfSupplierPhoneNumber, returnMan, completeness, cleanQualified); } + + @Override + public String getSterileSupplyRecipient(ForeignTousseApplication foreignTousseApplication) { + if(foreignTousseApplication == null || !DatabaseUtil.isPoIdValid(foreignTousseApplication.getSterileSupplyRecipientId())){ + return null; + } + User sterileSupplyRecipientUser = userManager.get(foreignTousseApplication.getSterileSupplyRecipientId()); + if(sterileSupplyRecipientUser == null){ + return null; + } + return sterileSupplyRecipientUser.getFullName(); + } } Index: ssts-web/src/main/java/com/forgon/disinfectsystem/directory/controller/UserController.java =================================================================== diff -u -r39758 -r40564 --- ssts-web/src/main/java/com/forgon/disinfectsystem/directory/controller/UserController.java (.../UserController.java) (revision 39758) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/directory/controller/UserController.java (.../UserController.java) (revision 40564) @@ -60,6 +60,7 @@ } else { // 此用户所属科室不包含当前用户的当前科室 obj.put("isNotSameOrgUnit", true); } + obj.put("id", user.getId()); success = true; } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r40550 -r40564 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 40550) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 40564) @@ -494,6 +494,11 @@ foreignTousseApplication.setPreBindCleanBasketBarcodes(StringTools.join(preBindCleanBasketBarcodes, ";")); } } + //【外来器械包申请】新增扩展字段“供应室接收人”ZSYY-428 + String sterileSupplyRecipient = foreignTousseApplicationManager.getSterileSupplyRecipient(foreignTousseApplication); + if(StringUtils.isNotBlank(sterileSupplyRecipient)){ + foreignTousseApplication.setSterileSupplyRecipient(sterileSupplyRecipient); + } map.put("success", true); map.put("data", foreignTousseApplication); try { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java =================================================================== diff -u -r39358 -r40564 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java (.../ForeignTousseApplication.java) (revision 39358) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java (.../ForeignTousseApplication.java) (revision 40564) @@ -377,7 +377,19 @@ * 例如:00000000;00000001(不保存到数据库)DGZYY-215 */ private String preBindCleanBasketBarcodes; - + + /** + * 供应室的接收人Id + * ZSYY-428 + */ + private Long sterileSupplyRecipientId; + + /** + * 供应室的接收人姓名 + * ZSYY-428 + */ + private String sterileSupplyRecipient; + public String getProcessType() { return processType; } @@ -896,6 +908,23 @@ public void setPreBindCleanBasketBarcodes(String preBindCleanBasketBarcodes) { this.preBindCleanBasketBarcodes = preBindCleanBasketBarcodes; } + + public Long getSterileSupplyRecipientId() { + return sterileSupplyRecipientId; + } + + public void setSterileSupplyRecipientId(Long sterileSupplyRecipientId) { + this.sterileSupplyRecipientId = sterileSupplyRecipientId; + } + + public String getSterileSupplyRecipient() { + return sterileSupplyRecipient; + } + + public void setSterileSupplyRecipient(String sterileSupplyRecipient) { + this.sterileSupplyRecipient = sterileSupplyRecipient; + } + @Override public ForeignTousseApplication clone() throws CloneNotSupportedException { ForeignTousseApplication ip = (ForeignTousseApplication)super.clone();