Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r35715 -r35716 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35715) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35716) @@ -2330,8 +2330,7 @@ .getContainerByBarcode(basketBarcode); String status = basket .getStatus(); - if (basket != null - && Container.CONTAINER_STATUS_WASHLOADING.equals(status) + if (Container.CONTAINER_STATUS_WASHLOADING.equals(status) || Container.CONTAINER_STATUS_WASHING.equals(status)) { return null; } @@ -2661,8 +2660,7 @@ .getContainerByBarcode(basketBarcode); String status = basket .getStatus(); - if (basket != null - && Container.CONTAINER_STATUS_WASHLOADING.equals(status) + if (Container.CONTAINER_STATUS_WASHLOADING.equals(status) || Container.CONTAINER_STATUS_WASHING.equals(status)) { return null; } @@ -3880,7 +3878,7 @@ } } }*/ - if(cb != null && cb.getWashEndTime() != null){ + if(cb.getWashEndTime() != null){ //JYSRMYY-22通过清洗记录所在的清洗机的“是否清洗时间结束后装配”属性进行判断是否清洗完成再装配 if(!isPackingAfterWashTimeEnd(cb)){ errorMsg = "标识牌条码为"+ barcode +"的【"+ tousseDefinition.getName() +"】正在清洗，不能进行装配！"; @@ -4056,9 +4054,7 @@ if(validUntil != null){ validDateToPrint = df.format(validUntil); } - if(sterileStartTime != null){ - sterilizationDateToPrint = df.format(sterileStartTime); - } + sterilizationDateToPrint = df.format(sterileStartTime); markTousse = expirationObj.optBoolean("markTousse"); } @@ -5813,7 +5809,7 @@ if(StringUtils.equals(type, "一次性物品")){ String goodsName = item.optString("name"); JSONObject obj = CssdUtils.getGoodsNameAndSp(goodsName); - Integer amount = item.optInt("materialAmount"); + int amount = item.optInt("materialAmount"); if(amount == 0){ continue;//过滤掉数量为0的材料 } @@ -5824,7 +5820,7 @@ throw new RuntimeException(goodsName + ",一次性物品定义已不存在！"); } diposableGoodsInstance.setDiposableGoods(disposableGoods); - diposableGoodsInstance.setAmount(Integer.valueOf(amount)); + diposableGoodsInstance.setAmount(amount); diposableGoodsInstance.setTousse(newTousseDefinition); diposableGoodsInstanceList.add(diposableGoodsInstance); disposableGoodsAmount += diposableGoodsInstance.getAmount(); @@ -6196,7 +6192,7 @@ out : if (StringUtils.isNotBlank(idCardInstanceID)){ PackingTask currentPackingTask = null;//当前器械包实例对应的装配任务 - if(packingTaskList != null && packingTaskList.size() == 1){ + if(packingTaskList.size() == 1){ currentPackingTask = packingTaskList.get(0); } if(currentPackingTask == null){ @@ -6640,61 +6636,61 @@ tousseInstance.setOrgUnitName(orgUnitName); tousseInstance.setComboTousseInstanceId(comboTousseInstanceId); Long washRecordId = null; - if (currentPackingTask != null) { - tousseInstance.setClassifyBasket_id(currentPackingTask - .getClassifyBasket_id()); - washRecordId = currentPackingTask.getWashRecord_id(); - Long washRecord_id = washRecordId; - if (washRecord_id != null) { - WashAndDisinfectRecord washRecord = idToWashRecordMap - .get(washRecord_id); - if (washRecord != null) { - tousseInstance.setDisinfectIdentification(washRecord - .getDisinfectIdentification()); - tousseInstance.setDisinfectProgram(washRecord - .getDisinfectProgram()); - tousseInstance.setWashOperator(washRecord.getOperator()); - tousseInstance.setWashOperatorCode(washRecord.getOperatorCode()); - tousseInstance.setWashStartTime(washRecord - .getStartDateStr()); - tousseInstance.setWashEndTime(washRecord.getEndDateStr()); - } + + tousseInstance.setClassifyBasket_id(currentPackingTask + .getClassifyBasket_id()); + washRecordId = currentPackingTask.getWashRecord_id(); + Long washRecord_id = washRecordId; + if (washRecord_id != null) { + WashAndDisinfectRecord washRecord = idToWashRecordMap + .get(washRecord_id); + if (washRecord != null) { + tousseInstance.setDisinfectIdentification(washRecord + .getDisinfectIdentification()); + tousseInstance.setDisinfectProgram(washRecord + .getDisinfectProgram()); + tousseInstance.setWashOperator(washRecord.getOperator()); + tousseInstance.setWashOperatorCode(washRecord.getOperatorCode()); + tousseInstance.setWashStartTime(washRecord + .getStartDateStr()); + tousseInstance.setWashEndTime(washRecord.getEndDateStr()); } - // 如果是质量监测废弃产生的装配任务，把重新生成的包条码，记录到质量检测和废弃器械包的信息,并且把新的包条码记录到废弃的包 - if(StringUtils.isNotBlank(currentPackingTask.getDiscardTiBarcode())){ - // 获取质量监测记录 - String barcode = currentPackingTask.getDiscardTiBarcode(); - TousseInstance discardTi = tousseInstanceManager.getTousseInstanceByBarcode(barcode); - Session session = objectDao.getHibernateSession(); - Query query = session.createQuery(" select qmi from QualityMonitoringInstance qmi where qmi.id in (select qmd.qualityMonitoringInstance.id from QualityMonitoringGoods qmd where barcode = :barcode) "); - query.setParameter("barcode", barcode); - List qmis = query.list(); - if( qmis != null && CollectionUtils.isNotEmpty(qmis)) - { - for(QualityMonitoringInstance qmi : qmis){ - String qmiRemark = qmi.getRemark(); - if(StringUtils.isBlank(qmiRemark)){ - qmi.setRemark("废弃包条码： " + barcode + ",重新装配条码 ： " + barcodeStr + "; "); - }else{ - qmi.setRemark("废弃包条码： " + barcode + ",重新装配条码 ： " + barcodeStr + "; " + qmiRemark); - } - objectDao.saveOrUpdate(qmi); + } + // 如果是质量监测废弃产生的装配任务，把重新生成的包条码，记录到质量检测和废弃器械包的信息,并且把新的包条码记录到废弃的包 + if(StringUtils.isNotBlank(currentPackingTask.getDiscardTiBarcode())){ + // 获取质量监测记录 + String barcode = currentPackingTask.getDiscardTiBarcode(); + TousseInstance discardTi = tousseInstanceManager.getTousseInstanceByBarcode(barcode); + Session session = objectDao.getHibernateSession(); + Query query = session.createQuery(" select qmi from QualityMonitoringInstance qmi where qmi.id in (select qmd.qualityMonitoringInstance.id from QualityMonitoringGoods qmd where barcode = :barcode) "); + query.setParameter("barcode", barcode); + List qmis = query.list(); + if( qmis != null && CollectionUtils.isNotEmpty(qmis)) + { + for(QualityMonitoringInstance qmi : qmis){ + String qmiRemark = qmi.getRemark(); + if(StringUtils.isBlank(qmiRemark)){ + qmi.setRemark("废弃包条码： " + barcode + ",重新装配条码 ： " + barcodeStr + "; "); + }else{ + qmi.setRemark("废弃包条码： " + barcode + ",重新装配条码 ： " + barcodeStr + "; " + qmiRemark); } + objectDao.saveOrUpdate(qmi); } - if(discardTi != null){ - discardTi.setInsteadTiBarcode(barcodeStr); - objectDao.saveOrUpdate(discardTi); - } + } + if(discardTi != null){ + discardTi.setInsteadTiBarcode(barcodeStr); + objectDao.saveOrUpdate(discardTi); + } // String whereSql = " where po.barcode = '" + barcode + "'"; // QualityMonitoringInstance qmi = (QualityMonitoringInstance)objectDao.getBySql(QualityMonitoringInstance.class.getSimpleName(), whereSql); // if(qmi != null){ // String qmiRemark = qmi.getRemark(); // qmi.setRemark("废弃包条码： " + barcode + ",重新装配条码 ： " + barcodeStr + "; " + qmiRemark); // objectDao.saveOrUpdate(qmi); // } - } } - + + //设置包实例清洗信息 if (PackingTask.TASK_RECYCLINGRECORD.equals(currentPackingTask.getTaskType()) && washJson != null) { tousseInstance.setClassifyBasketIds(washJson.optString("classifyBasketIds")); @@ -6731,38 +6727,38 @@ } // 根据装配任务设置器械包实例的申请单id或回收单id - if (currentPackingTask != null) { - tousseInstance.setWashBasket(currentPackingTask - .getRecyclingBasketName()); - if (PackingTask.TASK_APPLICATION.equals(currentPackingTask - .getTaskType())) { - tousseInstance.setInvoicePlanID(currentPackingTask - .getSourceId()); - } else if (PackingTask.TASK_RECYCLINGRECORD - .equals(currentPackingTask.getTaskType())) { - tousseInstance.setRecyclingRecordId(currentPackingTask - .getSourceId()); - // 查询出该回收单对象 - RecyclingRecord recyclingRecord = idToRecyclingRecordMap - .get(currentPackingTask.getSourceId()); - //根据回收记录设置回收时间 - if(recyclingRecord != null){ - tousseInstance.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null)); - } - if (recyclingRecord != null - && recyclingRecord.getRecyclingApplication() != null) { - tousseInstance.setInvoicePlanID(recyclingRecord - .getRecyclingApplication().getId()); - } - }else if (PackingTask.TASK_QUALITY_MONITOR.equals(currentPackingTask.getTaskType())) { - // 质量监测重新装配 sourceId要么是回收id，要么是申请单id，回收id优先. - tousseInstance.setRecyclingRecordId(currentPackingTask.getRpRecyclingRecordId()); - if(!DatabaseUtil.isPoIdValid(tousseInstance.getInvoicePlanID())){ - tousseInstance.setInvoicePlanID(currentPackingTask.getRpInvoicePlanId()); - } + tousseInstance.setWashBasket(currentPackingTask + .getRecyclingBasketName()); + + if (PackingTask.TASK_APPLICATION.equals(currentPackingTask + .getTaskType())) { + tousseInstance.setInvoicePlanID(currentPackingTask + .getSourceId()); + } else if (PackingTask.TASK_RECYCLINGRECORD + .equals(currentPackingTask.getTaskType())) { + tousseInstance.setRecyclingRecordId(currentPackingTask + .getSourceId()); + // 查询出该回收单对象 + RecyclingRecord recyclingRecord = idToRecyclingRecordMap + .get(currentPackingTask.getSourceId()); + //根据回收记录设置回收时间 + if(recyclingRecord != null){ + tousseInstance.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null)); } + if (recyclingRecord != null + && recyclingRecord.getRecyclingApplication() != null) { + tousseInstance.setInvoicePlanID(recyclingRecord + .getRecyclingApplication().getId()); + } + }else if (PackingTask.TASK_QUALITY_MONITOR.equals(currentPackingTask.getTaskType())) { + // 质量监测重新装配 sourceId要么是回收id，要么是申请单id，回收id优先. + tousseInstance.setRecyclingRecordId(currentPackingTask.getRpRecyclingRecordId()); + if(!DatabaseUtil.isPoIdValid(tousseInstance.getInvoicePlanID())){ + tousseInstance.setInvoicePlanID(currentPackingTask.getRpInvoicePlanId()); + } } + return tousseInstance; }