Index: ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java =================================================================== diff -u -r19154 -r21806 --- ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java (.../TestDepartmentMonthDetail.java) (revision 19154) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java (.../TestDepartmentMonthDetail.java) (revision 21806) @@ -423,6 +423,8 @@ * 准备申请单 */ private void prepareApplication() { + //根据科室编码查该科室的一次性物品价格浮动系数 + BigDecimal bg = supplyRoomConfigManager.getDisposableGoodsFluctuationPriceByOrgUnitCoding(applicationDepartCoding, 1d); // 普通器械包申请单 TousseDefinition tdInside = tousseDefinitionManager.getTousseDefinitionByName("普通器械包"); RecyclingApplication application1 = new RecyclingApplication(); @@ -434,6 +436,7 @@ application1.setSettleAccountsDepart(applicationDepart); application1.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); application1.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM); + application1.setDisposablePriceFluctuation(bg); recyclingApplicationManager.saveOrUpdate(application1); List list = new ArrayList(); TousseItem item1 = new TousseItem(); @@ -461,6 +464,7 @@ application2.setSettleAccountsDepart(applicationDepart); application2.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); application2.setType(InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM); + application2.setDisposablePriceFluctuation(bg); recyclingApplicationManager.saveOrUpdate(application2); TousseItem item3 = new TousseItem(); item3.setTousseName("(妇产科护士)消毒物品_2014001"); @@ -498,6 +502,7 @@ list2.add(item2); application3.setApplicationItems(list2); application3.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD); + application3.setDisposablePriceFluctuation(bg); foreignTousseApplicationManager.saveOrUpdate(application3); // 自定义器械包申请单 @@ -524,6 +529,7 @@ list4.add(item4); application4.setApplicationItems(list4); application4.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD); + application4.setDisposablePriceFluctuation(bg); recyclingApplicationManager.saveOrUpdate(application4); // 外部代理灭菌申请单 @@ -562,6 +568,7 @@ list5.add(item5); application5.setForeignProxyItems(list5); application5.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD); + application5.setDisposablePriceFluctuation(bg); foreignProxyDisinfectionManager.saveOrUpdate(application5); int index = 0; @@ -612,6 +619,7 @@ application6.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); application6.setSerialNumber("2014021800001"); application6.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD); + application6.setDisposablePriceFluctuation(bg); objectDao.saveOrUpdate(application6); // 多一次性物品申请单 @@ -635,6 +643,7 @@ application7.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); application7.setSerialNumber("2014021100007"); application7.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD); + application7.setDisposablePriceFluctuation(bg); objectDao.saveOrUpdate(application7); }