Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r25685 -r25687 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 25685) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 25687) @@ -2214,17 +2214,20 @@ .getSupplyRoomConfigByOrgUnitCoding(coding); //获取器械包审核前所在的虚拟篮筐集合 List virtualBasketNameList = new ArrayList(); + // 读取配置:是否在审核时打印标签,决定是否需要修改灭菌开始时间 + boolean needToModifySterileDate = CssdUtils.getSystemSetConfigByNameBool("printLabelWhenReviewing", false); + // 灭菌开始时间 + String sterileStartTime = TousseInstanceUtils.buildSterileStartTime(sterileDate); for (TousseInstance tousseInstance : tousses) { //获取审核前虚拟篮筐 String virtualBasketSeqNum = tousseInstance.getVirtualBasketSeqNum(); if(StringUtils.isNotBlank(virtualBasketSeqNum) && !virtualBasketNameList.contains(virtualBasketSeqNum)){ virtualBasketNameList.add(virtualBasketSeqNum); } tousseInstance.setReviewTime(now); - - String sterileStartTime = TousseInstanceUtils.buildSterileStartTime(sterileDate); - tousseInstance.setSterileStartTime(sterileStartTime); - + if(needToModifySterileDate){ + tousseInstance.setSterileStartTime(sterileStartTime); + } if (isNeedSetReviewer) { tousseInstance.setReviewer(reviewerName); tousseInstance.setReviewerCode(reviewerCode); @@ -2313,11 +2316,15 @@ if(DatabaseUtil.isOracle(dbConnection.getDatabase())){ databaseNowTime = "SYSDATE"; } - String sterileStartTimeUpdateValue = "'" + sterileStartTime + "'"; + String sterileStartTimeSql = ""; + // 如果需要修改灭菌开始时间 + if(needToModifySterileDate){ + sterileStartTimeSql = "sterileStartTime='" + sterileStartTime + "',"; + } String reviewerUpdateValue = StringUtils.isBlank(tousseInstance.getReviewer()) ? "null" : "'" + String.valueOf(tousseInstance.getReviewer()) + "'"; String reviewerCodeUpdateValue = StringUtils.isBlank(tousseInstance.getReviewerCode()) ? "null" : "'" + String.valueOf(tousseInstance.getReviewerCode()) + "'"; - objectDao.excuteSQL(String.format("update TousseInstance set status=%s, reviewTime=%s, sterileStartTime=%s, reviewBasket_id=%s, sterilizationBasket=%s, reviewer=%s, reviewerCode=%s where comboTousseInstanceId=%d", - "'"+ TousseInstance.STATUS_REVIEWED +"'",databaseNowTime,sterileStartTimeUpdateValue,reviewedBasketIdUpdateValue,sterilizationBasketUpdateValue,reviewerUpdateValue,reviewerCodeUpdateValue,tousseInstance.getId())); + objectDao.excuteSQL(String.format("update TousseInstance set status=%s, reviewTime=%s, %s reviewBasket_id=%s, sterilizationBasket=%s, reviewer=%s, reviewerCode=%s where comboTousseInstanceId=%d", + "'"+ TousseInstance.STATUS_REVIEWED +"'",databaseNowTime,sterileStartTimeSql,reviewedBasketIdUpdateValue,sterilizationBasketUpdateValue,reviewerUpdateValue,reviewerCodeUpdateValue,tousseInstance.getId())); } }