Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r40533 -r40558 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40533) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40558) @@ -1333,12 +1333,15 @@ @Override public void setValues(PreparedStatement ps, int i) throws SQLException { TousseInstance tousseInstance = tousseInstanceList.get(i); - String status = TousseInstance.STATUS_STERILED; - if(needFinishConfirm){ - // 如果需要灭菌完成确认,点击灭菌完成后器械包的状态为‘灭菌待确认’ - status = TousseInstance.STATUS_DELAY_CONFIRM; - } - + String status = null; + if(TousseInstance.STATUS_DISCARD.equals(tousseInstance.getStatus())){//已废弃不需要修改状态 + status = tousseInstance.getStatus(); + }else if(needFinishConfirm){ + // 如果需要灭菌完成确认,点击灭菌完成后器械包的状态为‘灭菌待确认’ + status = TousseInstance.STATUS_DELAY_CONFIRM; + }else{ + status = TousseInstance.STATUS_STERILED; + } //如果为消毒物品则状态变为已消毒(用于省医高水平消毒的需求,since 2016-01-20 SYF) //GZYKDXFSKQ-70 棉球包(一次性)灭菌完成后,包的状态变成已消毒的问题 /*if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseInstance.getTousseDefinition().getTousseType())){ @@ -1891,13 +1894,13 @@ Long originalSterilizationRecordId, Map barcodePositionMap, JSONArray delTousseJsonArr, Map subTdAmountMap,JSONObject paramObj, Map parameterMap) { - boolean enableTheSterilizationResultJudgmentFunction = CssdUtils.getSystemSetConfigByNameBool("enableTheSterilizationResultJudgmentFunction", false); try { KeyValue keyValue = (KeyValue) objectDao.getByProperty_ForUpdate(KeyValue.class.getSimpleName(), "key", "software.dataVersion"); } catch (Exception e) { e.printStackTrace(); throw new SystemException("其它灭菌记录保存中,请稍后再试!"); } + boolean enableTheSterilizationResultJudgmentFunction = CssdUtils.getSystemSetConfigByNameBool("enableTheSterilizationResultJudgmentFunction", false); Map result = new HashMap(); String status = sterilizationRecord.getStatus(); //注意:如果灭菌状态不是“空”或者“灭菌中”或者“暂存”,不给保存,防止不规范的操作。 @@ -2341,7 +2344,9 @@ for (TousseInstance tousseInstance : whithoutBasketTousseIns) { TousseDefinition td = tousseInstance.getTousseDefinition(); if(subTdAmountMap.keySet().contains(td) && subTdAmountMap.get(td).intValue() > 0){ - tousseInstance.setStatus(TousseInstance.STATUS_REVIEWED); + if(!TousseInstance.STATUS_DISCARD.equals(tousseInstance.getStatus())){//ZSYY-431 已废弃的包不应该被改为已审核 + tousseInstance.setStatus(TousseInstance.STATUS_REVIEWED); + } if(enableInstrumentLifeCycleTraceabilityManagement && DatabaseUtil.isPoIdValid(tousseInstance.getIdCardInstanceID())){ removeIdCardInstanceIDs.add(tousseInstance.getIdCardInstanceID()); }