Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java =================================================================== diff -u -r17787 -r17832 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java (.../TousseTransitionPlanManagerImpl.java) (revision 17787) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java (.../TousseTransitionPlanManagerImpl.java) (revision 17832) @@ -29,13 +29,13 @@ if(useRecord == null){ throw new RuntimeException("使用记录不能为空"); } - if(DatabaseUtil.isPoIdValid(useRecord.getId())){ + if(!DatabaseUtil.isPoIdValid(useRecord.getId())){ throw new RuntimeException("使用记录id为空,请先保存使用记录"); } if(invoicePlan == null){ throw new RuntimeException("申请单不能为空"); } - if(DatabaseUtil.isPoIdValid(invoicePlan.getId())){ + if(!DatabaseUtil.isPoIdValid(invoicePlan.getId())){ throw new RuntimeException("申请单id为空,请先保存申请单"); } if(CollectionUtils.isEmpty(items)){ Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManagerImpl.java =================================================================== diff -u -r17787 -r17832 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManagerImpl.java (.../TousseTransitionPlanItemManagerImpl.java) (revision 17787) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManagerImpl.java (.../TousseTransitionPlanItemManagerImpl.java) (revision 17832) @@ -22,7 +22,7 @@ if(tousseTransitionPlan == null){ throw new RuntimeException("器械交接单不能为空"); } - List exists = getByProperty("TousseTransitionPlanId", tousseTransitionPlan.getId()); + List exists = getByProperty("tousseTransitionPlanId", tousseTransitionPlan.getId()); for(TousseTransitionPlanItem item:items){ TousseTransitionPlanItem find = find(exists,item.getTousseItemId()); if(find == null){ Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r17718 -r17832 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 17718) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 17832) @@ -54,6 +54,7 @@ import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionPlanItem; import com.forgon.disinfectsystem.entity.useRecord.UseDiposableGoodsItem; import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.entity.useRecord.UseRecordToRecycleApplication; @@ -62,6 +63,9 @@ import com.forgon.disinfectsystem.stockmanage.departmentstock.service.DepartmentStockManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager; +import com.forgon.disinfectsystem.toussetransition.service.TousseTransitionItemManager; +import com.forgon.disinfectsystem.toussetransition.service.TousseTransitionPlanItemManager; +import com.forgon.disinfectsystem.toussetransition.service.TousseTransitionPlanManager; import com.forgon.disinfectsystem.vo.UseMaterialGoodsItem; import com.forgon.tools.MathTools; import com.forgon.tools.db.DatabaseUtil; @@ -99,6 +103,10 @@ private BarcodeManager barcodeManager; private DataSynchronizationManager dataSynchronizationManager; + + private TousseTransitionPlanItemManager tousseTransitionPlanItemManager; + + private TousseTransitionPlanManager tousseTransitionPlanManager; public void setIdCardInstanceManager(IDCardInstanceManager idCardInstanceManager) { this.idCardInstanceManager = idCardInstanceManager; @@ -148,6 +156,16 @@ this.barcodeManager = barcodeManager; } + public void setTousseTransitionPlanItemManager( + TousseTransitionPlanItemManager tousseTransitionPlanItemManager) { + this.tousseTransitionPlanItemManager = tousseTransitionPlanItemManager; + } + + public void setTousseTransitionPlanManager( + TousseTransitionPlanManager tousseTransitionPlanManager) { + this.tousseTransitionPlanManager = tousseTransitionPlanManager; + } + public void deleteUseRecordById(String id) { UseRecord useRecord = getUseRecordById(id); if(useRecord != null){ @@ -996,7 +1014,7 @@ objectDao.saveOrUpdate(foreignTousseApplication); } } - // 如果器械包是外来器械包或消毒物品或灭菌物品，则不申请 + // 如果器械包是外来器械包或消毒物品或灭菌物品，则不转换申请单 continue; } else if (tousseDefinition.isCustomTousse()) { applyCustomTousseMap.put(tousseDefinition.getId(), @@ -1221,6 +1239,9 @@ useRecordConvertRecyclingApplication.setInvoicePlanId(newRecyclingApplication.getId()); useRecordConvertRecyclingApplication.setUseRecordId(useRecordId); objectDao.saveOrUpdate(useRecordConvertRecyclingApplication); + + //生成预回收记录 + tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication) , false); } } }else{ @@ -1254,7 +1275,8 @@ } } //追加申请项(相同物品的,则数量进行叠加) - recyclingApplication.appendTousseItemFromUseRecord(objectDao); + List tousseTransitionPlanItemList = + recyclingApplication.appendTousseItemFromUseRecord(objectDao); //2.插入使用记录转换申请单关联中间表 UseRecordToRecycleApplication useRecordConvertRecyclingApplication = new UseRecordToRecycleApplication(); @@ -1267,6 +1289,15 @@ //备注重新设置(病人巡回洗手护士需要将来自多条使用记录的数据拼接,手术数量与器械包数量进行重新设值) recyclingApplication.setRemark(getRemarkByRecyclingApplicationAndProjectConfig(recyclingApplication)); objectDao.saveOrUpdate(recyclingApplication); + + if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){ + List list = new ArrayList(); + for (TousseTransitionPlanItem item : tousseTransitionPlanItemList) { + //构造与生成预回收相关的数据 + list.add(tousseTransitionPlanItemManager.build(item.getTousseItemId(), item.getAmount(), item.getUrgentAmount())); + } + tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true); + } } }else if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART.equals(useRecordConvertRecyclingApplicationMergeRegular)){ //待完善 @@ -1286,6 +1317,9 @@ useRecordConvertRecyclingApplication.setInvoicePlanId(newRecyclingApplication.getId()); useRecordConvertRecyclingApplication.setUseRecordId(useRecordId); objectDao.saveOrUpdate(useRecordConvertRecyclingApplication); + + //生成预回收记录 + tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication) , false); } } } @@ -1308,6 +1342,9 @@ useRecordConvertRecyclingApplication.setInvoicePlanId(newRecyclingApplication.getId()); useRecordConvertRecyclingApplication.setUseRecordId(useRecordId); objectDao.saveOrUpdate(useRecordConvertRecyclingApplication); + + //生成预回收记录 + tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication) , false); } } } @@ -1344,6 +1381,9 @@ useRecordConvertRecyclingApplication.setInvoicePlanId(newRecyclingApplication.getId()); useRecordConvertRecyclingApplication.setUseRecordId(useRecordId); objectDao.saveOrUpdate(useRecordConvertRecyclingApplication); + + //生成预回收记录 + tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication) , false); } } }else{ @@ -1377,7 +1417,8 @@ } } //追加申请项(相同物品的,则数量进行叠加) - recyclingApplication.appendTousseItemFromUseRecord(objectDao); + List tousseTransitionPlanItemList = + recyclingApplication.appendTousseItemFromUseRecord(objectDao); //2.插入使用记录转换申请单关联中间表 UseRecordToRecycleApplication useRecordConvertRecyclingApplication = new UseRecordToRecycleApplication(); @@ -1390,6 +1431,15 @@ //备注重新设置(病人巡回洗手护士需要将来自多条使用记录的数据拼接,手术数量与器械包数量进行重新设值) recyclingApplication.setRemark(getRemarkByRecyclingApplicationAndProjectConfig(recyclingApplication)); objectDao.saveOrUpdate(recyclingApplication); + + if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){ + List list = new ArrayList(); + for (TousseTransitionPlanItem item : tousseTransitionPlanItemList) { + //构造与生成预回收相关的数据 + list.add(tousseTransitionPlanItemManager.build(item.getTousseItemId(), item.getAmount(), item.getUrgentAmount())); + } + tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true); + } } }else if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART.equals(useRecordConvertRecyclingApplicationMergeRegular)){ //待完善 @@ -1408,6 +1458,9 @@ useRecordConvertRecyclingApplication.setInvoicePlanId(newRecyclingApplication.getId()); useRecordConvertRecyclingApplication.setUseRecordId(useRecordId); objectDao.saveOrUpdate(useRecordConvertRecyclingApplication); + + //生成预回收记录 + tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication) , false); } } } @@ -1467,6 +1520,9 @@ useRecordConvertRecyclingApplication.setInvoicePlanId(newRecyclingApplication.getId()); useRecordConvertRecyclingApplication.setUseRecordId(useRecordId); objectDao.saveOrUpdate(useRecordConvertRecyclingApplication); + + //生成预回收记录 + tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication) , false); } } }else{ @@ -1499,7 +1555,8 @@ } } //追加申请项(相同物品的,则数量进行叠加) - recyclingApplication.appendTousseItemFromUseRecord(objectDao); + List tousseTransitionPlanItemList = + recyclingApplication.appendTousseItemFromUseRecord(objectDao); //2.插入使用记录转换申请单关联中间表 UseRecordToRecycleApplication useRecordConvertRecyclingApplication = new UseRecordToRecycleApplication(); @@ -1512,6 +1569,15 @@ //备注重新设置(病人巡回洗手护士需要将来自多条使用记录的数据拼接,手术数量与器械包数量进行重新设值) recyclingApplication.setRemark(getRemarkByRecyclingApplicationAndProjectConfig(recyclingApplication)); objectDao.saveOrUpdate(recyclingApplication); + + if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){ + List list = new ArrayList(); + for (TousseTransitionPlanItem item : tousseTransitionPlanItemList) { + //构造与生成预回收相关的数据 + list.add(tousseTransitionPlanItemManager.build(item.getTousseItemId(), item.getAmount(), item.getUrgentAmount())); + } + tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true); + } } }else if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART.equals(useRecordConvertRecyclingApplicationMergeRegular)){ //待完善 @@ -1531,6 +1597,9 @@ useRecordConvertRecyclingApplication.setInvoicePlanId(newRecyclingApplication.getId()); useRecordConvertRecyclingApplication.setUseRecordId(useRecordId); objectDao.saveOrUpdate(useRecordConvertRecyclingApplication); + + //生成预回收记录 + tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication) , false); } } } @@ -1583,9 +1652,16 @@ Collections.singletonList(TousseDefinition.PACKAGE_TYPE_CUSTOM) , tousseAmountOnlyCountNeedConvertGoods , tousseAmountOnlyCountNeedRecyclingGoods); //自定义器械包生成申请单 - recyclingApplicationManager.createRecyclingApplicationByCustomTousse( + List list = recyclingApplicationManager.createRecyclingApplicationByCustomTousse( applyCustomTousseMap, applicant, depart, departCoding, remark,applicationCreateDate,applyUrgentCustomTousseMap,useRecordId); + + if(CollectionUtils.isNotEmpty(list)){ + for (RecyclingApplication recyclingApplication : list) { + //生成预回收记录 + tousseTransitionPlanManager.save(useRecord, recyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(recyclingApplication) , false); + } + } } /** @@ -1742,6 +1818,22 @@ } return StringUtils.join(remarks , "、"); } + + /** + * 根据申请单构造预回收计划单明细 + * @param recyclingApplication 申请单:一般为使用记录转换的申请单 + * @return + */ + private List getTousseTransitionPlanItemListByRecyclingApplication(RecyclingApplication recyclingApplication){ + List resultList = new ArrayList(); + List list = recyclingApplication.appendTousseItemFromUseRecord(objectDao); + if(CollectionUtils.isNotEmpty(list)){ + for (TousseTransitionPlanItem tousseTransitionPlanItem : list) { + resultList.add(tousseTransitionPlanItemManager.build(tousseTransitionPlanItem.getTousseItemId(), tousseTransitionPlanItem.getAmount(), tousseTransitionPlanItem.getUrgentAmount())); + } + } + return resultList; + } /** * 使用记录合成申请单 @@ -2037,6 +2129,12 @@ // 保存并审核生成申请单 public void saveAndReviewAndConvertUseRecordForm_TRANS_REQUIRED(UseRecord modified,String operator, String depart, String departCoding,Date applicationCreateDate,String applicationFormType) throws Exception{ + if(DatabaseUtil.isPoIdValid(modified.getId())){ + modified = (UseRecord)objectDao.getByID_ForUpdate(UseRecord.class.getSimpleName(), modified.getId()); + } + if(modified.isApplied()){ + throw new RuntimeException("该使用记录已转换申请单!"); + } // 首先保存 saveUseRecord_internal(modified); // 审核并生成申请单 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java =================================================================== diff -u -r17658 -r17832 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java (.../RecyclingApplication.java) (revision 17658) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java (.../RecyclingApplication.java) (revision 17832) @@ -28,6 +28,7 @@ import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionPlanItem; import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.security.acls.AclFieldsObject; import com.forgon.tools.MathTools; @@ -259,20 +260,27 @@ } /** - * 追加申请项,只对内存变量修改,由调用的地方负责持久化 + * 追加申请项,并持久化 */ - public void appendTousseItemFromUseRecord(ObjectDao objectDao){ + public List appendTousseItemFromUseRecord(ObjectDao objectDao){ if(useRecord != null){ List tousseItemList = this.getApplicationItems(); if(tousseItemList == null){ tousseItemList = new ArrayList(); } List tousseInstanceWillBeConvertedTousseItemList = useRecord.getTousseInstanceWillBeConvertedTousseItemList(objectDao); if(CollectionUtils.isNotEmpty(tousseInstanceWillBeConvertedTousseItemList)){ + List tousseTransitionPlanItemList = new ArrayList(); for(TousseInstance tousseInstance : tousseInstanceWillBeConvertedTousseItemList){ + TousseDefinition td = tousseInstance.getTousseDefinition(); + if(td == null){ + throw new RuntimeException("未找到" + tousseInstance.getTousseName() + "的包定义数据!"); + } + TousseItem currentTousseItem = null; if(CollectionUtils.isNotEmpty(tousseItemList)){ boolean foundTousseItem = false; for (TousseItem tousseItem : tousseItemList) { + currentTousseItem = tousseItem; if(tousseInstance.getTousseDefinition().getId().longValue() == tousseItem.getTousseDefinitionId().longValue()){ tousseItem.setAmount(tousseItem.getAmount() + 1); tousseItem.setPrice(tousseInstance.getTousseDefinition().getPrice()); @@ -283,37 +291,89 @@ } if(foundTousseItem == false){ - TousseItem tousseItem = new TousseItem(); - tousseItem.setDiposable(TousseItem.DIPOSABLE_NO); - tousseItem.setInvoicePlan(this); - tousseItem.setInvoicePlanID(this.getId()); - tousseItem.setTousseName(tousseInstance.getTousseName()); - tousseItem.setAmount(1); + currentTousseItem = new TousseItem(); + currentTousseItem.setDiposable(TousseItem.DIPOSABLE_NO); + currentTousseItem.setInvoicePlan(this); + currentTousseItem.setInvoicePlanID(this.getId()); + currentTousseItem.setTousseName(tousseInstance.getTousseName()); + currentTousseItem.setAmount(1); - TousseDefinition td = tousseInstance.getTousseDefinition(); - if (td != null){ - tousseItem.setUnit(td.getUnit()); - tousseItem.setIsTraceable(td.getIsTraceable()); - tousseItem.setPrice(td.getPrice()); - tousseItem.setRowPrice(MathTools.mul(td.getPrice() , 1).doubleValue()); - tousseItem.setTousseType(td.getTousseType()); - tousseItem.setTousseDefinitionId(td.getId()); - tousseItem.setIsInvoice(td.getIsInvoice()); - tousseItem.setIsCleanedEntirely(td.getIsCleanedEntirely()); - tousseItem.setExpressRecycling(td.getExpressRecycling()); - tousseItem.setIsRecycling(td.getIsRecycling()); - tousseItem.setIsApplyEntireTousse(td.getIsApplyEntireTousse()); - if(td.isIDCardDisabled() || StringUtils.isBlank(td.getIsDisableIDCard())){ - tousseItem.setIsThereIdentificationCard(Constants.STR_NO); - }else{ - tousseItem.setIsThereIdentificationCard(Constants.STR_YES); + currentTousseItem.setUnit(td.getUnit()); + currentTousseItem.setIsTraceable(td.getIsTraceable()); + currentTousseItem.setPrice(td.getPrice()); + currentTousseItem.setRowPrice(MathTools.mul(td.getPrice() , 1).doubleValue()); + currentTousseItem.setTousseType(td.getTousseType()); + currentTousseItem.setTousseDefinitionId(td.getId()); + currentTousseItem.setIsInvoice(td.getIsInvoice()); + currentTousseItem.setIsCleanedEntirely(td.getIsCleanedEntirely()); + currentTousseItem.setExpressRecycling(td.getExpressRecycling()); + currentTousseItem.setIsRecycling(td.getIsRecycling()); + currentTousseItem.setIsApplyEntireTousse(td.getIsApplyEntireTousse()); + if(td.isIDCardDisabled() || StringUtils.isBlank(td.getIsDisableIDCard())){ + currentTousseItem.setIsThereIdentificationCard(Constants.STR_NO); + }else{ + currentTousseItem.setIsThereIdentificationCard(Constants.STR_YES); + } + objectDao.saveOrUpdate(currentTousseItem); + tousseItemList.add(currentTousseItem); + } + }else{ + currentTousseItem = new TousseItem(); + currentTousseItem.setDiposable(TousseItem.DIPOSABLE_NO); + currentTousseItem.setInvoicePlan(this); + currentTousseItem.setInvoicePlanID(this.getId()); + currentTousseItem.setTousseName(tousseInstance.getTousseName()); + currentTousseItem.setAmount(1); + + currentTousseItem.setUnit(td.getUnit()); + currentTousseItem.setIsTraceable(td.getIsTraceable()); + currentTousseItem.setPrice(td.getPrice()); + currentTousseItem.setRowPrice(MathTools.mul(td.getPrice() , 1).doubleValue()); + currentTousseItem.setTousseType(td.getTousseType()); + currentTousseItem.setTousseDefinitionId(td.getId()); + currentTousseItem.setIsInvoice(td.getIsInvoice()); + currentTousseItem.setIsCleanedEntirely(td.getIsCleanedEntirely()); + currentTousseItem.setExpressRecycling(td.getExpressRecycling()); + currentTousseItem.setIsRecycling(td.getIsRecycling()); + currentTousseItem.setIsApplyEntireTousse(td.getIsApplyEntireTousse()); + if(td.isIDCardDisabled() || StringUtils.isBlank(td.getIsDisableIDCard())){ + currentTousseItem.setIsThereIdentificationCard(Constants.STR_NO); + }else{ + currentTousseItem.setIsThereIdentificationCard(Constants.STR_YES); + } + objectDao.saveOrUpdate(currentTousseItem); + tousseItemList.add(currentTousseItem); + } + + //如果包定义为要回收且器械包类型为器械包时,构造预回收计划单明细 + if(td.isInsideTousse() && Constants.STR_YES.equals(td.getIsConvertApplyGoods())){ + if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){ + for (TousseTransitionPlanItem tousseTransitionPlanItem : tousseTransitionPlanItemList) { + if(tousseTransitionPlanItem.getTousseItemId() != null && currentTousseItem.getId() != null + && tousseTransitionPlanItem.getTousseItemId() == currentTousseItem.getId()){ + tousseTransitionPlanItem.setAmount(tousseTransitionPlanItem.getAmount() + 1); + + if(Constants.STR_YES.equals(tousseInstance.getIsUrgentForUseRecord())){ + tousseTransitionPlanItem.setUrgentAmount(tousseTransitionPlanItem.getUrgentAmount() + 1); + } + break; } } - tousseItemList.add(tousseItem); + }else{ + TousseTransitionPlanItem tousseTransitionPlanItem = new TousseTransitionPlanItem(); + tousseTransitionPlanItem.setTousseItemId(currentTousseItem.getId()); + tousseTransitionPlanItem.setAmount(1); + tousseTransitionPlanItem.setUrgentAmount(0); + if(Constants.STR_YES.equals(tousseInstance.getIsUrgentForUseRecord())){ + tousseTransitionPlanItem.setUrgentAmount(1); + } + tousseTransitionPlanItemList.add(tousseTransitionPlanItem); } } } + return tousseTransitionPlanItemList; } } + return null; } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r17797 -r17832 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 17797) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 17832) @@ -1036,11 +1036,13 @@ * * @param tousseNameAndAmount * 器械包名key-value,不能包含一次性物品 + * @return List */ @Override - public void createRecyclingApplicationByCustomTousse( + public List createRecyclingApplicationByCustomTousse( Map tousseNameAndAmount, String applicant, String depart, String departCoding, String remark,Date applicationCreateDate,Map urgentIdAndAmount,Long useRecordId) { + List list = new ArrayList(); for (Entry entry : tousseNameAndAmount.entrySet()) { RecyclingApplication recyclingApplication = new RecyclingApplication(); recyclingApplication @@ -1133,7 +1135,9 @@ } saveOrUpdateRecyclingApplication(recyclingApplication,true); + list.add(recyclingApplication); } + return list; } /** Index: ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java =================================================================== diff -u -r17658 -r17832 --- ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java (.../UseRecordManagerTests.java) (revision 17658) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java (.../UseRecordManagerTests.java) (revision 17832) @@ -946,7 +946,7 @@ @Test @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene19(){ - //场景31:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 + //场景31:器械包全部都要发货、使用记录转换的申请单不要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone); } /** @@ -955,7 +955,7 @@ @Test @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene20(){ - //场景32:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 + //场景32:器械包全部都要发货、使用记录转换的申请单不要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom); } /** @@ -1376,8 +1376,11 @@ */ private void initUseRecordConvertRecyclingApplication(String tousseAllInvoice , String needDelivedForUseRecordToRecyclingApplication ,String applicationFormType , String isDisposableGoodsConvert , String isDisposableGoodsMergeTousseConvert , String userConvertMergeRegular) { + + long startTimeMillis = System.currentTimeMillis(); //初始化数据 initCSSDData(); + System.out.println("初始化耗时:" + (System.currentTimeMillis()-startTimeMillis)); //发货给手术室,同时由手术室录使用记录 String testOrgunitName = Constants.ORG_UNIT_NAME_OR; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r17530 -r17832 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 17530) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 17832) @@ -93,7 +93,7 @@ String operationRoom,double dpf,String invoicePlanType, Map applyUrgentTousseMap,Long useRecordId); - public void createRecyclingApplicationByCustomTousse( + public List createRecyclingApplicationByCustomTousse( Map tousseNameAndAmount, String applicant, String depart, String departCoding, String remark,Date applicationCreateDate,Map urgentNameAmount,Long useRecordId); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlanItem.java =================================================================== diff -u -r17788 -r17832 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlanItem.java (.../TousseTransitionPlanItem.java) (revision 17788) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlanItem.java (.../TousseTransitionPlanItem.java) (revision 17832) @@ -21,7 +21,7 @@ /** * 预回收单id */ - private Long TousseTransitionPlanId; + private Long tousseTransitionPlanId; /** * 申请单明细id */ @@ -59,10 +59,10 @@ this.id = id; } public Long getTousseTransitionPlanId() { - return TousseTransitionPlanId; + return tousseTransitionPlanId; } public void setTousseTransitionPlanId(Long tousseTransitionPlanId) { - TousseTransitionPlanId = tousseTransitionPlanId; + this.tousseTransitionPlanId = tousseTransitionPlanId; } public Long getTousseItemId() { return tousseItemId;