Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r22307 -r22371 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 22307) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 22371) @@ -345,49 +345,6 @@ SSTS_ForeignTousseApplication_Return = false; - -/** - * 《高值耗材申请单添加》权限 - */ -var SSTS_ExpensiveGoodsApplication_Create = true; - - SSTS_ExpensiveGoodsApplication_Create = false; - - -/** - * 《高值耗材申请单修改》权限 - */ -var SSTS_ExpensiveGoodsApplication_Update = true; - - SSTS_ExpensiveGoodsApplication_Update = false; - - -/** - * 《高值耗材申请单查询》权限 - */ -var SSTS_ExpensiveGoodsApplication_Select = true; - - SSTS_ExpensiveGoodsApplication_Select = false; - - -/** - * 《高值耗材申请单删除》权限 - */ -var SSTS_ExpensiveGoodsApplication_Delete = true; - - SSTS_ExpensiveGoodsApplication_Delete = false; - - -if (!sstsConfig.enableExpensiveGoods) { - SSTS_ExpensiveGoodsApplication_Create = true; - SSTS_ExpensiveGoodsApplication_Update = true; - SSTS_ExpensiveGoodsApplication_Select = true; - SSTS_ExpensiveGoodsApplication_Delete = true; -} - - - - //回收状态数组 var recyclingStatusArr = new Array(); recyclingStatusArr.push('<%=InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE%>'); Index: forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java =================================================================== diff -u -r22254 -r22371 --- forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java (.../BasePoManagerImpl.java) (revision 22254) +++ forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java (.../BasePoManagerImpl.java) (revision 22371) @@ -9,6 +9,7 @@ import java.util.Map; import org.apache.commons.collections4.CollectionUtils; +import org.apache.log4j.Logger; import org.hibernate.Query; import org.springframework.transaction.annotation.Transactional; @@ -32,6 +33,11 @@ protected String poName; + /** + * log4j写日志的工具. + */ + protected Logger logger = Logger.getLogger(this.getClass()); + public void setObjectDao(ObjectDao objectDao) { this.objectDao = objectDao; } Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java =================================================================== diff -u -r22364 -r22371 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java (.../ExpensiveGoodsGodownEntryManagerImpl.java) (revision 22364) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java (.../ExpensiveGoodsGodownEntryManagerImpl.java) (revision 22371) @@ -226,8 +226,10 @@ String serialNumber = expensiveGoodsApplication.getSerialNumber(); String patient = expensiveGoodsApplication.getPatient(); String hospitalNumber = expensiveGoodsApplication.getHospitalNumber(); - String remark = String.format("【系统备注：高值耗材申请单%s转的外来器械申请单】，病人：%s，住院号：%s，%s", - serialNumber, patient, hospitalNumber, expensiveGoodsApplication.getRemark()); + String originalRemark = expensiveGoodsApplication.getRemark(); + originalRemark = StringTools.isNotBlank(originalRemark) ? String.format("，%s", originalRemark) : ""; + String remark = String.format("【系统备注：高值耗材申请单%s转的外来器械申请单】，病人：%s，住院号：%s%s", + serialNumber, patient, hospitalNumber, originalRemark); foreignTousseApplication.setRemark(remark); foreignTousseApplication.setSequence(supplyRoomConfigManager.getOrgUnitSequence(foreignTousseApplication.getDepartCoding())); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp =================================================================== diff -u -r22331 -r22371 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp (.../expensiveGoodsApplicationView.jsp) (revision 22331) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp (.../expensiveGoodsApplicationView.jsp) (revision 22371) @@ -26,6 +26,45 @@ var currentOrgUnitCode = '${currentOrgUnitCode}'; //用户的当前科室编码 var userName = '${userName}'; //用户的全名 var userCode = '${userCode}'; //用户的登录名 + + /** + * 《高值耗材申请单添加》权限 + */ + var SSTS_ExpensiveGoodsApplication_Create = true; + + SSTS_ExpensiveGoodsApplication_Create = false; + + + /** + * 《高值耗材申请单修改》权限 + */ + var SSTS_ExpensiveGoodsApplication_Update = true; + + SSTS_ExpensiveGoodsApplication_Update = false; + + + /** + * 《高值耗材申请单查询》权限 + */ + var SSTS_ExpensiveGoodsApplication_Select = true; + + SSTS_ExpensiveGoodsApplication_Select = false; + + + /** + * 《高值耗材申请单删除》权限 + */ + var SSTS_ExpensiveGoodsApplication_Delete = true; + + SSTS_ExpensiveGoodsApplication_Delete = false; + + + if (!sstsConfig.enableExpensiveGoods) { + SSTS_ExpensiveGoodsApplication_Create = true; + SSTS_ExpensiveGoodsApplication_Update = true; + SSTS_ExpensiveGoodsApplication_Select = true; + SSTS_ExpensiveGoodsApplication_Delete = true; + } <%--申请单的审批历史记录 --%> Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js =================================================================== diff -u -r22347 -r22371 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js (.../expensiveGoodsApplicationView.js) (revision 22347) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.js (.../expensiveGoodsApplicationView.js) (revision 22371) @@ -245,8 +245,12 @@ var columns = [{ header: '流水号', dataIndex: 'serialNumber', width: 100, filterable: true, filter: {type: 'string'}, renderer : function(value, metaData, record, rowIndex, colIndex, store, view) { - var id = record.data.id; - return "" + value + ""; + if (SSTS_ExpensiveGoodsApplication_Update) { + return value; + } else { + var id = record.data.id; + return "" + value + ""; + } } },{ header: '申请科室', dataIndex: 'depart', width: 150, filterable: true, filter: {type: 'string'} @@ -306,18 +310,21 @@ var tbar = [{ text : '添加', iconCls : 'btn_add', + hidden: SSTS_ExpensiveGoodsApplication_Create, handler : function() { addOrEidtExpensiveGoodsApplicationForApply(null); } },{ text : '删除', iconCls : 'btn_delete', + hidden: SSTS_ExpensiveGoodsApplication_Delete, handler : function() { deleteExpensiveGoodsApplication(grid); } },{ text : '终止', iconCls : 'btn_delete', + hidden: SSTS_ExpensiveGoodsApplication_Delete, handler : function() { terminationExpensiveGoodsApplication(grid); }