Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r33192 -r33195 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 33192) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 33195) @@ -407,17 +407,25 @@ obj.put("sterileDateTime2", TousseInstanceUtils.safelyGetSterileStartDateTimeStr2(tousseInstance)); obj.put("expirationDateTime2", tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM)); obj.put("urgentLevel", tousseInstance.getUrgentLevel()); - obj.put("sterilizationUserCode", tousseInstance.getSterilizationUserCode()); - obj.put("sterilizationUser", tousseInstance.getSterilizationUser()); + String sterilizationUser = tousseInstance.getSterilizationUser(); + String sterilizationUserCode = tousseInstance.getSterilizationUserCode(); + if(StringUtils.isNotBlank(sterilizationUser) && StringUtils.isBlank(sterilizationUserCode)){ + User user = userManager.getUserByFullName(sterilizationUser); + if(user != null){ + sterilizationUserCode = user.getName(); + } + } + obj.put("sterilizationUserCode", sterilizationUserCode); + obj.put("sterilizationUser", sterilizationUser); if(foreignProxyDisinfection != null){ obj.put("makerCode", foreignProxyDisinfection.getMakerCode()); obj.put("assistantCode", foreignProxyDisinfection.getAssistantCode()); obj.put("maker", foreignProxyDisinfection.getMaker()); obj.put("assistant", foreignProxyDisinfection.getAssistant()); obj.put("applicant", foreignProxyDisinfection.getApplicant()); obj.put("applicantDepart", foreignProxyDisinfection.getDepart()); - if(StringUtils.isBlank(tousseInstance.getSterilizationUser()) - && StringUtils.isBlank(tousseInstance.getSterilizationUserCode())){ + if(StringUtils.isBlank(sterilizationUser) + && StringUtils.isBlank(sterilizationUserCode)){ //器械包还没有灭菌,灭菌员取外部代理灭菌单上的灭菌员 obj.put("sterilizationUserCode", foreignProxyDisinfection.getSterilizationUserCode()); obj.put("sterilizationUser", foreignProxyDisinfection.getSterilizationUser()); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r33192 -r33195 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 33192) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 33195) @@ -843,6 +843,12 @@ String reviewerCode = tousseInstance.getReviewerCode(); String sterileUserName = tousseInstance.getSterilizationUser(); String sterileUserCode = tousseInstance.getSterilizationUserCode(); + if(StringUtils.isNotBlank(sterileUserName) && StringUtils.isBlank(sterileUserCode)){ + User user = (User) objectDao.getByProperty(User.class.getName(), "fullName", sterileUserName); + if(user != null){ + sterileUserCode = user.getName(); + } + } if(foreignProxyDisinfection != null){ //HBTSGRYY-4【器械包信息】界面重新打印外部代理灭菌包的标签时,灭菌员信息未显示 if(StringUtils.isBlank(sterileUserName)