Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/vo/ApplicationPrintVo.java =================================================================== diff -u -r23499 -r24808 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/vo/ApplicationPrintVo.java (.../ApplicationPrintVo.java) (revision 23499) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/vo/ApplicationPrintVo.java (.../ApplicationPrintVo.java) (revision 24808) @@ -17,7 +17,12 @@ * */ private Date applicationTime; + /** + * 打印时间(申请单的首次打印时间) + */ + private Date firstPrintTime; + /** * 申请科室 */ private String depart; @@ -60,6 +65,14 @@ return applicationTime; } + public Date getFirstPrintTime() { + return firstPrintTime; + } + + public void setFirstPrintTime(Date firstPrintTime) { + this.firstPrintTime = firstPrintTime; + } + public String getDepart() { return depart; } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java =================================================================== diff -u -r23913 -r24808 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 23913) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 24808) @@ -459,12 +459,22 @@ items.add(item); } } + Date nowDate = null; for(ExpensiveGoodsApplication app : apps){ List tiVos = printTousseItemVos(app,invoicePlanIdMapGodownEntryItems.get(app.getId()),invoicePlanUseedExpensiveGoods.get(app.getId())); if(CollectionUtils.isNotEmpty(tiVos)){ + //设置单打印状态为已打印,如果打印时间为空则设置为当前时间 + app.setPrinted(InvoicePlan.PRINT_STATUS_PRINTED); + if(app.getPrintTime() == null){ + if(nowDate == null){ + nowDate = new Date(); + } + app.setPrintTime(nowDate); + } ApplicationPrintVo appVo = new ApplicationPrintVo(); appVo.setApplicant(app.getApplicant()); appVo.setApplicationTime(app.getApplicationTime()); + appVo.setFirstPrintTime(app.getPrintTime()); appVo.setDepart(app.getDepart()); appVo.setDoctor(app.getDoctor()); appVo.setHospitalNumber(app.getHospitalNumber()); Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js =================================================================== diff -u -r23898 -r24808 --- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 23898) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 24808) @@ -1,4 +1,4 @@ -var appropriationInListConfig = { +var appropriationInListConfig = { headerFooter : [ // 页眉名称 {label : "广州市中心医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, @@ -1359,13 +1359,17 @@ css+=".name{font-size: 20px;font-weight:bold;}.left{text-align:left;padding-left:5px;}"; var applicationTime = printSummaryObj.applicationTime?new Date(printSummaryObj.applicationTime.time).Format('yyyy-MM-dd hh:mm'):""; var operationTime = printSummaryObj.operationTime?new Date(printSummaryObj.operationTime.time).Format('yyyy-MM-dd hh:mm'):""; + var firstPrintTime = printSummaryObj.firstPrintTime?new Date(printSummaryObj.firstPrintTime.time).Format('yyyy-MM-dd hh:mm'):""; var tableHtml =""; tableHtml += "

高值（单价千元以上）耗材、植入性耗材采购申请流程

" tableHtml +=""; tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; tableHtml += ""; + tableHtml += ""; tableHtml += ""; //打印病人信息 tableHtml += "" @@ -1414,7 +1418,7 @@ var supplier = suppliers[i]; var printHtml = tableHtml; var goods = supplierGoods[supplier]; - printHtml += ""; + //printHtml += ""; printHtml += ""; for(var j = 0; j < goods.length; ++j){

申请科室：	"+printSummaryObj.depart + "	申请人：	"+printSummaryObj.applicant + "	申请科室：	"+printSummaryObj.depart + "		申请人：	"+printSummaryObj.applicant + "
申请时间：	"+applicationTime + "		打印时间：	"+firstPrintTime + "
病人信息
供应商	"+getDefaultString(supplier,' ')+"
供应商	"+getDefaultString(supplier,' ')+"
物品名称	生产厂家	规格型号	数量	生产批号	注册证号	失效日期