Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/signGoodsDetailView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/signGoodsDetailView.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/signGoodsDetailView.js (revision 14058)
@@ -0,0 +1,148 @@
+var entityName = "退货统计";
+var grid;
+
+var myMask;
+Ext.onReady(function() {
+ Ext.QuickTips.init();
+ // 记录cookie（3步）
+
+ function reloadReport(){
+ var startDay= Ext.getCmp('startDay').getRawValue();
+ var endDay= Ext.getCmp('endDay').getRawValue();
+ var departSearch = Ext.getCmp('departSearch').getValue();
+ if(startDay == "" || endDay == ""){
+ showResult("请选择开始日期、结束日期！");
+ return;
+ }
+ myMask = new Ext.LoadMask(Ext.getBody(), {
+ msg: '正在加载，请稍候！',
+ removeMask: true
+ });
+ myMask.show();
+ window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=signGoods.jasper&departCoding="+departSearch+"&startDay="+startDay+"&endDay="+endDay+"&reportName=signGoods",'thisIframe','_self');
+ }
+
+ Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {};
+
+ var departJsonStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
+ method : 'POST'
+ }),
+ reader : new Ext.data.JsonReader({
+ root : 'data'
+ },[
+ {name : 'id',mapping : 'id'},
+ {name : 'name',mapping : 'name'}
+ ]
+ )
+ });
+
+ var dt = new Date();
+ var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
+
+ var form = new Ext.form.FormPanel({
+ title : '签收统计报表',
+ region : 'north',
+ labelAlign : 'right',
+ buttonAlign : 'center',
+ collapsible : true,
+ collapseMode : 'mini',
+ split : true,
+ border : 0,
+ frame : true,
+ bodyStyle : 'padding:0px auto;margin:0px',
+ height : 135,
+ items : [{
+ layout : 'column',
+ height : 50,
+ items : [{
+ layout : 'form',
+ labelWidth : 60,
+ columnWidth : .2,
+ items : [new Ext.form.DateField({
+ id:'startDay',
+ name : 'startDay',
+ fieldLabel : '开始日期',
+ readOnly : false,
+ format:'Y-m-d',
+ value : new Date(startDayofMonth),
+ anchor : '95%'
+ })]
+ },{
+ layout : 'form',
+ labelWidth : 60,
+ columnWidth : .2,
+ items : [new Ext.form.DateField({
+ id:'endDay',
+ name : 'endDay',
+ fieldLabel : '结束日期',
+ readOnly : false,
+ format:'Y-m-d',
+ value : new Date(),
+ anchor : '95%'
+ })]
+ },{
+ columnWidth : .2,
+ layout : 'form',
+ labelWidth : 60,
+ items : [{
+ xtype : 'combo',
+ id : 'departSearch',
+ name : 'departSearch',
+ queryParam : 'spell',
+ fieldLabel : '科室',
+ minChars : 0,
+ valueField : 'id',
+ displayField : 'name',
+ store : departJsonStore,
+ forceSelection : true,
+ lazyInit : true,
+ triggerAction : 'all',
+ hideTrigger : true,
+ typeAhead : false,
+ allowBlank : true,
+ anchor : '95%'
+ }]
+ }]
+ }],
+ buttons:[{
+ xtype : 'button',
+ text : '查询',
+ minWidth : 70,
+ iconCls : 'icon_search',
+ handler : function() {
+ reloadReport();
+ }
+ },{
+ xtype : 'button',
+ text : '重置',
+ minWidth : 70,
+ iconCls : 'icon_set',
+ handler : function() {
+ Ext.getCmp('departSearch').setValue("");
+ Ext.getCmp('startDay').setValue(new Date(startDayofMonth));
+ Ext.getCmp('endDay').setValue(new Date());
+ }
+ }]
+ });
+
+ var reportForm = new Ext.Panel({
+ frame:false,//渲染面板
+ autoScroll:true,//自动显示滚动条
+ collapsible:true,//允许展开和收缩
+ bodyPadding:5,
+ html:''
+ });
+
+ var viewport = new Ext.Viewport({
+ layout : 'border',
+ items : [form, {
+ id:'reportPanel',
+ region : 'center',
+ margins : '0 0 0 0',
+ layout : 'fit',
+ items : reportForm
+ }]
+ });
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/signGoodsDetailView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/signGoodsDetailView.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/signGoodsDetailView.jsp (revision 14058)
@@ -0,0 +1,64 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+退库明细
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/jasperRtp/signGoods.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/signGoods.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/signGoods.jrxml (revision 14058)
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/signGoods.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r14017 -r14058
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 14017)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 14058)
@@ -420,6 +420,7 @@
//{hidden :SSTS_MonthDiposableGoodsReport,text:"消毒供应中心物资收发月报",href:WWWROOT+'/disinfectsystem/reportforms/monthDiposableGoodsReportView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ReturnGoodsDetailReport,text:"退货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/returnGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_GodownEntryStatistic,text:"一次性物品三类查询报表",href:WWWROOT+'/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_GodownEntryStatistic,text:"入库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SignGoodsItemVo.java
===================================================================
diff -u
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SignGoodsItemVo.java (revision 0)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SignGoodsItemVo.java (revision 14058)
@@ -0,0 +1,50 @@
+package com.forgon.disinfectsystem.jasperreports.javabeansource;
+
+/**
+ * 签收统计报表明细
+ * @author kzh
+ *
+ */
+public class SignGoodsItemVo {
+ /**
+ * 序号
+ */
+ private Long index;
+ /**
+ * 名称,包括规格
+ */
+ private String tousseName;
+ /**
+ * 数量
+ */
+ private Integer amount;
+ /**
+ * 签收人
+ */
+ private String signedUser;
+
+ public Long getIndex() {
+ return index;
+ }
+ public void setIndex(Long index) {
+ this.index = index;
+ }
+ public String getTousseName() {
+ return tousseName;
+ }
+ public void setTousseName(String tousseName) {
+ this.tousseName = tousseName;
+ }
+ public Integer getAmount() {
+ return amount;
+ }
+ public void setAmount(Integer amount) {
+ this.amount = amount;
+ }
+ public String getSignedUser() {
+ return signedUser;
+ }
+ public void setSignedUser(String signedUser) {
+ this.signedUser = signedUser;
+ }
+}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14044 -r14058
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14044)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14058)
@@ -119,6 +119,7 @@
import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsItemVo;
import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo;
import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnRecordItemVo;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.SignGoodsItemVo;
import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove;
import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove_child;
import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseDeliverDetailVO;
@@ -7970,7 +7971,43 @@
}
return summaryService.getList();
}
-
+ @Override
+ public List getSignGoodsSource(String startDay,String endDay,String departmentCoding){
+ List itemList = new LinkedList();
+ if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){
+ //器械包
+ String sql = "select ti.tousseName,ti.signedUser,count(0) amount from "
+ + TousseInstance.class.getSimpleName() + " ti ";
+ sql += " where " + dateQueryAdapter.dateAreaSql("ti.signedDate", startDay, endDay,true);
+ if (StringUtils.isNotBlank(departmentCoding)) {
+ sql += " and ti.location = '" + departmentCoding + "'";
+ }
+ sql += " group by ti.tousseName,ti.signedUser";
+
+ System.out.println(sql);
+ ResultSet rs = objectDao.executeSql(sql);
+ long index = 1;
+ try {
+ while(rs.next()){
+ Integer amount = rs.getInt("amount");
+ String tousseName = rs.getString("tousseName");
+ String signedUser = rs.getString("signedUser");
+
+ SignGoodsItemVo item = new SignGoodsItemVo();
+ item.setIndex(index++);
+ item.setAmount(amount);
+ item.setTousseName(tousseName);
+ item.setSignedUser(signedUser);
+ itemList.add(item);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } finally{
+ DatabaseUtil.closeResultSetAndStatement(rs);
+ }
+ }
+ return itemList;
+ }
/**
* 物资收发明细报表
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r13791 -r14058
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 13791)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 14058)
@@ -303,9 +303,14 @@
String type = StrutsParamUtils.getPraramValue("tousseType", "");
String depart = StrutsParamUtils.getPraramValue("depart", "");
return jasperReportManager.getReturnGoodsSummarySource(startDay, endDay, type, depart);
- } else if (reportName.equals("deviceMonitoring")) {// 设备监测报表
+ }else if(reportName.equals("signGoods")){
String startDay = StrutsParamUtils.getPraramValue("startDay", "");
String endDay = StrutsParamUtils.getPraramValue("endDay", "");
+ String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
+ return jasperReportManager.getSignGoodsSource(startDay, endDay, departCoding);
+ }else if (reportName.equals("deviceMonitoring")) {// 设备监测报表
+ String startDay = StrutsParamUtils.getPraramValue("startDay", "");
+ String endDay = StrutsParamUtils.getPraramValue("endDay", "");
return jasperReportManager.getdeviceMonitoringSource(startDay,
endDay);
} else if (reportName.equals("monthReportChart")) {
@@ -1254,6 +1259,11 @@
String endDay = StrutsParamUtils.getPraramValue("endDay", "");
String title = "退货统计报表 " + startDay + "&" + endDay;
map.put("title", title);
+ }else if(reportName.equals("signGoods")){
+ String startDay = StrutsParamUtils.getPraramValue("startDay", "");
+ String endDay = StrutsParamUtils.getPraramValue("endDay", "");
+ String title = "签收统计报表 " + startDay + "&" + endDay;
+ map.put("title", title);
}
return map;
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r13791 -r14058
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 13791)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 14058)
@@ -35,6 +35,7 @@
import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportChartBean;
import com.forgon.disinfectsystem.jasperreports.javabeansource.PackingFractionDefectiveBean;
import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.SignGoodsItemVo;
import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove;
import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseDeliverDetailVO;
import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseWorkLoadVO;
@@ -98,6 +99,14 @@
String startDate, String endDate,String querySupplyRoom);
public List getReturnGoodsSummarySource(String startDay,String endDay,String type,String department);
+ /**
+ * 获取签收统计报表的数据源
+ * @param startDay 起始日期
+ * @param endDay 结束日期
+ * @param departmentCoding 科室编码
+ * @return
+ */
+ public List getSignGoodsSource(String startDay,String endDay,String departmentCoding);
public List getdeviceMonitoringSource(
String startDate, String endDate);