Index: ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintSummaryVo.java =================================================================== diff -u -r15599 -r18762 --- ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintSummaryVo.java (.../PrintSummaryVo.java) (revision 15599) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintSummaryVo.java (.../PrintSummaryVo.java) (revision 18762) @@ -13,11 +13,15 @@ public class PrintSummaryVo { private String id; + /** + * 申请科室 + */ + private String depart; + /** + * 结算科室 + */ + private String settleAccountsDepart; - private String depart; // 申请科室 - - private String settleAccountsDepart; // 结算科室 - private String serialNum; private String applicationTime; @@ -26,21 +30,31 @@ * 页面的标题，包括器械包分组和班次信息 * 例如：专科批(1号楼) */ - private String header; // + private String header; private String remark; private String applicant; - - private String recyclingUser; // 回收人 + /** + * 回收人 + */ + private String recyclingUser; + /** + * 回收清点人 + */ + private String recyclingOperator; private String printUser; private String printTime; - - private String fromTime; // 开始时间 - - private String toTime; // 截止时间 + /** + * 开始时间 + */ + private String fromTime; + /** + * 截止时间 + */ + private String toTime; private String departBarcode; @@ -50,21 +64,29 @@ private String orgUnitCoding; private int pageAmount; + /** + * 总共的应发货数量 + */ + private int totalGoodsAmount; + /** + * 总共的申请数量 + */ + private int totalApplyAmount; + /** + * 总回收数量 + */ + private int totalRecyclingAmount; - private int totalGoodsAmount; // 总共的应发货数量 - - private int totalApplyAmount; // 总共的申请数量 - - private int totalRecyclingAmount; // 总回收数量 - private Double totalPrice; /** * 打印模板，此打印模板在config.js中配置,默认值为invoicePlan */ private String printTemplate; - - private Set applicationIds = new HashSet(); // 保存申请的物品所属的回收申请单的id + /** + * 保存申请的物品所属的回收申请单的id + */ + private Set applicationIds = new HashSet(); private List pages = new ArrayList(); @@ -212,6 +234,14 @@ this.recyclingUser = recyclingUser; } + public String getRecyclingOperator() { + return recyclingOperator; + } + + public void setRecyclingOperator(String recyclingOperator) { + this.recyclingOperator = recyclingOperator; + } + public String getPrintUser() { return printUser; } Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js =================================================================== diff -u -r17925 -r18762 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 17925) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 18762) @@ -177,7 +177,7 @@ {label : "收物者:", dataIndex : '', fontSize : 11, position : ["30","100mm","90%",5]}, {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["30","165mm","90%",5]}, {label : "回收人:", dataIndex : 'recyclingUser', fontSize : 11, position : ["8.1cm","1%","90%",5]}, - {label : "清点人:", dataIndex : 'applicant', fontSize : 11, position : ["8.1cm","35mm","90%",5]}, + {label : "清点人:", dataIndex : 'recyclingOperator', fontSize : 11, position : ["8.1cm","35mm","90%",5]}, {label : "发货者:", dataIndex : '', fontSize : 11, position : ["8.1cm","70mm","90%",5]}, {label : "收物者:", dataIndex : '', fontSize : 11, position : ["8.1cm","105mm","90%",5]}, {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["8.1cm","130mm","90%",5]} Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r18671 -r18762 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 18671) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 18762) @@ -2148,10 +2148,12 @@ summary.setApplicationTime(ra_1.getApplicationTimeStr()); summary.setRemark(ra_1.getRemark()); summary.setApplicant(ra_1.getApplicant()); + RecyclingRecord record = getRecyclingRecord(ra_1); + String recyclingUser = getRecyclingUserName(record); + String recyclingOperator = getRecyclingOperatorName(record); - String recyclingUser = getRecyclingUserName(ra_1); - summary.setRecyclingUser(recyclingUser); + summary.setRecyclingOperator(recyclingOperator); summary.setSettleAccountsDepart(ra_1.getSettleAccountsDepart()); @@ -2198,11 +2200,7 @@ * @param application 申请单对象 * @return */ - private String getRecyclingUserName(InvoicePlan application) { - // 查找申请单对应的回收单 - String sql = " where po.recyclingApplication.id = " + application.getId(); - RecyclingRecord recyclingRecord = (RecyclingRecord) objectDao.getBySql( - RecyclingRecord.class.getSimpleName(), sql); + private String getRecyclingUserName(RecyclingRecord recyclingRecord) { // 设置回收人名字 String recyclingUser = ""; if (recyclingRecord != null){ @@ -2214,8 +2212,41 @@ recyclingUser = "　　　"; } return recyclingUser; + } + /** + * 获取申请单对应的回收单中，清点人的名字 + * @param application 申请单对象 + * @return + */ + private String getRecyclingOperatorName(RecyclingRecord recyclingRecord) { + // 设置回收人名字 + String operator = ""; + if (recyclingRecord != null){ + operator = recyclingRecord.getOperator(); + + } + // 为空，则赋值为占位符 + if (StringUtils.isBlank(operator)){ + operator = "　　　"; + } + return operator; + + } + /** + * 获取申请单对应的回收单 + * @param application + * @return + */ + private RecyclingRecord getRecyclingRecord(InvoicePlan application){ + // 查找申请单对应的回收单 + String sql = " where po.recyclingApplication.id = " + application.getId(); + RecyclingRecord recyclingRecord = (RecyclingRecord) objectDao.getBySql( + RecyclingRecord.class.getSimpleName(), sql); + return recyclingRecord; + } + private void populateTousseItemListByApplicationId(Collection applicationIds, Collection tousseTypes, Collection tousseItemList) { List foundItems = getTousseItemsByApplicationId(