Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js =================================================================== diff -u -r26661 -r26784 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js (.../interfereRecordForm.js) (revision 26661) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js (.../interfereRecordForm.js) (revision 26784) @@ -780,7 +780,8 @@ sterilizationRecordId : sterilizationRecordId, //灭菌记录id checkProxyDisinfection : 'yes', //是否需要检查代理灭菌是否已录入代理灭菌单 saveBarcode : getAlreadyScanBarcodes(), //此次扫描之前已经扫描的条码集合,通过节点获取 - myBarcodes : JSON.stringify(myBarcodes) //此次扫描之前已经扫描的条码集合,通过数组获取 + myBarcodes : JSON.stringify(myBarcodes), //此次扫描之前已经扫描的条码集合,通过数组获取 + isLimitedByDate : false }, success : function(response, options) { var result = response.responseText; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r26676 -r26784 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 26676) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 26784) @@ -64,9 +64,10 @@ * @param sterilizationRecordId 灭菌记录id * @param barcodeStr 唯一条码集合 * @param finalBarcodes 最终整合的条码集合 + * @param isLimitedByDate 是否受日期限制 (如干预灭菌增删器械包,不受限制) * @return */ - public JSONObject loadTousseInstanceInfo(Long sterilizationRecordId , String barcodeStr,String finalBarcodes); + public JSONObject loadTousseInstanceInfo(Long sterilizationRecordId , String barcodeStr,String finalBarcodes, Boolean isLimitedByDate); /** * 灭菌完成. Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r26676 -r26784 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 26676) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 26784) @@ -729,14 +729,19 @@ barcodeStr = barcodeStr.replaceAll("\r\n", ""); String savedBarcodes = StrutsParamUtils.getPraramValue("saveBarcode", ""); String myBarcodes = StrutsParamUtils.getPraramValue("myBarcodes",""); + String isLimitedByDateStr = StrutsParamUtils.getPraramValue("isLimitedByDate",null); + Boolean isLimitedByDate = true; + if(StringUtils.isNotBlank(isLimitedByDateStr) && "false".equals(isLimitedByDateStr)){//StrutsParamUtils.getBoolPraramValue拿默认值不准确,所有用String接收前台参数 + isLimitedByDate = false; + } myBarcodes = myBarcodes.replace("\"","").replace("[","").replace("]","").replace(",",";"); String finalBarcodes =""; String str = savedBarcodes==""?"":";"; finalBarcodes = savedBarcodes+str+myBarcodes; if (StringUtils.isNotBlank(barcodeStr)) { try{ - JSONObject jsonObject = sterilizationRecordManager.loadTousseInstanceInfo(sterilizationRecordId , barcodeStr,finalBarcodes); + JSONObject jsonObject = sterilizationRecordManager.loadTousseInstanceInfo(sterilizationRecordId , barcodeStr,finalBarcodes, isLimitedByDate); StrutsResponseUtils.output(jsonObject); }catch(RuntimeException e){ e.printStackTrace(); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r26765 -r26784 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 26765) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 26784) @@ -3313,7 +3313,7 @@ } @Override - public JSONObject loadTousseInstanceInfo(Long sterilizationRecordId , String barcodeStr,String finalBarcodes){ + public JSONObject loadTousseInstanceInfo(Long sterilizationRecordId , String barcodeStr,String finalBarcodes, Boolean isLimitedByDate){ String[] barcodeArray = barcodeStr.split(";"); String barcode = barcodeArray[0]; BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode); @@ -3500,7 +3500,7 @@ } } else { // 需要追溯的器械包 //判断该包实例装配时原定的灭菌日期是否是今天以后 - if(donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord){ + if(isLimitedByDate && donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord){ //如果器械包灭菌时间超过今天,则提示不能添加灭菌 /*if(tousseInstance.getSterileStartTime().substring(0 , 10).compareTo(ForgonDateUtils.safelyFormatDate(new Date(), Constants.SIMPLEDATEFORMAT_YYYYMMDD, null)) >= 1){ jsonObj.put("success", -1); @@ -3627,7 +3627,7 @@ countAmount++; }else{ //判断该包实例装配时原定的灭菌日期是否是今天以后 - if(donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord){ + if(isLimitedByDate && donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord){ //如果器械包灭菌时间超过今天,则提示不能添加灭菌 /*if(tousseInstance.getSterileStartTime().substring(0 , 10).compareTo(ForgonDateUtils.safelyFormatDate(now, Constants.SIMPLEDATEFORMAT_YYYYMMDD, null)) >= 1){ jsonObj.put("success", -1); @@ -3719,7 +3719,7 @@ for(int i = 0; i < tousseInstanceList.size(); i++){ tousseInstance = (TousseInstance)tousseInstanceList.get(i); //判断该包实例装配时原定的灭菌日期是否是今天以后 - if(donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord + if(isLimitedByDate && donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord && StringUtils.isNotBlank(tousseInstance.getSterileStartTime())){ //如果器械包灭菌时间超过今天,则提示不能添加灭菌 /*if(tousseInstance.getSterileStartTime().substring(0 , 10).compareTo(ForgonDateUtils.safelyFormatDate(now, Constants.SIMPLEDATEFORMAT_YYYYMMDD, null)) >= 1){ @@ -3779,7 +3779,7 @@ for(int i = 0;i < tousseInstanceList.size();i++){ tousseInstance = (TousseInstance)tousseInstanceList.get(i); //判断该包实例装配时原定的灭菌日期是否是今天以后 - if(donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord){ + if(isLimitedByDate && donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord){ //如果器械包灭菌时间超过今天,则提示不能添加灭菌 /*if(tousseInstance.getSterileStartTime().substring(0 , 10).compareTo(ForgonDateUtils.safelyFormatDate(now, Constants.SIMPLEDATEFORMAT_YYYYMMDD, null)) >= 1){ jsonObj.put("success", -1);