Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r28640 -r28664 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 28640) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 28664) @@ -1857,8 +1857,6 @@ if(CollectionUtils.isEmpty(canDelId)){ return null; } - //灭菌总数调整 - sterilizationRecord.setAmount(sterilizationRecord.getAmount() - canDelId.size()); //包实例相关灭菌信息置空 objectDao.executeUpdate(getReturnSql(canDelId)); //篮筐状态回滚 @@ -4836,8 +4834,6 @@ String sterileFrequency = sr.getFrequency()+""; //=====================1、处理器械包 //=========================处理新增器械包 - //灭菌记录的灭菌总数变化的数量 - int changeAmount = 0; if(CollectionUtils.isNotEmpty(tousseInstanceBarcodes)){ for(String tousseInstanceBarcode : tousseInstanceBarcodes){ tousseInstanceBarcodesInclude.add("'" + tousseInstanceBarcode + "'"); @@ -4870,7 +4866,6 @@ ti.setSterilingType(sr.getSterilizationType()); objectDao.saveOrUpdate(ti); objectDao.excuteSQL(String.format(insertSql, sr.getId(),ti.getId()));//中间表插入数据 - changeAmount++; } } catch (Exception e) { e.printStackTrace(); @@ -4917,7 +4912,6 @@ try { objectDao.saveOrUpdate(ti); objectDao.excuteSQL(String.format(deleteSql, ti.getId()));//断掉灭菌记录和包实例中间表的关系 - changeAmount--; } catch (Exception e) { e.printStackTrace(); result.put(JSONUtil.JSON_KEY_SUCCESS, false); @@ -4977,7 +4971,6 @@ ti.setSterilizerName(sr.getSterilizerName()); ti.setSterileFrequency(sterileFrequency); objectDao.saveOrUpdate(ti); - changeAmount++; } rb.getContainer().setStatus( Container.CONTAINER_STATUS_FREE);//设置篮筐为空闲 objectDao.saveOrUpdate(rb.getContainer()); @@ -5029,7 +5022,6 @@ ti.setSterileFrequency(null); ti.setSterilingType(null); objectDao.saveOrUpdate(ti); - changeAmount--; } rb.getContainer().setStatus(Container.CONTAINER_STATUS_STERILIZELOADING);//移除以后需要把篮筐变成灭菌装载状态 objectDao.excuteSQL(String.format(delReviewedBasketSql, rs.getLong("id")));//移除中间表 @@ -5049,9 +5041,7 @@ // sr.setTousseInstanceList(oldTousseInstanceList); updateSterilizationRecordForUrgentLevel(sr,null); } - if(changeAmount != 0){ - sterilizationRecord.setAmount(sterilizationRecord.getAmount() + changeAmount); - } + updateSterilizationRecordStatisticsInfo(sterilizationRecord); result.put(JSONUtil.JSON_KEY_SUCCESS, true); result.put(JSONUtil.JSON_KEY_MESSAGE, "保存成功"); return result;