Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml (revision 15481)
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="33" splitType="Stretch">
+ <textField>
+ <reportElement uuid="29fac231-b8df-489f-b7b5-0f5abf56b98a" x="0" y="0" width="833" height="33"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle">
+ <font size="12" isBold="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r15388 -r15481
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 15388)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 15481)
@@ -300,6 +300,7 @@
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r15403 -r15481
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15403)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15481)
@@ -153,6 +153,7 @@
import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoad;
import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoadReportBean;
import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkloadBean;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseAfterUseDeliveryVO;
import com.forgon.disinfectsystem.jasperreports.javabeansource.returnGoodsSummary;
import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialCheckManager;
@@ -11804,4 +11805,111 @@
return list;
}
+
+ @Override
+ public List getforeignTousseAfterUseDeliveryVOList(
+ String startTime, String endTime, String departCoding) {
+
+ String betweenSql = "between "
+ + dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI")
+ + " and " + dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI") + " ";
+
+
+ Map voMap = new LinkedHashMap();
+
+ String sql =
+ "select ci.invoicePlanID invoicePlanID,"
+ + "rr.recyclingTime recyclingTime,"
+ + "fta.tousseName tousseName,"
+ + "fta.supplierName supplierName,"
+ + "cb.personInCharge personInCharge "
+
+ + "from RecyclingRecord rr "
+ + "inner join ClassifyBasket_RecyclingRecord cr on cr.RecyclingRecord_ID=rr.id "
+ + "inner join ClassifyBasket cb on cb.id=cr.ClassifyBasket_ID "
+ + "inner join ClassifiedItem ci on ci.classifybasket_id=cb.id "
+ + "inner join invoicePlan ip on ip.id=ci.invoicePlanID "
+ + "inner join ForeignTousseApplication fta on fta.id=ip.id "
+ + "inner join ClassifyBasket_WashRecord cw on cw.ClassifyBasket_ID=cb.id "
+ + "left join WashAndDisinfectRecord wr on wr.id=cw.WashAndDisinfectRecord_ID "
+
+ + "where 1=1 "
+ + "and ci.isSencondWashForForeignTousse=1 "
+ + "and ip.handleDepartCoding='" + departCoding + "' "
+ + "and rr.recyclingTime " + betweenSql
+ + "order by rr.recyclingTime desc"
+ ;
+
+
+
+
+ ResultSet result = objectDao.executeSql(sql);
+
+ try {
+ while(result.next()){
+
+ String invoicePlanID = StringTools.defaultString(result.getString("invoicePlanID"));
+ ForeignTousseAfterUseDeliveryVO vo = voMap.get(invoicePlanID);
+ String personInCharge = StringTools.defaultString(result.getString("personInCharge"));
+
+ if (vo == null) {
+ vo = new ForeignTousseAfterUseDeliveryVO();
+ String recyclingTime = StringTools.defaultString(result.getString("recyclingTime"));
+ String tousseName = StringTools.defaultString(result.getString("tousseName"));
+ String supplierName = StringTools.defaultString(result.getString("supplierName"));
+
+ if (recyclingTime.length() > 16) {
+ recyclingTime = recyclingTime.substring(0, 16);
+ }
+
+ vo.setTwoRecovery(recyclingTime);
+ vo.setTousseName(tousseName);
+ vo.setSupplier(supplierName);
+ vo.setWashAndDisinfectUser(personInCharge);
+ voMap.put(invoicePlanID, vo);
+ } else {
+ String personInChargeTemp = vo.getWashAndDisinfectUser();
+ vo.setWashAndDisinfectUser(personInChargeTemp + "," + personInCharge);
+ }
+
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }finally {
+ DatabaseUtil.closeResultSetAndStatement(result);
+ }
+
+
+ List voList = new ArrayList();
+ for (String invoicePlanID : voMap.keySet()) {
+ ForeignTousseAfterUseDeliveryVO vo = voMap.get(invoicePlanID);
+
+ String[] washAndDisinfectUserArray = vo.getWashAndDisinfectUser().split(",");
+ if (washAndDisinfectUserArray.length == 0) {
+ vo.setWashAndDisinfectUser("");
+ } else {
+ Map map = new HashMap();
+ for (String washAndDisinfectUser : washAndDisinfectUserArray) {
+ if (StringTools.isNotBlank(washAndDisinfectUser)) {
+ map.put(washAndDisinfectUser, washAndDisinfectUser);
+ }
+ }
+ String washAndDisinfectUserTemp = "";
+ for (String washAndDisinfectUser : map.keySet()) {
+ washAndDisinfectUserTemp += (washAndDisinfectUser + ",");
+ }
+ if (washAndDisinfectUserTemp.length() > 0) {
+ washAndDisinfectUserTemp = washAndDisinfectUserTemp.substring(0, washAndDisinfectUserTemp.length() - 1);
+ }
+ vo.setWashAndDisinfectUser(washAndDisinfectUserTemp);
+ }
+
+
+ voList.add(vo);
+ }
+
+
+ return voList;
+
+ }
}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java
===================================================================
diff -u
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java (revision 0)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java (revision 15481)
@@ -0,0 +1,54 @@
+package com.forgon.disinfectsystem.jasperreports.javabeansource;
+
+import java.util.Date;
+
+
+/**
+ * 2016-10-22
+ * @author Chenjiaru
+ *
+ */
+public class ForeignTousseAfterUseDeliveryVO {
+
+
+ private String twoRecovery; //二次回收时间
+
+ private String tousseName; //器械名称
+
+ private String supplier; //供应商
+
+ private String washAndDisinfectUser; // 清洗消毒员
+
+ public String getTwoRecovery() {
+ return twoRecovery;
+ }
+
+ public void setTwoRecovery(String twoRecovery) {
+ this.twoRecovery = twoRecovery;
+ }
+
+ public String getTousseName() {
+ return tousseName;
+ }
+
+ public void setTousseName(String tousseName) {
+ this.tousseName = tousseName;
+ }
+
+ public String getSupplier() {
+ return supplier;
+ }
+
+ public void setSupplier(String supplier) {
+ this.supplier = supplier;
+ }
+
+ public String getWashAndDisinfectUser() {
+ return washAndDisinfectUser;
+ }
+
+ public void setWashAndDisinfectUser(String washAndDisinfectUser) {
+ this.washAndDisinfectUser = washAndDisinfectUser;
+ }
+
+}
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js (revision 15481)
@@ -0,0 +1,165 @@
+var supplyRoomStore;
+var dt = new Date();
+var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
+var form;
+
+function reloadReport(){
+ if (!form.getForm().isValid()) {
+ showResult('请填写表单！');
+ return false;
+ }
+ var startTime= $Id('startTime').value;
+ var endTime = $Id('endTime').value;
+ var departCoding = Ext.getCmp('querySupplyRoom').getValue();
+ myMask = new Ext.LoadMask(Ext.getBody(), {
+ msg: '正在加载，请稍候！',
+ removeMask: true
+ });
+ myMask.show();
+ window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=foreignTousseAfterUseDelivery.jasper&startDay="+startTime+"&endDay="+endTime+"&departCoding="+departCoding+"&reportName=foreignTousseAfterUseDelivery",'thisIframe','_self');
+}
+
+
+Ext.onReady(function() {
+
+ Ext.QuickTips.init();
+
+
+ supplyRoomStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
+ method : 'POST'
+ }),
+ baseParams :{type:"12"},
+ reader : new Ext.data.JsonReader({
+ fields : [
+ {name : 'id'},
+ {name : 'departId'},
+ {name : 'name'}
+
+ ]
+ }),
+ listeners:{
+ load :function (thiz,records,options){
+ if(records.length >0){
+ Ext.getCmp('querySupplyRoom').setValue(records[0].data.departId);
+ }
+ }
+ }
+ });
+
+ 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',// padding:1px;padding-top:5px;
+ height : 105,
+ items : [{
+ layout : 'column',
+ height : 40,
+ labelWidth : 70,
+ items : [{
+ columnWidth : .2,
+ layout : 'form',
+ labelWidth : 70,
+ items : [ {
+ xtype : 'datefieldWithMin',
+ fieldLabel : '开始日期',
+ allowBlank : false,
+ id : 'startTime',
+ name : 'startTime',
+ editable : false,
+ format : 'Y-m-d H:i',
+ altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+ allowBlank : false,
+ readOnly : true,
+ anchor : '95%',
+ value: new Date(startDayofMonth)
+ }]
+ },{
+ columnWidth : .2,
+ layout : 'form',
+ labelWidth : 70,
+ items : [{
+ xtype : 'datefieldWithMin',
+ fieldLabel : '结束日期',
+ allowBlank : false,
+ readOnly : true,
+ id : 'endTime',
+ name : 'endTime',
+ editable : false,
+ format : 'Y-m-d H:i',
+ altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+ allowBlank : false,
+ anchor : '95%',
+ value: new Date()
+ }]
+ },{
+ columnWidth : .3,
+ layout : 'form',
+ labelWidth : 70,
+ labelSeparator : '选择供应室:',
+ items : [{
+ xtype : 'combo',
+ id : 'querySupplyRoom',
+ name : 'querySupplyRoom',
+ valueField : 'departId',
+ displayField : 'name',
+ allowBlank : true,
+ editable : false,
+ store : supplyRoomStore,
+ forceSelection : true,
+ mode : 'local',
+ triggerAction : 'all',
+ anchor : '95%'
+ }]
+ }]
+ }],
+ buttons:[{
+ xtype : 'button',
+ text : '查询',
+ minWidth : 70,
+ iconCls : 'icon_search',
+ handler : function() {
+ reloadReport();
+ }
+ },{
+ xtype : 'button',
+// hidden : true,
+ text : '重置',
+ minWidth : 70,
+ iconCls : 'icon_set',
+ handler : function() {
+ $Id('startTime').value = "";
+ $Id('endTime').value = "";
+ }
+ }]
+ });
+
+ var reportForm = new Ext.Panel({
+ frame:false,//渲染面板
+ autoScroll:true,//自动显示滚动条
+ collapsible:true,//允许展开和收缩
+ bodyPadding:5,
+ html:''
+
+ });
+
+ var viewport = new Ext.Viewport({
+ layout : 'border',
+ items : [form, {
+ region : 'center',
+ margins : '0 0 0 0',
+ layout : 'fit',
+ items : reportForm
+ }]
+ });
+ supplyRoomStore.load();
+
+});
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r15385 -r15481
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 15385)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 15481)
@@ -308,6 +308,11 @@
SSTS_ForeignTousseSterilizationMonitorAndDelivery = false;
+var SSTS_ForeignTousseAfterUseDelivery = true;
+
+SSTS_ForeignTousseAfterUseDelivery = false;
+
+
var SSTS_BorrowReport = true;
SSTS_BorrowReport = false;
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r15409 -r15481
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 15409)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 15481)
@@ -81,6 +81,7 @@
import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordItemBean;
import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorBean;
import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseAfterUseDeliveryVO;
import com.forgon.disinfectsystem.jasperreports.service.JasperReportManager;
import com.forgon.disinfectsystem.qualitymonitoringmanager.qualitymonitoring.service.QualityMonitoringManager;
import com.forgon.disinfectsystem.recyclingdamagerecord.service.RecyclingDamageManager;
@@ -752,6 +753,15 @@
List foreignTousseSterilizationMonitorAndDeliveryVOList = jasperReportManager.getForeignTousseSterilizationMonitorAndDeliveryVOList(startTime, endTime, departCoding);
return foreignTousseSterilizationMonitorAndDeliveryVOList;
+ } else if ("foreignTousseAfterUseDelivery".equals(reportName)) {
+ String startTime = StrutsParamUtils.getPraramValue("startDay", "");
+ String endTime = StrutsParamUtils.getPraramValue("endDay", "");
+ String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
+
+
+ List foreignTousseAfterUseDeliveryVOList = jasperReportManager.getforeignTousseAfterUseDeliveryVOList(startTime, endTime, departCoding);
+
+ return foreignTousseAfterUseDeliveryVOList;
}
return null;
}
@@ -1182,7 +1192,7 @@
}else if (reportName.equals("tousseWorkLoad")){
String startDay = StrutsParamUtils.getPraramValue("startDay", "");
String endDay = StrutsParamUtils.getPraramValue("endDay", "");
- map.put("title", "器械包工作量统计统计("+startDay+" ~ "+endDay+")");
+ map.put("title", "器械包工作量统计报表("+startDay+" ~ "+endDay+")");
}else if("tousseOperate".equals(reportName)){
getTousseOperateParam(map);
}else if("apparatusInfusionisType".equals(reportName)){
@@ -1249,6 +1259,11 @@
String endDay = StrutsParamUtils.getPraramValue("endDay", "");
String title = "外来器械包的植入物和植入型器械灭菌监测及发放报表 (" + startDay + "~" + endDay + ")";
map.put("title", title);
+ } else if (reportName.equals("foreignTousseAfterUseDelivery")) {
+ String startDay = StrutsParamUtils.getPraramValue("startDay", "");
+ String endDay = StrutsParamUtils.getPraramValue("endDay", "");
+ String title = "外来器械使用后交接报表 (" + startDay + "~" + endDay + ")";
+ map.put("title", title);
}
return map;
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp (revision 15481)
@@ -0,0 +1,33 @@
+<%@ 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/homepage/menuconfigure.js
===================================================================
diff -u -r15436 -r15481
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 15436)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 15481)
@@ -478,7 +478,8 @@
{hidden :SSTS_ApparatusInfusionisType,text:"各类型输液器报表",href:WWWROOT+'/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_BorrowReport,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"外来器械包灭菌监测及发放报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true}
+ {hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"外来器械包灭菌监测及发放报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ForeignTousseAfterUseDelivery,text:"外来器械使用后交接报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp',hrefTarget:linkTarget,leaf:true}
]
}];
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r15388 -r15481
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 15388)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 15481)
@@ -48,6 +48,7 @@
import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkQualityCollection;
import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoadReportBean;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseAfterUseDeliveryVO;
import com.forgon.disinfectsystem.jasperreports.javabeansource.returnGoodsSummary;
import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking;
import com.forgon.tools.StrutsParamUtils;
@@ -326,4 +327,14 @@
* @return
*/
public List getForeignTousseSterilizationMonitorAndDeliveryVOList(String startTime,String endTime,String departCoding);
+
+ /**
+ * 获取"外来器械使用后交接报表报表"的javabean
+ * @param startTime
+ * @param endTime
+ * @param departCoding
+ * @return
+ */
+ public List getforeignTousseAfterUseDeliveryVOList(
+ String startTime, String endTime, String departCoding);
}