Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp
===================================================================
diff -u -r25237 -r26432
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp (.../sterilizingStoveUseCountView.jsp) (revision 25237)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp (.../sterilizingStoveUseCountView.jsp) (revision 26432)
@@ -22,6 +22,10 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountViewYearCompar.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountViewYearCompar.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountViewYearCompar.jsp (revision 26432)
@@ -0,0 +1,128 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="com.forgon.tools.SpringBeanManger,org.jfree.data.general.DefaultPieDataset,org.jfree.chart.ChartFactory,org.jfree.chart.JFreeChart,org.jfree.chart.servlet.*,com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.action.SterilizerRecordLineChartAction" %>
+<%@ page import="com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
+
+ 灭菌炉使用次数统计
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js
===================================================================
diff -u -r25237 -r26432
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js (.../sterilizingStoveUseCountView.js) (revision 25237)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js (.../sterilizingStoveUseCountView.js) (revision 26432)
@@ -24,11 +24,28 @@
var sterilizationPurpose = Ext.getCmp('sterilizationPurpose').getRawValue();
var queryType = Ext.getCmp('queryType').getRawValue();
var departCoding = Ext.getCmp('querySupplyRoom').getValue();//20181225
+ //年月
+ if(Ext.getCmp('monthSearch')){
+ var monthSearch = $Id('monthSearch').value;
+ }
+ //年份
+ if(Ext.getCmp('year')){
+ var year = $Id('year').value;
+ }
+ //灭菌炉
+ if(Ext.getCmp('sterilizerName')){
+ if(Ext.getCmp('sterilizerName').getValue() == "" || Ext.getCmp('sterilizerName').getValue() == undefined || Ext.getCmp('sterilizerName').getValue() == null){
+ showResult('请选择灭菌炉。');
+ return false;
+ }else{
+ var sterilizerId = Ext.getCmp('sterilizerName').getValue();
+ var sterilizerName = Ext.getCmp('sterilizerName').getRawValue();
+ }
+ }
+
if(departCoding.indexOf(ALL) == 0){
departCoding = "";
}
-
-
//不是一级供应室
if(querySupplyRoom == null || querySupplyRoom == ""){
showResult('请选择供应室。');
@@ -38,26 +55,66 @@
msg: '正在加载，请稍候！',
removeMask: true
});
- myMask.show();
+
var jasperReportName = "sterilizingStoveUseCount.jasper";
if(queryType == "明细"){
+ myMask.show();
jasperReportName = "sterilizingStoveUseCountDetail.jasper";
+ window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
+ "?jasperreportName=" + jasperReportName +
+ "&reportName=sterilizingStoveUseCount" +
+ "&startTime=" + startTime +
+ "&endTime=" + endTime +
+ "&querySupplyRoom=" + querySupplyRoom +
+ "&querySupplyRoomCoding=" + querySupplyRoomCoding +
+ "&sterilizationPurpose=" + sterilizationPurpose +
+ "&queryType=" + queryType,
+ 'thisIframe','_self');
+ // supplyRoomRemoteStore.load();
+ }else if(queryType == "listChart"){//图形
+ window.open(WWWROOT+"/disinfectsystem/reportforms/sterilizingStoveUseCountViewList.jsp?querySupplyRoomCoding=" + querySupplyRoomCoding +
+ "&sterilizationPurpose=" + sterilizationPurpose +
+ "&monthSearch=" + monthSearch +
+ "&queryType=" + queryType,
+ 'thisIframe','_self');
+ }else if(queryType == "allYearChart"){//图形对比(全年)
+ window.open(WWWROOT+"/disinfectsystem/reportforms/sterilizingStoveUseCountViewYearCompar.jsp?querySupplyRoomCoding=" + querySupplyRoomCoding +
+ "&sterilizationPurpose=" + sterilizationPurpose +
+ "&year=" + year +
+ "&sterilizerId=" + sterilizerId +
+ "&sterilizerName=" + sterilizerName +
+ "&queryType=" + queryType,
+ 'thisIframe','_self');
+ }else{
+ myMask.show();
+ window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
+ "?jasperreportName=" + jasperReportName +
+ "&reportName=sterilizingStoveUseCount" +
+ "&startTime=" + startTime +
+ "&endTime=" + endTime +
+ "&querySupplyRoom=" + querySupplyRoom +
+ "&querySupplyRoomCoding=" + querySupplyRoomCoding +
+ "&sterilizationPurpose=" + sterilizationPurpose +
+ "&queryType=" + queryType,
+ 'thisIframe','_self');
+ // supplyRoomRemoteStore.load();
}
- window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
- "?jasperreportName=" + jasperReportName +
- "&reportName=sterilizingStoveUseCount" +
- "&startTime=" + startTime +
- "&endTime=" + endTime +
- "&querySupplyRoom=" + querySupplyRoom +
- "&querySupplyRoomCoding=" + querySupplyRoomCoding +
- "&sterilizationPurpose=" + sterilizationPurpose +
- "&queryType=" + queryType,
- 'thisIframe','_self');
- // supplyRoomRemoteStore.load();
-
}
+var sterilizerNameStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml',
+ method : 'POST'
+ }),
+ reader : new Ext.data.JsonReader({
+ root : 'rows',
+ fields : [
+ {name : 'id', mapping : 'id'},
+ {name : 'name', mapping : 'name'}
+ ]
+ })
+})
Ext.onReady(function(){
Ext.QuickTips.init();
//20181225
@@ -171,11 +228,15 @@
});
sterilizationPurposeJsonStore.load();
- var queryTypeStore = new Ext.data.SimpleStore( {
+/* var queryTypeStore = new Ext.data.SimpleStore( {
fields : [ 'value' ],
data : [['汇总'], ['明细']]
- });
-
+ }); */
+ function isShowDom(parentId,id){
+ if(Ext.getCmp(id)){
+ Ext.getCmp(parentId).remove(id);
+ }
+ }
var dt = new Date();
var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
@@ -190,73 +251,16 @@
border : 0,
frame : true,
bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
- height : 130,
+ height : 160,
items : [{
layout : 'column',
- labelWidth : 60,
+ id:"wrapperAll",
+ width : 1000,
items : [{
layout:'form',
- width:210,
- items:[{
- xtype : 'datefieldWithMin',
- fieldLabel : '开始日期',
- 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 : true,
- anchor : '95%',
- value: new Date(startDayofMonth),
- theHours : 0,
- theMinutes : 0,
- listeners : {
- specialkey : function(field, e) {
- if (e.getKey() == Ext.EventObject.ENTER) {
- var isOK = field.validate();
- if(isOK){
- var value = field.getValue();
- field.setValue(value);
- var endTime = Ext.getCmp('endTime');
- endTime.setValue('');
- endTime.focus();
- }
- }
- }
- }
- }]
- },{
- layout:'form',
- width:210,
- items:[{
- xtype : 'datefieldWithMin',
- fieldLabel : '结束日期',
- id : 'endTime',
- name : 'endTime',
- editable : false,
- format : 'Y-m-d H:i',
- allowBlank : true,
- anchor : '95%',
- value: new Date(),
- theHours : 23,
- theMinutes : 59,
- listeners : {
- specialkey : function(field, e) {
- if (e.getKey() == Ext.EventObject.ENTER) {
- var isOK = field.validate();
- if(isOK){
- var value = field.getValue();
- field.setValue(value);
- }
- }
- }
- }
- }]
- },{
- layout:'form',
- width:300,
+ columnWidth:.25,
labelWidth : 80,
- labelSeparator : '选择供应室:',
+ labelSeparator : ':',
items : [{//20181225
xtype : 'multiSelect',
id : 'querySupplyRoom',
@@ -272,6 +276,7 @@
triggerAction : 'all',
lazyInit : true,
typeAhead : false,
+ fieldLabel : "选择供应室",
anchor : '95%',
listeners: {
select: function (combo, record, index) {
@@ -309,8 +314,7 @@
},{
layout:'form',
- width:300,
- labelWidth : 100,
+ columnWidth:0.25,
labelSeparator : '选择灭菌目的:',
items:[{
id : 'sterilizationPurpose',
@@ -321,32 +325,181 @@
store : sterilizationPurposeJsonStore,
triggerAction : 'all',
mode : 'remote',
- listWidth:170,
+ listWidth:200,
editable : false,
forceSelection : true,
allowBlank : true,
anchor : '95%'
}]
+ } ,{
+ layout:'form',
+ columnWidth:0.25,
+ id:"startTimeWrapper",
+ labelWidth:80,
+ items:[{
+ xtype : 'datefieldWithMin',
+ fieldLabel : '开始日期',
+ 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 : true,
+ anchor : '95%',
+ width:150,
+ value: new Date(startDayofMonth),
+ theHours : 0,
+ theMinutes : 0,
+ listeners : {
+ specialkey : function(field, e) {
+ if (e.getKey() == Ext.EventObject.ENTER) {
+ var isOK = field.validate();
+ if(isOK){
+ var value = field.getValue();
+ field.setValue(value);
+ var endTime = Ext.getCmp('endTime');
+ endTime.setValue('');
+ endTime.focus();
+ }
+ }
+ }
+ }
+ }]
},{
layout:'form',
- width:300,
- labelWidth : 100,
- labelSeparator : '查询类型:',
+ columnWidth:0.25,
+ id:"endTimeWrapper",
+ labelWidth:80,
items:[{
- id : 'queryType',
- name : 'queryType',
- xtype : 'combo',
- valueField : 'value',
- displayField : 'value',
- store : queryTypeStore,
- triggerAction : 'all',
- mode : 'local',
- listWidth:170,
- editable : false,
- forceSelection : true,
- allowBlank : true,
- anchor : '95%'
+ xtype : 'datefieldWithMin',
+ fieldLabel : '结束日期',
+ id : 'endTime',
+ name : 'endTime',
+ editable : false,
+ format : 'Y-m-d H:i',
+ allowBlank : true,
+ anchor : '95%',
+ width:150,
+ value: new Date(),
+ theHours : 23,
+ theMinutes : 59,
+ listeners : {
+ specialkey : function(field, e) {
+ if (e.getKey() == Ext.EventObject.ENTER) {
+ var isOK = field.validate();
+ if(isOK){
+ var value = field.getValue();
+ field.setValue(value);
+ }
+ }
+ }
+ }
}]
+ },{
+ layout : 'form',
+ columnWidth:.5,
+ labelWidth:80,
+ items : [new Ext.ux.RadioGroup({
+ fieldLabel : "查询类型",
+ allowBlank : false,
+ horizontal:true,
+ defaultValue:'汇总',
+ name : "queryType",
+ id : "queryType",
+ anchor : '95%',
+ listWidth : 400,
+ radios:[{boxLabel:'汇总',value:'汇总'},
+ {boxLabel:'明细',value:'明细'},
+ {boxLabel:'图形',value:'listChart'},
+ {boxLabel:'图形对比(全年)',value:'allYearChart'}
+ ],
+ listeners:{
+ 'change':function(v,p,group,checked){
+ if(group == "listChart"){
+ Ext.getCmp("startTimeWrapper").hide(); //隐藏开始日期
+ Ext.getCmp("endTimeWrapper").hide(); //隐藏结束日期
+ //隐藏年份，灭菌炉
+ isShowDom("wrapperAll","yearWrapper");
+ isShowDom("wrapperAll","sterilizerNameWrapper");
+ //显示年月
+ var monthSearchWrapper = {
+ layout:'form',
+ labelWidth :40,
+ columnWidth:.25,
+ id:"monthSearchWrapper",
+ items : [new Ext.form.DateField({
+ id:'monthSearch',
+ name : 'monthSearch',
+ fieldLabel : '年月',
+ readOnly : true,
+ format:'Y-m',
+ value : new Date(),
+ anchor : '95%'
+ })]
+ }
+
+ Ext.getCmp("wrapperAll").insert(Ext.getCmp("wrapperAll").items.length - 2,monthSearchWrapper);
+ Ext.getCmp("wrapperAll").doLayout();
+ }else if(group == "allYearChart"){
+ Ext.getCmp("startTimeWrapper").hide(); //隐藏开始日期
+ Ext.getCmp("endTimeWrapper").hide(); //隐藏结束日期
+ isShowDom("wrapperAll","monthSearchWrapper");
+ //显示年份
+ var yearWrapper = {
+ layout : 'form',
+ columnWidth:.2,
+ labelWidth :40,
+ id:"yearWrapper",
+ items : [
+ new Ext.ux.MonthField({
+ id:'year',
+ name : 'year',
+ fieldLabel : '年份',
+ readOnly : true,
+ format:'Y',
+ value : new Date(),
+ anchor : '65%'
+ })]
+ }
+ ////显示灭菌炉
+ var sterilizerNameWrapper = {
+ layout : 'form',
+ columnWidth:.3,
+ labelWidth :100,
+ id:"sterilizerNameWrapper",
+ items : [{
+ xtype : 'combo',
+ fieldLabel : "请选择灭菌炉",
+ valueField : 'id',
+ displayField : 'name',
+ store:sterilizerNameStore,
+ triggerAction : 'all',
+ forceSelection : false,
+ lazyInit : false,
+ editable : false,
+ hideTrigger : false,
+ typeAhead : false,
+ allowBlank : true,
+ name : "sterilizerName",
+ id : "sterilizerName",
+ anchor : '95%'
+ }]
+ }
+ Ext.getCmp("wrapperAll").insert(Ext.getCmp("wrapperAll").items.length - 2,yearWrapper);
+ Ext.getCmp("wrapperAll").insert(Ext.getCmp("wrapperAll").items.length - 1,sterilizerNameWrapper);
+ Ext.getCmp("wrapperAll").doLayout();
+ }else{
+ Ext.getCmp("startTimeWrapper").show(); //显示开始日期
+ Ext.getCmp("endTimeWrapper").show(); //显示结束日期
+
+ //隐藏年月，年份，灭菌炉
+ isShowDom("wrapperAll","monthSearchWrapper");
+ isShowDom("wrapperAll","yearWrapper");
+ isShowDom("wrapperAll","sterilizerNameWrapper");
+ }
+ }
+ }
+ }) ]
}]
}],
buttons:[{
@@ -388,5 +541,5 @@
items : reportForm
}]
});
- Ext.getCmp("queryType").setValue("汇总");
+ //Ext.getCmp("queryType").setValue("汇总");
});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountViewList.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountViewList.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountViewList.jsp (revision 26432)
@@ -0,0 +1,139 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="com.forgon.tools.SpringBeanManger,org.jfree.data.general.DefaultPieDataset,org.jfree.chart.ChartFactory,org.jfree.chart.JFreeChart,org.jfree.chart.servlet.*,com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.action.SterilizerRecordLineChartAction" %>
+<%@ page import="com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
+
+ 灭菌炉使用次数统计
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file