Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r34871 -r34878 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 34871) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 34878) @@ -488,6 +488,8 @@ } } tousseInstance.setUseRecord_id(null);// 清除关联关系,并没有把器械包删除 + //清空使用记录结算科室SZSDSRMYY-95 + tousseInstance.setSettleAccountDeptCodeUseRecord(null); WareHouse warehouse = null; //包实例最后的发货单 Invoice invoice = idToInvoiceMap.get(tousseInstance.getLastInvoiceId()); @@ -2145,6 +2147,8 @@ } //使用记录是否加急属性设置为否 tousseInstance.setIsUrgentForUseRecord(Constants.STR_NO); + //清空使用记录结算科室SZSDSRMYY-95 + tousseInstance.setSettleAccountDeptCodeUseRecord(null); objectDao.saveOrUpdate(tousseInstance); //清空该器械包实例的丢失报损备注及删除其丢失报损记录 tousseInstance.clearDamageAndErrorRemarkAndData(objectDao); Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java =================================================================== diff -u -r34831 -r34878 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java (.../UseRecordUtil.java) (revision 34831) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java (.../UseRecordUtil.java) (revision 34878) @@ -196,6 +196,8 @@ String settleAccountDeptCodeUseRecord = obj.optString("settleAccountDeptCodeUseRecord", null); if(StringUtils.isNotBlank(settleAccountDeptCodeUseRecord)){ tousseInstance.setSettleAccountDeptCodeUseRecord(settleAccountDeptCodeUseRecord); + }else{ + tousseInstance.setSettleAccountDeptCodeUseRecord(null); } tousseInstance.setActualUsed(JSONUtil.optString(obj, "actualUsed", Constants.STR_YES));