Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r31138 -r31149 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 31138) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 31149) @@ -1510,6 +1510,7 @@ if(tousseInstance != null && tousseInstance.isSteriling()){ modifiedBarcodes.add(tousseInstance.getBarcode()); tousseInstance.setStatus(TousseInstance.STATUS_REVIEWED); + tousseInstance.setSterilizerPosition(null); tousseInstanceManager.save(tousseInstance); } } @@ -1546,6 +1547,7 @@ // tousseInstanceManager.deleteReviewedBasket(reviewedBasket); reviewedBasket.getContainer().setStatus( Container.CONTAINER_STATUS_STERILIZELOADING); + reviewedBasket.setSterilizerPosition(null); //设置篮筐中的器械包状态为已审核 Set set = reviewedBasket.getTousseInstances(objectDao); setTousseInstanceToReviewid(set); @@ -1567,7 +1569,7 @@ */ private void setTousseInstanceToReviewid(SterilizationRecord sterilizationRecord) { if(DatabaseUtil.isPoIdValid(sterilizationRecord.getId())){ - String updateSql = String.format("update %s set status = '%s' where id in " + String updateSql = String.format("update %s set status = '%s', sterilizerPosition = null where id in " + "(select tousseInstance_id from sterilization_tousseInstance where sterilizationRecord_id = %s) ", TousseInstance.class.getSimpleName(),TousseInstance.STATUS_REVIEWED, sterilizationRecord.getId()); objectDao.excuteSQL(updateSql); @@ -1810,6 +1812,7 @@ originalReviewedBasket.getContainer().setStatus( Container.CONTAINER_STATUS_STERILIZELOADING); originalReviewedBasket.setSterilizationRecords(null); + originalReviewedBasket.setSterilizerPosition(null); objectDao.saveOrUpdate(originalReviewedBasket); // 原有篮筐内的器械包的状态还原为[已审核] @@ -2429,6 +2432,7 @@ Container.CONTAINER_STATUS_FREE); reviewedBasket.setSterilizationRecords(null); reviewedBasket.getContainer().setStatus(Container.CONTAINER_STATUS_FREE); + reviewedBasket.setSterilizerPosition(null); objectDao.excuteSQL(String.format(delReviewedBasketSql, reviewedBasket.getId()));//移除中间表 objectDao.saveOrUpdate(reviewedBasket.getContainer()); objectDao.saveOrUpdate(reviewedBasket); @@ -5573,6 +5577,7 @@ ti.setSterilingType(null); ti.setWareHouseId(null); ti.setWareHouseName(null); + ti.setSterilizerPosition(null); try { objectDao.saveOrUpdate(ti); objectDao.excuteSQL(String.format(deleteSql, ti.getId()));//断掉灭菌记录和包实例中间表的关系 @@ -5601,6 +5606,7 @@ ti.setSterilingType(null); ti.setWareHouseId(null); ti.setWareHouseName(null); + ti.setSterilizerPosition(null); objectDao.saveOrUpdate(ti); delTousseInstances.add(ti); } @@ -5769,6 +5775,7 @@ objectDao.saveOrUpdate(ti); } rb.getContainer().setStatus(Container.CONTAINER_STATUS_STERILIZELOADING);//移除以后需要把篮筐变成灭菌装载状态 + rb.setSterilizerPosition(null); objectDao.excuteSQL(String.format(delReviewedBasketSql, rs.getLong("id")));//移除中间表 objectDao.saveOrUpdate(rb.getContainer()); objectDao.saveOrUpdate(rb);