Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r15554 -r15568 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15554) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15568) @@ -483,8 +483,10 @@ LoginUserData loginUser = AcegiHelper.getLoginUser(); String orgUnitCoding = ""; + String orgUnitName = ""; if (loginUser != null) { orgUnitCoding = loginUser.getOrgUnitCodingFromSupplyRoomConfig(); + orgUnitName = loginUser.getOrgUnitNameCodingFromSupplyRoomConfig(); } // 价格及浮动价格 @@ -551,6 +553,7 @@ tousseInstance.setBarcode(serialNumberStr); tousseInstance.setOrgUnitCoding(orgUnitCoding); + tousseInstance.setOrgUnitName(orgUnitName); tousseInstance.setOperationTime(currentTime); //如果未扫描灭菌筐可外部代理灭菌包定义是否审核为否时,包实例的状态变为已审核 if(basket != null || TousseDefinition.STR_NO.equals(tousseDefinition.getIsReview())){ Index: forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java =================================================================== diff -u -r12579 -r15568 --- forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java (.../LoginUserData.java) (revision 12579) +++ forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java (.../LoginUserData.java) (revision 15568) @@ -65,9 +65,9 @@ private String directCompanyNamesWhereUserBelong; //用户直属公司和间接所属公司id(实际是组织机构编码)集合,用逗号分隔的字符串 private String allCompanyIdsWhereUserBelong; - //用户所属的部门供应室(一级供应室,二级供应室,普通科室) + //用户所属的部门供应室编码(一级供应室,二级供应室,普通科室) private String orgUnitCodingFromSupplyRoomConfig; - //用户所属的部门供应室类型(一级供应室,二级供应室,普通科室) + // 用户所属的部门供应室名字(一级供应室,二级供应室,普通科室),变量名拼写有点问题 private String orgUnitNameCodingFromSupplyRoomConfig; //用户的当前的部门名称,属于多个部门时,该部门为有效的部门 private String currentOrgUnitName;