Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jrxml (revision 30447)
@@ -0,0 +1,463 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="40" splitType="Stretch">
+ <textField>
+ <reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="3000" height="40"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle">
+ <font size="14" isBold="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0?$V{goodsName}.lastIndexOf("%&"):0))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
===================================================================
diff -u -r30440 -r30447
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
===================================================================
diff -u -r30440 -r30447
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
===================================================================
diff -u -r30440 -r30447
--- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml (.../QualityMonitoringReport.jrxml) (revision 30440)
+++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml (.../QualityMonitoringReport.jrxml) (revision 30447)
@@ -293,7 +293,7 @@
-
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r30423 -r30447
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 30423)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 30447)
@@ -481,7 +481,7 @@
} else {
parametMap.put("title", "质量监测表");
}
- return jasperReportManager.getQualityMonitoringDataSource();
+ return jasperReportManager.getQualityMonitoringDataSource(requestParameters);
}else if(reportName.equals("recycleMaterialDetail")){//回收器械材料明细报表
String startTime = StrutsParamUtils.getPraramValue("startTime", "");
String endTime = StrutsParamUtils.getPraramValue("endTime", "");
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r30440 -r30447
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 30440)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 30447)
@@ -14678,7 +14678,7 @@
}
// 质量监测报表
@Override
- public List getQualityMonitoringDataSource() {
+ public List getQualityMonitoringDataSource(Map requestParameters) {
List list = new ArrayList();
String startDate = StrutsParamUtils.getPraramValue("startDate", "");
String endDate = StrutsParamUtils.getPraramValue("endDate", "");
@@ -14741,7 +14741,8 @@
extraJoin = " join SterilizationRecord sr on sr.id=qmi.sterilizationRecordId join Sterilizer s on s.id=sr.sterilizer_id";
}else if(QualityMonitoringDefinition.SCOPE_STERILIZATIONRECORD.equals(scope) && "定期监测".equals(monitoringType)){//因为没有关联灭菌记录，所以从QualityMonitoringInstance获取
showSterilizationInfo = true;
- extraQuery = ",qmi.sterilizerFrequency frequency,qmi.sterilizerName";
+ extraQuery = ",qmi.sterilizerDate,qmi.sterilizerFrequency frequency,qmi.sterilizerName";
+ requestParameters.put("jasperreportName", "routineMonitoringSteScopeReport.jasper");
}
if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)
&& StringUtils.isNotBlank(formName)) {
@@ -15907,7 +15908,7 @@
ResultSet rs = objectDao.executeSql(sql);
try {
while (rs.next()) {
- String dataStr = rs.getString("dateStr");
+ String dataStr = null;
String tousseName = rs.getString("toussName");
String materialName = rs.getString("material");
int amount = rs.getInt("amount");
@@ -15924,7 +15925,13 @@
if(isCustomADJAndIsFormNameIsADJ){
frequency = rs.getInt("frequency");
sterilizerName = rs.getString("sterilizerName");
+ if(SqlUtils.isExistColumn(rs, "sterilizerDate")){//监测范围为灭菌炉记录，日期要使用灭菌日期
+ dataStr = rs.getString("sterilizerDate");
+ }
}
+ if(dataStr == null){
+ dataStr = rs.getString("dateStr");
+ }
newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
dataStr, orderNum, questionName,optionStr, answer,frequency,sterilizerName,isCustomADJAndIsFormNameIsADJ,createUserName);
}
@@ -16144,7 +16151,7 @@
ResultSet rs = objectDao.executeSql(sql);
try {
while (rs.next()) {
- String dataStr = rs.getString("dateStr");
+ String dataStr = null;
Long qmiId = rs.getLong("qmiId");
String positionMsg = rs.getString("positionMsg");
String questionName = rs.getString("fdiName");
@@ -16158,7 +16165,13 @@
if(addMonitoringItemBeanOptionSingleResult){
frequency = rs.getInt("frequency");
sterilizerName = rs.getString("sterilizerName");
+ if(SqlUtils.isExistColumn(rs, "sterilizerDate")){//监测范围为灭菌炉记录，日期要使用灭菌日期
+ dataStr = rs.getString("sterilizerDate");
+ }
}
+ if(dataStr == null){
+ dataStr = rs.getString("dateStr");
+ }
newMonitoringItem(list, 0,"","",qmiId,positionMsg,
dataStr, orderNum, questionName,optionStr, answer, frequency, sterilizerName, addMonitoringItemBeanOptionSingleResult,createUserName);
}
@@ -16244,7 +16257,7 @@
try {
rs = objectDao.executeSql(sql);
while (rs.next()) {
- String dataStr = rs.getString(1);
+ String dataStr = null;
String tousseName = rs.getString(2);
String materialName = rs.getString(3);
int amount = rs.getInt(4);
@@ -16259,7 +16272,13 @@
if(addMonitoringItemBeanOptionSingleResult){
frequency = rs.getInt("frequency");
sterilizerName = rs.getString("sterilizerName");
+ if(SqlUtils.isExistColumn(rs, "sterilizerDate")){//监测范围为灭菌炉记录，日期要使用灭菌日期
+ dataStr = rs.getString("sterilizerDate");
+ }
}
+ if(dataStr == null){
+ dataStr = rs.getString("dateStr");
+ }
newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
dataStr, orderNum, "-",questionName, answer, frequency, sterilizerName, addMonitoringItemBeanOptionSingleResult,createUserName);
}
@@ -16310,7 +16329,7 @@
ResultSet rs = objectDao.executeSql(sql);
try {
while (rs.next()) {
- String dataStr = rs.getString(1);
+ String dataStr = null;
Long qmiId = rs.getLong(2);
String positionMsg = rs.getString(3);
String questionName = rs.getString(4);
@@ -16322,7 +16341,13 @@
if(addMonitoringItemBeanOptionSingleResultWithoutMaterial){
frequency = rs.getInt("frequency");
sterilizerName = rs.getString("sterilizerName");
+ if(SqlUtils.isExistColumn(rs, "sterilizerDate")){//监测范围为灭菌炉记录，日期要使用灭菌日期
+ dataStr = rs.getString("sterilizerDate");
+ }
}
+ if(dataStr == null){
+ dataStr = rs.getString("dateStr");
+ }
newMonitoringItem(list, 0,"","",qmiId,positionMsg,
dataStr, orderNum, "-",questionName, answer ,frequency ,sterilizerName, addMonitoringItemBeanOptionSingleResultWithoutMaterial,createUserName);
}
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jasper
===================================================================
diff -u -r30440 -r30447
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
===================================================================
diff -u -r30440 -r30447
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml (.../routineMonitoringReport.jrxml) (revision 30440)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml (.../routineMonitoringReport.jrxml) (revision 30447)
@@ -62,12 +62,6 @@
-
-
-
-
-
-
@@ -91,45 +85,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -143,14 +123,9 @@
-
-
-
-
-
-
-
-
+
+
+
@@ -159,63 +134,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
0?$V{goodsName}.lastIndexOf("%&"):0))]]>
@@ -231,8 +160,10 @@
-
-
+
+
+
+
@@ -248,8 +179,10 @@
-
-
+
+
+
+
@@ -306,7 +239,7 @@
-
+
@@ -433,30 +366,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml
===================================================================
diff -u -r30440 -r30447
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml (.../routineMonitoringReportOfADJ.jrxml) (revision 30440)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml (.../routineMonitoringReportOfADJ.jrxml) (revision 30447)
@@ -354,7 +354,7 @@
-
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r30423 -r30447
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 30423)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 30447)
@@ -640,9 +640,13 @@
public List getSummaryUseRecordVO(String startTime, String endTime, String departOfpatientSearch);
public List getFormInstanceData(String startDate,String endDate,String departCoding,String formDefinitionId);
-
- public List getQualityMonitoringDataSource();
/**
+ *
+ * @param requestParameters 报表需要的参数,可根据数据变更报表模板
+ * @return
+ */
+ public List getQualityMonitoringDataSource(Map requestParameters);
+ /**
* 获取丢失报损类型月报数据
* @param queryYear
* @param damageErrorType