Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r15313 -r15916
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 15313)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 15916)
@@ -154,7 +154,6 @@
Ext.onReady(function() {
Ext.QuickTips.init();
// 记录cookie（3步）
-
function renderColor(v, p, record) {
var status = record.data['washStatus'];
var color = "white";
@@ -210,7 +209,10 @@
url : WWWROOT
+ '/disinfectSystem/baseData/cleanMethodAction!findCleanMethodArr.do'
});
-
+ // 清洗列表默认是否显示当天的
+ if(sstsConfig.hasOwnProperty('washAndDisinfectRecordListDefaultToday') && sstsConfig.washAndDisinfectRecordListDefaultToday){
+ $Id('parm_s_queryCurDay').value = "today";
+ }
washingMachineStore.load();
var filters = new Ext.grid.GridFilters({
@@ -286,6 +288,33 @@
handler : function() {
addAndEditRecyclingDamageRecord('', LINKTYPE_WASHANDDISINFECTRECORD);
}
+ },'-',{
+ text : '清洗日期:'
+ },{
+ xtype : 'combo',
+ id : 'applyDate',
+ name : 'applyDate',
+ valueField : 'value',
+ displayField : 'key',
+ allowBlank : true,
+ editable : false,
+ width : 120,
+ emptyText:'请选择清洗消毒日期',
+ mode:'local',
+ store : new Ext.data.SimpleStore({
+ data:applyDateDataArray,
+ fields:['key','value']
+ }),
+ forceSelection : true,
+ triggerAction : 'all',
+ listeners : {
+ select : function(combo, record, index){
+ var value = combo.value;
+ $Id('parm_s_queryCurDay').value = value;
+ grid.dwrReload();
+ }
+ },
+ anchor : '95%'
}];
var dwrCallParams = null;
Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {
@@ -297,6 +326,7 @@
data : [[washMachine], [washManual]]
});
+
grid = new Ext.ux.ForgonPageGrid({
title : '清洗消毒记录',
tbar : tbar,
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
===================================================================
diff -u -r15852 -r15916
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 15852)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 15916)
@@ -99,7 +99,7 @@
var washing = '<%=WashAndDisinfectRecord.STATUS_WASHING%>';
var washed = '<%=WashAndDisinfectRecord.STATUS_WASHED%>';
var washfaild = '<%=WashAndDisinfectRecord.STATUS_WASHFAILD%>';
-
+var applyDateDataArray = [['全部',''],['今天','today']];
//扫描篮筐允许的篮筐状态集合
var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
@@ -124,7 +124,10 @@
-
+
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
===================================================================
diff -u -r13416 -r15916
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java (.../WashAndDisinfectRecordTableManager.java) (revision 13416)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java (.../WashAndDisinfectRecordTableManager.java) (revision 15916)
@@ -1,19 +1,23 @@
package com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.dwr.table;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.Closure;
import org.apache.commons.lang.StringUtils;
import com.forgon.component.grid.GridManager;
+import com.forgon.databaseadapter.service.DateQueryAdapter;
import com.forgon.directory.acegi.tools.AcegiHelper;
import com.forgon.directory.model.BarcodeDevice;
import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
import com.forgon.disinfectsystem.basedatamanager.cleanmethod.service.CleanMethodManager;
import com.forgon.disinfectsystem.basedatamanager.rinser.service.RinserManager;
+import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
import com.forgon.disinfectsystem.entity.basedatamanager.cleanmethod.CleanMethod;
import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser;
+import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager;
@@ -33,10 +37,23 @@
private RinserManager rinserManager;
+ private SupplyRoomConfigManager supplyRoomConfigManager;
+
+ private DateQueryAdapter dateQueryAdapter;
+
public void setRinserManager(RinserManager rinserManager) {
this.rinserManager = rinserManager;
}
+
+ public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
+ this.dateQueryAdapter = dateQueryAdapter;
+ }
+ public void setSupplyRoomConfigManager(
+ SupplyRoomConfigManager supplyRoomConfigManager) {
+ this.supplyRoomConfigManager = supplyRoomConfigManager;
+ }
+
public void setCleanMethodManager(CleanMethodManager cleanMethodManager) {
this.cleanMethodManager = cleanMethodManager;
}
@@ -80,9 +97,23 @@
}
public String findWashAndDisinfectRecordTableList(Map> parameterMap) {
+ Map sqlWhereParamMap = gridManager
+ .getParamFromView(parameterMap);
+ String timeSql = "";
+ if (StringUtils.isNotBlank(sqlWhereParamMap.get("queryCurDay"))) {// 当天灭菌记录也包括历史灭菌中记录
+ Date out_beginTime = new Date();
+ Date out_endTime = new Date();
+ supplyRoomConfigManager.getTodayTimeQuantum(out_beginTime, out_endTime);
+
+ timeSql += " and ((po.startDate between "
+ + dateQueryAdapter.dateAdapter(out_beginTime) + " and "
+ + dateQueryAdapter.dateAdapter(out_endTime)
+ + ") or po.washStatus = '"
+ + WashAndDisinfectRecord.STATUS_WASHING + "')";
+ }
String sql = "where po.orgUnitCoding = '"
+ AcegiHelper.getLoginUser()
- .getOrgUnitCodingFromSupplyRoomConfig() + "'";
+ .getOrgUnitCodingFromSupplyRoomConfig() + "'" + timeSql;
return gridManager.renderGrid(parameterMap, WashAndDisinfectRecord.class
.getSimpleName(), sql, new String[] {"classifyBaskets","washAndDisinfectMaterials"});
}
Index: ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
===================================================================
diff -u -r15309 -r15916
--- ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js (.../config.js) (revision 15309)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js (.../config.js) (revision 15916)
@@ -43,5 +43,7 @@
//回收人默认用登录用户
recyclingUserDefault:false,
//批量打印发货单,打印消毒物品和器械包是否分开为两个按钮,如果为true,表示分开为两个按钮,如果为false或者没有配置,都是合并为一个按钮
- splitTousseAndDisinfectInvoiceBtn:true
+ splitTousseAndDisinfectInvoiceBtn:true,
+ // 清洗记录列表默认显示当天的
+ washAndDisinfectRecordListDefaultToday : true
}
\ No newline at end of file