Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r14128 -r14428
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 14128)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 14428)
@@ -111,7 +111,7 @@
"ip.departCoding as \"departCoding\",ip.applicationTime as \"applicationTime\"," +
"ip.submitTime as \"submitTime\",ip.printTime as \"printTime\"," +
"ip.serialNumber as \"serialNumber\",ip.settleAccountsDepart as \"settleAccountsDepart\"," +
- "ip.applicant as \"applicant\",po.diposable as \"diposable\"" + dressing1;
+ "ip.remark as \"remark\",ip.applicant as \"applicant\",po.diposable as \"diposable\"" + dressing1;
String whereSql = " from TousseItem po,invoicePlan ip left join RecyclingRecord rr"
+" on rr.recyclingApplication_id = ip.id where po.RecyclingApplication_id = ip.id "
@@ -298,12 +298,12 @@
SupplyRoomConfig config = supplyRoomConfigManager.getFirstSupplyRoomConfig();
String orgUnitCoding = config.getOrgUnitCoding();
- String joinedBasketSql = "select ti.tousseName,sr.id,sr.sterilizationUser operator,s.name disinfectIdentification,"
- + "sr.frequency,sr.sterilizationType disinfectProgram,sr.startDate startDate,"
- + "sr.endDate ,c.containerName basketName ";
- String notJoinedBasketSql = "select ti.tousseName,sr.id,sr.sterilizationUser operator,s.name disinfectIdentification,"
- + "sr.frequency,sr.sterilizationType disinfectProgram,sr.startDate startDate,"
- + "sr.endDate ,'' basketName ";
+ String joinedBasketSql = "select ti.tousseName tousseName,sr.id id,sr.sterilizationUser operator,s.name disinfectIdentification,"
+ + "sr.frequency frequency,sr.sterilizationType disinfectProgram,sr.startDate startDate,"
+ + "sr.endDate endDate,c.containerName basketName ";
+ String notJoinedBasketSql = "select ti.tousseName tousseName,sr.id,sr.sterilizationUser operator,s.name disinfectIdentification,"
+ + "sr.frequency frequency,sr.sterilizationType disinfectProgram,sr.startDate startDate,"
+ + "sr.endDate endDate,'' basketName ";
/*String whereSql = "from Container c,SterilizationRecord sr "
+ "left join Sterilizer s on s.id = sr.sterilizer_id "
@@ -358,15 +358,15 @@
String whereSql = "(" + joinedBasketSql + joinedBasketWhereSql + " union all " + notJoinedBasketSql + notJoinedBasketWhereSql + ") alias " + groupBySql;
String countSql = "select count(*),count(*),count(*) from (select alias.* from " + whereSql + ") alias1";
- String sql = "select *,count(*) amount from " + whereSql;
+ String sql = "select count(*) amount from " + whereSql;
String totalCountSql = "select sum(alias2.amount),sum(alias2.amount),sum(alias2.amount) from (" + sql + ") alias2";
Integer [] amountArray = countBySql(countSql);
int totalCount = amountArray[0];
Integer [] totalAmountArray = countBySql(totalCountSql);
int sterilizationTotalAmount = totalAmountArray[1];
- List list = objectDao.findBySql(TousseOperate.class, sql, Integer.parseInt(currentPage), Integer.parseInt(pageSize));
+ List list = objectDao.findBySql(TousseOperate.class, joinedBasketSql + joinedBasketWhereSql + " union all " + notJoinedBasketSql + notJoinedBasketWhereSql, Integer.parseInt(currentPage), Integer.parseInt(pageSize));
Map sterilizationMap = new HashMap();
sterilizationMap.put("totalCount", totalCount);
sterilizationMap.put("sterilizationTotalAmount", sterilizationTotalAmount);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java
===================================================================
diff -u -r12332 -r14428
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java (.../TousseOperate.java) (revision 12332)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java (.../TousseOperate.java) (revision 14428)
@@ -11,6 +11,7 @@
private String serialNumber; // 申请单流水号
private String applicant;// 申请人
private String settleAccountsDepart;// 结算科室
+ private String remark;//备注
private Integer amount; // 数量
private String depart; // 科室
private String departCoding;
@@ -150,6 +151,12 @@
this.settleAccountsDepart = settleAccountsDepart;
}
+ public String getRemark() {
+ return remark;
+ }
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
public String getSender() {
return sender;
}
Index: ssts-web/src/main/webapp/homepage/recyclingAppcationShow.js
===================================================================
diff -u -r12331 -r14428
--- ssts-web/src/main/webapp/homepage/recyclingAppcationShow.js (.../recyclingAppcationShow.js) (revision 12331)
+++ ssts-web/src/main/webapp/homepage/recyclingAppcationShow.js (.../recyclingAppcationShow.js) (revision 14428)
@@ -60,15 +60,15 @@
//初始化加载器械包
var tousseInstanceStore = new top.Ext.data.Store({
proxy : new Ext.data.HttpProxy({
- url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do',
+ url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
method : 'POST'
}),
reader : rd
});
var tousseInstanceStore2 = new top.Ext.data.Store({
proxy : new Ext.data.HttpProxy({
- url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do',
+ url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
method : 'POST'
}),
reader : rd2
@@ -129,19 +129,19 @@
}
return -1;
}
-function showRecyclingApplication(id,type,time,depart,departCoding,serialNumber,applicant,settleAccountsDepart){
+function showRecyclingApplication(id,type,time,depart,departCoding,serialNumber,applicant,settleAccountsDepart,remark){
//初始化加载器械包
var leftTemplateStore = new top.Ext.data.Store({
proxy : new Ext.data.HttpProxy({
url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadTousseInstaceByid.do',
method : 'POST'
- }),///disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do
+ }),///disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do
reader : rd
});
var rightTemplateStore = new top.Ext.data.Store({
proxy : new Ext.data.HttpProxy({
- url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do',
+ url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
method : 'POST'
}),
reader : rd
@@ -541,12 +541,13 @@
layout : 'form',
labelWidth : 60,
items : [{
- xtype : 'textfield',
+ xtype : 'textarea',
fieldLabel : '备注',
id : 'remark',
name : 'remark',
width:280,
- anchor : '100%'
+ anchor : '100%',
+ value : remark ? remark : ''
}]
}]
}]
@@ -925,7 +926,7 @@
}
//一次性物品
-function showDiposableGoodsApplication(id,type,time,depart,departCoding,serialNumber,applicant,settleAccountsDepart) {
+function showDiposableGoodsApplication(id,type,time,depart,departCoding,serialNumber,applicant,settleAccountsDepart,remark) {
diposableGoodsApplicationForm = "type";
var onFocusStorage = null;
var btSaveDisabledStatus = false;//申请单 是否有回收记录 如果有，则btSaveDisabledStatus=true//借物单 是否发货或部分发货 如果是，则btSaveDisabledStatus=true
@@ -1165,7 +1166,8 @@
id : 'remark',
name : 'remark',
allowBlank : true,
- anchor : '100%'
+ anchor : '100%',
+ value : remark ? remark : ''
}]
}]
}]
@@ -1337,10 +1339,11 @@
});
Ext.Ajax.request({
- url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do',
- params : {id : id,applicationType : '一次性物品'},
+ url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
+ params : {id : id,applicationType : type},
success : function(response, options) {
var result = Ext.util.JSON.decode(response.responseText);
+ result.rows = result.rightStore.children;
var row = result.rows.length;
var rowMiddle = row/2;
if(row%2 != 0){
Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r13664 -r14428
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 13664)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 14428)
@@ -22,6 +22,7 @@
{name: 'serialNumber'},
{name: 'applicant'},
{name: 'settleAccountsDepart'},
+ {name: 'remark'},
{name: 'sender'},
{name: 'senderTime'},
{name: 'printTime'},
@@ -44,9 +45,9 @@
var applicationID = record.data['id'];
if(applicationID != null && applicationID != ""){
if(record.data['diposable'] == '否'){
- return ""+record.data['tousseName']+"";
+ return ""+record.data['tousseName']+"";
}else{
- return ""+record.data['tousseName']+"";
+ return ""+record.data['tousseName']+"";
}
}else{
return ""+record.data['tousseName']+"";
@@ -373,7 +374,8 @@
{header : "申请单流水号",width : 130,dataIndex : 'serialNumber',hidden:true},
{header : "申请人",width : 130,dataIndex : 'applicant',hidden:true},
{header : "结算科室",width : 130,dataIndex : 'settleAccountsDepart',hidden:true},
- {header : "打印时间",width : 110,dataIndex : 'printTime'}
+ {header : "打印时间",width : 110,dataIndex : 'printTime'},
+ {header : "备注",width : 110,dataIndex : 'remark'}
]);