Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseReturnDisinfectionView.jsp
===================================================================
diff -u -r23164 -r24023
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseReturnDisinfectionView.jsp (.../tousseReturnDisinfectionView.jsp) (revision 23164)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseReturnDisinfectionView.jsp (.../tousseReturnDisinfectionView.jsp) (revision 24023)
@@ -18,6 +18,7 @@
var DISINFECTION = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>';
var FOREIGNPROXY = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY%>';
var FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
+ var SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
var CUSTOM = '<%=TousseDefinition.PACKAGE_TYPE_CUSTOM%>';
器械包返消统计报表
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
===================================================================
diff -u -r24004 -r24023
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js (.../foreignTousseApplicationReport.js) (revision 24004)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js (.../foreignTousseApplicationReport.js) (revision 24023)
@@ -154,13 +154,13 @@
},{
width : 180,
layout : 'form',
- labelWidth : 40,
+ labelWidth : 60,
items : [{
xtype : 'combo',
id : 'departSearch',
name : 'departSearch',
queryParam : 'spell',
- fieldLabel : '科室',
+ fieldLabel : '申请科室',
minChars : 0,
valueField : 'id',
displayField : 'name',
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseReturnDisinfectionView.js
===================================================================
diff -u -r23446 -r24023
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseReturnDisinfectionView.js (.../tousseReturnDisinfectionView.js) (revision 23446)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseReturnDisinfectionView.js (.../tousseReturnDisinfectionView.js) (revision 24023)
@@ -167,7 +167,7 @@
displayField : 'value',
store : new Ext.data.SimpleStore( {
fields : ['value'],
- data : [[INSIDE],[DRESSING],[DISINFECTION],[FOREIGNPROXY],[FOREIGN],[CUSTOM]]
+ data : [[INSIDE],[DRESSING],[DISINFECTION],[FOREIGNPROXY],[FOREIGN],[SPLIT],[CUSTOM]]
}),
triggerAction : 'all',
id : 'tousseType',
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml
===================================================================
diff -u -r13202 -r24023
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml (.../foreignTousseApplicationReport.jrxml) (revision 13202)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml (.../foreignTousseApplicationReport.jrxml) (revision 24023)
@@ -236,42 +236,42 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -285,130 +285,158 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper
===================================================================
diff -u -r13202 -r24023
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r24004 -r24023
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24004)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24023)
@@ -13193,22 +13193,24 @@
"id", Long.valueOf(id));
ForeignTousseApplicationVO vo = new ForeignTousseApplicationVO();
- vo.setDepart(foreignTousseApplication.getDepart());
+ vo.setDepart(StringTools.defaultIfBlank(foreignTousseApplication.getDepart(),""));
String applicationTimeStr = "";
if (foreignTousseApplication.getApplicationTime() != null) {
applicationTimeStr = Constants.SIMPLEDATEFORMAT_YYYYMMDD
.format(foreignTousseApplication
.getApplicationTime());
}
- vo.setApplicationTimeStr(applicationTimeStr);
- vo.setApplicant(foreignTousseApplication.getApplicant());
- vo.setRemark(foreignTousseApplication.getRemark());
- vo.setPatient(foreignTousseApplication.getPatient());
- vo.setSurgery(foreignTousseApplication.getSurgery());
- vo.setHospitalNumber(foreignTousseApplication.getHospitalNumber());
- vo.setAscriptionDepartment(foreignTousseApplication.getAscriptionDepartment());
- vo.setDoctor(foreignTousseApplication.getDoctor());
- vo.setProcessType(foreignTousseApplication.getProcessType());
+ vo.setApplicationTimeStr(StringTools.defaultIfBlank(applicationTimeStr,""));
+ vo.setApplicant(StringTools.defaultIfBlank(foreignTousseApplication.getApplicant(),""));
+ vo.setRemark(StringTools.defaultIfBlank(foreignTousseApplication.getRemark(),""));
+ vo.setPatient(StringTools.defaultIfBlank(foreignTousseApplication.getPatient(),""));
+ vo.setSurgery(StringTools.defaultIfBlank(foreignTousseApplication.getSurgery(),""));
+ vo.setHospitalNumber(StringTools.defaultIfBlank(foreignTousseApplication.getHospitalNumber(),""));
+ vo.setDepart(StringTools.defaultIfBlank(foreignTousseApplication.getDepart(),""));
+ vo.setDeliverStatus(StringTools.defaultIfBlank(foreignTousseApplication.getDeliverStatus(),""));
+ vo.setAscriptionDepartment(StringTools.defaultIfBlank(foreignTousseApplication.getAscriptionDepartment(),""));
+ vo.setDoctor(StringTools.defaultIfBlank(foreignTousseApplication.getDoctor(),""));
+ vo.setProcessType(StringTools.defaultIfBlank(foreignTousseApplication.getProcessType(),""));
List appItems = foreignTousseApplication.getApplicationItems();
if(appItems != null &&appItems.size()>0){
@@ -13252,6 +13254,7 @@
if(tousseItems.size() == 0){
tousseItems.add(new TousseItemVO());
}
+ vo.setTousseItems(tousseItems);
list.add(vo);
}
} catch (SQLException e) {
@@ -20544,7 +20547,7 @@
//科室的查询条件
String departmentCodeCondition = StringUtils.isNotBlank(departmentCode) ? "and trdr.orgUnitCoding='"+ departmentCode.trim() +"' " : "";
//包类型的查询条件
- String tousseTypesCondition = StringUtils.isNotBlank(tousseTypes) ? "and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("td.tousseType", java.util.Arrays.asList(tousseTypes.trim().split(","))) : "";
+ String tousseTypesCondition = StringUtils.isNotBlank(tousseTypes) ? " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("td.tousseType", StringTools.toCollectionIgnoreNullAndBlank(tousseTypes.trim() , ", ")) : "";
//包定义的查询条件
String tousseDefinitionIdCondition = DatabaseUtil.isPoIdValid(tousseDefinitionId) ? "and trdi.tousseDefinitionId=" + tousseDefinitionId : "";
//时间过滤
@@ -20605,7 +20608,7 @@
//科室的查询条件
String departmentCodeCondition = StringUtils.isNotBlank(departmentCode) ? "and trdr.orgUnitCoding='"+ departmentCode.trim() +"' " : "";
//包类型的查询条件
- String tousseTypesCondition = StringUtils.isNotBlank(tousseTypes) ? "and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("td.tousseType", java.util.Arrays.asList(tousseTypes.trim().split(","))) : "";
+ String tousseTypesCondition = StringUtils.isNotBlank(tousseTypes) ? " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("td.tousseType", StringTools.toCollectionIgnoreNullAndBlank(tousseTypes.trim() , ", ")) : "";
//包定义的查询条件
String tousseDefinitionIdCondition = DatabaseUtil.isPoIdValid(tousseDefinitionId) ? "and trdi.tousseDefinitionId=" + tousseDefinitionId : "";
//时间过滤