Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r33733 -r33830 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 33733) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 33830) @@ -5959,6 +5959,7 @@ WareHouse defaultWareHouse = wareHouseManager.getDefaultWareHouseByUnitCode(orgUnitCode); //=====================1、处理器械包 //=========================处理新增器械包 + boolean sterilizationRecordFinishConfirm = CssdUtils.getSystemSetConfigByNameBool("sterilizationRecordFinishConfirm", false); if(CollectionUtils.isNotEmpty(tousseInstanceBarcodes)){ for(String tousseInstanceBarcode : tousseInstanceBarcodes){ tousseInstanceBarcodesInclude.add(tousseInstanceBarcode); @@ -5996,8 +5997,13 @@ /*if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(rs.getString("type"))){ ti.setStatus(TousseInstance.STATUS_DISINFECTED); }else{*/ - ti.setStatus(TousseInstance.STATUS_STERILED); + //ti.setStatus(TousseInstance.STATUS_STERILED); //} + if(sterilizationRecordFinishConfirm && sterilizationRecord.getSrSituationComfirmTime() != null){ + ti.setStatus(TousseInstance.STATUS_DELAY_CONFIRM); + }else{ + ti.setStatus(TousseInstance.STATUS_STERILED); + } ti.setSterileEndTime(endDateOfSr); setValidUntilAndWarningUntil(ti, edsMap, sr); ti.setSterileStartTime(startDateOfSr); @@ -6180,7 +6186,11 @@ goodsStockManager.addToList(inStockTousseList, ti, defaultWareHouse); tousseInstanceManager.setToWarehouse(ti, defaultWareHouse); } - ti.setStatus(TousseInstance.STATUS_STERILED); + if(sterilizationRecordFinishConfirm && sterilizationRecord.getSrSituationComfirmTime() != null){ + ti.setStatus(TousseInstance.STATUS_DELAY_CONFIRM); + }else{ + ti.setStatus(TousseInstance.STATUS_STERILED); + } } ti.setSterileEndTime(endDateOfSr); ti.setSterileStartTime(startDateOfSr);