器械包实体信息

Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r20716 -r20807 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 20716) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 20807) @@ -366,9 +366,9 @@ sqlBuilder.append(" AND po.comboTousseInstanceId is null "); //聚合包里面的包实例不显示 - String isExamine = sqlWhereParamMap.get("isExamine"); + String reviewTime = sqlWhereParamMap.get("isReview"); //对应器械包干预审核时间页面，不显示审核时间为空的数据项 - if(null!=isExamine){ + if(null!=reviewTime){ sqlBuilder.append(" AND po.reviewTime is not null "); } String sql = sqlBuilder.toString(); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java =================================================================== diff -u -r20716 -r20807 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 20716) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 20807) @@ -631,9 +631,9 @@ /** * 更新包的审核时间. * @param ids ID数组 - * @param examineDate 审核日期 + * @param reviewTime 审核日期 * */ - public void updateTousseExamineDate(String ids[], Date examineDate); + public void updateTousseReviewTime(String ids[], Date reviewTime); } Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereExamineView.jsp =================================================================== diff -u -r20716 -r20807 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereExamineView.jsp (.../interfereExamineView.jsp) (revision 20716) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereExamineView.jsp (.../interfereReviewView.jsp) (revision 20807) @@ -85,7 +85,7 @@ - + 器械包实体信息 @@ -110,7 +110,8 @@ - + + Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r20772 -r20807 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 20772) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 20807) @@ -426,7 +426,7 @@ {hidden :SSTS_InterfereOrgUnit_ViewMenu,text:"科室干预管理",href:WWWROOT+'/disinfectsystem/interfere/processSameOrgunitName/processSameOrgunitNameData.mhtml',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_InterfereTerminateInvoicePlan_ViewMenu,text:"批量终止申请单管理",href:WWWROOT+'/disinfectsystem/interfere/interfereTerminateInvoicePlanView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_InterfereUeserRecord_ViewMenu,text:"使用记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_InterfereReviewRecord_ViewMenu,text:"审核器械包干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereExamineView.jsp',hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_InterfereReviewRecord_ViewMenu,text:"审核器械包干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereReviewView.jsp',hrefTarget:linkTarget,leaf:true} ] },{ text:"消毒供应中心物品领用", Fisheye: Tag 20807 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/interfere/interfereExamineView.js'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r20716 -r20807 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 20716) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 20807) @@ -1605,13 +1605,13 @@ * 器械包干预修改审核时间(批量) * */ - public void updateExamineDate(){ + public void updateTousseReviewTime(){ JSONObject result = JSONUtil.buildJsonObject(false, "修改失败"); String ids = StrutsParamUtils.getPraramValue("ids", null); - String examineDate = StrutsParamUtils.getPraramValue("examineDate", null); - if(StringTools.isNotBlank(ids) && StringTools.isNotBlank(examineDate)){ + String reviewTime = StrutsParamUtils.getPraramValue("reviewTime", null); + if(StringTools.isNotBlank(ids) && StringTools.isNotBlank(reviewTime)){ try { - tousseInstanceManager.updateTousseExamineDate(ids.split(","), ForgonDateUtils.safelyParseDate(examineDate)); + tousseInstanceManager.updateTousseReviewTime(ids.split(","), ForgonDateUtils.safelyParseDate(reviewTime)); result = JSONUtil.buildJsonObject(true, "修改成功"); } catch (Exception e) { e.printStackTrace(); Fisheye: Tag 20807 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/interfere/interfereExamineView.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereExamineView.js =================================================================== diff -u -r20723 -r20807 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereExamineView.js (.../interfereExamineView.js) (revision 20723) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereExamineView.js (.../interfereReviewView.js) (revision 20807) @@ -37,8 +37,8 @@ items : [{ xtype : 'datefieldWithMin', fieldLabel : '审核时间', - id : 'reportTime', - name : 'reportTime', + id : 'reviewTime', + name : 'reviewTime', //value : new Date(), editable : false, readOnly : true, @@ -47,7 +47,7 @@ anchor : '95%', listeners : { render : function() { - setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'reportTime'); //（设置报告日期，取服务器时间 cjr） + setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'reviewTime'); //（设置默认审核日期为今天(取服务器时间) cjr） } } }] @@ -63,8 +63,8 @@ selections.push(row.data.id); }); var ids = selections.join(','); - var examineDate = formPanel.getForm().findField("reportTime").getValue(); - updateExamineDate(ids, examineDate); + var reviewTime = formPanel.getForm().findField("reviewTime").getValue(); + updateTousseReviewTime(ids, reviewTime); } }, { text : '取消', @@ -246,13 +246,13 @@ * 提交表单 * 修改审核时间(可批量) */ -function updateExamineDate(ids, examineDate){ +function updateTousseReviewTime(ids, reviewTime){ formPanel.getForm().submit( { - url : WWWROOT + '/disinfectSystem/tousseInstanceAction!updateExamineDate.do', + url : WWWROOT + '/disinfectSystem/tousseInstanceAction!updateTousseReviewTime.do', method : 'POST', waitMsg : '正在保存数据，请稍候', waitTitle : '提交表单', - params : {ids : ids , examineDate : Ext.util.Format.date(examineDate, 'Y-m-d H:i:s')}, + params : {ids : ids , reviewTime : Ext.util.Format.date(reviewTime, 'Y-m-d H:i:s')}, success : function(form, action) { //var result = Ext.decode(action.response.responseText); showResult("保存成功"); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r20801 -r20807 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 20801) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 20807) @@ -2968,10 +2968,10 @@ } @Override - public void updateTousseExamineDate(String ids[], Date examineDate) { + public void updateTousseReviewTime(String ids[], Date reviewTime) { for (String id : ids) { TousseInstance tousseInstance = get(id); - tousseInstance.setReviewTime(examineDate); + tousseInstance.setReviewTime(reviewTime); saveOrUpdate(tousseInstance); } }