Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r33443 -r33506 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 33443) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 33506) @@ -3330,7 +3330,6 @@ String signerOrgUnitCoding,Date signDate, String beginDate, String endDate, boolean updateSignStatus, SignRecord signRecord) { String msg = null; - Long signRecordId = null; if(StringUtils.isBlank(signer)){ msg = "签收人不能为空"; return msg; @@ -3358,7 +3357,6 @@ signRecord.setSignDate(new Date()); objectDao.saveOrUpdate(signRecord); } - signRecordId = signRecord.getId(); } if(tousseInstance.isComboTousse()){ //聚合包还需要签收其下的普通包实例 @@ -3371,7 +3369,9 @@ } tousseInstance.setSignedDate(signDate); tousseInstance.setSignedUser(signer); - tousseInstance.setSignRecordId(signRecordId); + if(signRecord != null){ + tousseInstance.setSignRecordId(signRecord.getId()); + } tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); save(tousseInstance); if(updateSignStatus){