Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r13654 -r13752 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 13654) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 13752) @@ -47,6 +47,7 @@ import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.print.vo.PrintPageVo; import com.forgon.disinfectsystem.print.vo.PrintRowVo; import com.forgon.disinfectsystem.print.vo.PrintSummaryVo; import com.forgon.disinfectsystem.printRecyclingApplicationConfig.service.PrintConfigManager; @@ -1026,6 +1027,18 @@ if (printSummaryList.size() >0){ int pageAmount = 0; for (PrintSummaryVo summary: printSummaryList){ + summary.setTotalPrice(0.0); + if(CollectionUtils.isNotEmpty(summary.getPages())){ + for(PrintPageVo ppv:summary.getPages()){ + if(CollectionUtils.isNotEmpty(ppv.getRows())){ + for(PrintRowVo prv:ppv.getRows()){ + BigDecimal bg = MathTools.mul(prv.getApplyAmount(), prv.getPrice()); + prv.setRowPrice(bg == null ? 0.0 : bg.doubleValue()); + summary.setTotalPrice(summary.getTotalPrice() + prv.getRowPrice()); + } + } + } + } pageAmount += summary.getPageAmount(); } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r13747 -r13752 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 13747) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 13752) @@ -363,12 +363,15 @@ //科室供应室配置 SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj(); List vos = new ArrayList(); + String currentOrgUnitCode = AcegiHelper.getCurrentOrgUnitCode(); //普通器械包、消毒物品、敷料包 String sql = " select t.id id, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id " + "from tousseinstance t, barcodedevice b , cssdHandleTousses tt , TousseDefinition td " + "where t.id = b.id and tt.tousseDefinitionId=td.ancestorID and t.tousseDefinition_id=td.id and t.reviewBasket_id =" + reviewedBasket.getId() + + " and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"') " + + " and t.orgUnitCoding='"+currentOrgUnitCode+"' and tt.orgUnitCode='"+currentOrgUnitCode+"'" + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'"; if(StringUtils.isNotBlank(taskGroup)){ @@ -381,6 +384,7 @@ + "from tousseinstance t, barcodedevice b , TousseDefinition td " + "where t.id = b.id and t.tousseDefinition_id=td.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"') and t.reviewBasket_id =" + reviewedBasket.getId() + + " and t.orgUnitCoding='"+currentOrgUnitCode+"'" + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'"; } //自定义器械包 @@ -390,6 +394,7 @@ + "from tousseinstance t, barcodedevice b , TousseDefinition td " + "where t.id = b.id and t.tousseDefinition_id=td.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') and t.reviewBasket_id =" + reviewedBasket.getId() + + " and t.orgUnitCoding='"+currentOrgUnitCode+"'" + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'"; } //外部代理灭菌 @@ -398,6 +403,7 @@ + "from tousseinstance t, barcodedevice b , TousseDefinition td " + "where t.id = b.id and t.tousseDefinition_id=td.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') and t.reviewBasket_id =" + reviewedBasket.getId() + + " and t.orgUnitCoding='"+currentOrgUnitCode+"'" + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'"; }else{ //外来器械包、外来器械拆分小包 @@ -406,20 +412,23 @@ + "from tousseinstance t, barcodedevice b , TousseDefinition td " + "where t.id = b.id and t.tousseDefinition_id=td.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"') and t.reviewBasket_id =" + reviewedBasket.getId() + + " and t.orgUnitCoding='"+currentOrgUnitCode+"'" + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'"; //自定义器械包 sql += " union all select t.id id, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id " + "from tousseinstance t, barcodedevice b , TousseDefinition td " + "where t.id = b.id and t.tousseDefinition_id=td.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') and t.reviewBasket_id =" + reviewedBasket.getId() + + " and t.orgUnitCoding='"+currentOrgUnitCode+"'" + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'"; //外部代理灭菌 sql += " union all select t.id id, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id " + "from tousseinstance t, barcodedevice b , TousseDefinition td " + "where t.id = b.id and t.tousseDefinition_id=td.id and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"') and t.reviewBasket_id =" + reviewedBasket.getId() + + " and t.orgUnitCoding='"+currentOrgUnitCode+"'" + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'"; }