Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
===================================================================
diff -u -r25909 -r26267
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml (.../routineMonitoringReport.jrxml) (revision 25909)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml (.../routineMonitoringReport.jrxml) (revision 26267)
@@ -59,6 +59,12 @@
+
+
+
+
+
+
@@ -94,12 +100,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -110,9 +133,20 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -132,6 +166,11 @@
+
+
+
+
+
@@ -143,6 +182,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -151,6 +234,13 @@
+
+
+
+
+
+
+
@@ -169,7 +259,11 @@
-
+
+
+
+
+
@@ -184,10 +278,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -207,6 +312,13 @@
+
+
+
+
+
+
+
@@ -224,10 +336,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -325,6 +448,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r25913 -r26267
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 25913)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 26267)
@@ -287,5 +287,7 @@
//允许增加的外来器械新材料的种类的数量
numberOfNewMaterialsForForeignTousse:3,
//禁止删除外来器械包的已有材料
- disableModifyExistMaterilaOfForeignTousse:true
+ disableModifyExistMaterilaOfForeignTousse:true,
+ //是否隐藏质量监测报表的监测结果
+ hideMonitorReportMonitorResult : true
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
===================================================================
diff -u -r25909 -r26267
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java
===================================================================
diff -u -r15313 -r26267
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java (.../MonitoringItemBean.java) (revision 15313)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java (.../MonitoringItemBean.java) (revision 26267)
@@ -26,6 +26,14 @@
private String result;//定期监测结果
private String positionMsg; //位置信息
+ /**
+ * 灭菌器炉号
+ */
+ private String sterilizerName;
+ /**
+ * 炉次
+ */
+ private Integer frequency;
public Long getId() {
return id;
@@ -106,5 +114,21 @@
public void setResult(String result) {
this.result = result;
}
+
+ public String getSterilizerName() {
+ return sterilizerName;
+ }
+
+ public void setSterilizerName(String sterilizerName) {
+ this.sterilizerName = sterilizerName;
+ }
+
+ public Integer getFrequency() {
+ return frequency;
+ }
+
+ public void setFrequency(Integer frequency) {
+ this.frequency = frequency;
+ }
}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r26213 -r26267
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26213)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26267)
@@ -10642,6 +10642,8 @@
String materialName = StrutsParamUtils.getPraramValue("materialName", "");
String tousseName = StrutsParamUtils.getPraramValue("tousseName", "");
String monitoringType = StrutsParamUtils.getPraramValue("monitoringType", "");
+ String extraQuery = ",sr.frequency,s.name sterilizerName";
+ String extraJoin = " join SterilizationRecord sr on sr.id=qmi.sterilizationRecordId join Sterilizer s on s.id=sr.sterilizer_id";
if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)
&& StringUtils.isNotBlank(formName)) {
@@ -10654,9 +10656,11 @@
String sql = " select " + dataSql + " dateStr,"
+ " qmd.tousseName toussName,qmd.material material,qmd.amount amount,qmi.id qmiId,qmi.positionMsg positionMsg,"
+ " fdi.name fdiName, fdi.orderNumber orderNum,fdio.value,fiov.id "
+ + extraQuery
+ " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
+ " join FormInstanceItem fiItem on qmi.id=fiItem.formInstance_id join FormDefinitionItem fdi on fiItem.formDefinitionItem_id=fdi.id"
+ " join FormDefinitionItemOption fdio on fdi.id=fdio.formDefinitionItem_id join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id "
+ + extraJoin
+ " left join FormInstanceOptionValue fiov on fiov.formInstanceItem_id=fiItem.id "
+ " and fiov.definitionItemOption_id=fdio.id "
+ " where (fdi.type = '" + FormDefinitionItem.TYPE_RADIO + "' or fdi.type ='" + FormDefinitionItem.TYPE_CHECK + "')" + " and " + whereSql;
@@ -10665,10 +10669,12 @@
sql = " select " + dataSql + " dateStr,"
+ " qmi.id qmiId,qmi.positionMsg positionMsg,"
+ " fdi.name fdiName, fdi.orderNumber orderNum,fdio.value,fiov.id "
+ + extraQuery
+ " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
+ " join FormInstanceItem fiItem on qmi.id=fiItem.formInstance_id join FormDefinitionItem fdi on fiItem.formDefinitionItem_id=fdi.id"
+ " join FormDefinitionItemOption fdio on fdi.id=fdio.formDefinitionItem_id "
+ " left join FormInstanceOptionValue fiov on fiov.formInstanceItem_id=fiItem.id "
+ + extraJoin
+ " and fiov.definitionItemOption_id=fdio.id "
+ " where (fdi.type = '" + FormDefinitionItem.TYPE_RADIO + "' or fdi.type ='" + FormDefinitionItem.TYPE_CHECK + "')" + " and " + whereSql
+ " and qmi.id in ( select qmi.id from QualityMonitoringInstance qmi left join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id where qmd.id is null) ";
@@ -10677,37 +10683,47 @@
sql = " select " + dataSql + " dateStr,"
+ " qmd.tousseName toussName,qmd.material material,qmd.amount amount,qmi.id qmiId,qmi.positionMsg positionMsg,"
+ " fdi.name fdiName, fdi.orderNumber orderNum,fiItem.answer amswer "
+ + extraQuery
+ " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
+ " join FormInstanceItem fiItem on qmi.id=fiItem.formInstance_id join FormDefinitionItem fdi on fiItem.formDefinitionItem_id=fdi.id "
+ " join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id "
+ + extraJoin
+ " where (fdi.type != '" + FormDefinitionItem.TYPE_RADIO + "' and fdi.type!='" + FormDefinitionItem.TYPE_CHECK + "')" + " and " + whereSql;
addMonitoringItemBeanOptionSingleResult(list,sql);
// 没有录入材料和包，单一的结果
sql = " select " + dataSql + " dateStr,"
+ " qmi.id qmiId,qmi.positionMsg positionMsg,"
+ " fdi.name fdiName, fdi.orderNumber orderNum,fiItem.answer amswer "
+ + extraQuery
+ " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
+ " join FormInstanceItem fiItem on qmi.id=fiItem.formInstance_id join FormDefinitionItem fdi on fiItem.formDefinitionItem_id=fdi.id "
+ + extraJoin
+ " where (fdi.type != '" + FormDefinitionItem.TYPE_RADIO + "' and fdi.type!='" + FormDefinitionItem.TYPE_CHECK + "')" + " and " + whereSql
+ " and qmi.id in ( select qmi.id from QualityMonitoringInstance qmi left join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id where qmd.id is null) ";
addMonitoringItemBeanOptionSingleResultWithoutMaterial(list,sql);
if(FormDefinition.FOMRTYPE_QUALITYMONITORING.equals(monitoringType)){
sql = " select " + dataSql + " dateStr,"
+ " qmd.tousseName toussName,qmd.material material,qmd.amount amount,qmi.id qmiId,qmi.positionMsg positionMsg "
+ + extraQuery
+ " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id "
+ " join FormDefinition fd on fi.formDefinition_id=fd.id join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id "
+ " left join FormInstanceItem fiItem on qmi.id=fiItem.formInstance_id"
+ + extraJoin
+ " where qmi.id not in (select formInstance_id from FormInstanceItem) "
+ " and qmi.type = '" + FormDefinition.FOMRTYPE_QUALITYMONITORING + "' "
+ " and " + whereSql;
addMonitoringItemBeanQualityMonitoring(list,sql);
}
- if (FormDefinition.FOMRTYPE_PERIODICMONITORING.equals(monitoringType)) {
+ //是否隐藏监测结果列
+ boolean hideMonitorReportMonitorResult = CssdUtils.getSystemSetConfigByNameBool("hideMonitorReportMonitorResult", false);
+ if (!hideMonitorReportMonitorResult && FormDefinition.FOMRTYPE_PERIODICMONITORING.equals(monitoringType)) {
sql = " select " + dataSql + " dateStr,"
+ " qmd.tousseName toussName,qmd.material material,qmd.amount amount,qmi.id qmiId,qmi.positionMsg positionMsg,qmi.result "
+ + extraQuery
+ " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
+ " join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id "
+ + extraJoin
+ " where qmi.type = '" + FormDefinition.FOMRTYPE_PERIODICMONITORING + "'" + " and " + whereSql;
addMonitoringItemBeanRountineMonitoring(list,sql);
}
@@ -11633,7 +11649,7 @@
private void newMonitoringItem(List list,
Integer amount,String tousseName,String materialName,
Long qmiId,String positoinMsg,String dateStr,
- Integer orderNum,String questionName,String option,String answer) {
+ Integer orderNum,String questionName,String option,String answer,Integer frequency, String sterilizerName) {
MonitoringItemBean bean = new MonitoringItemBean();
bean.setAmount(amount);
bean.setDateTime(dateStr);
@@ -11647,6 +11663,8 @@
bean.setOption(option);// 表头第三列
bean.setQuestionName(questionName);// 表头第二列
bean.setAnswer(answer);
+ bean.setFrequency(frequency);
+ bean.setSterilizerName(sterilizerName);
list.add(bean);
}
// 获取设备维护的bean的数据 单选和多选
@@ -11775,9 +11793,10 @@
String optionStr = rs.getString(9);
Long fiovId = rs.getLong(10);
String answer = (fiovId > 0) ? "√" : "";
-
+ int frequency = rs.getInt("frequency");
+ String sterilizerName = rs.getString("sterilizerName");
newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
- dataStr, orderNum, questionName,optionStr, answer);
+ dataStr, orderNum, questionName,optionStr, answer,frequency,sterilizerName);
}
} catch (SQLException e) {
e.printStackTrace();
@@ -11805,9 +11824,10 @@
String optionStr = rs.getString(6);
Long fiovId = rs.getLong(7);
String answer = (fiovId > 0) ? "√" : "";
-
+ int frequency = rs.getInt("frequency");
+ String sterilizerName = rs.getString("sterilizerName");
newMonitoringItem(list, 0,"","",qmiId,positionMsg,
- dataStr, orderNum, questionName,optionStr, answer);
+ dataStr, orderNum, questionName,optionStr, answer, frequency, sterilizerName);
}
} catch (SQLException e) {
e.printStackTrace();
@@ -11836,9 +11856,10 @@
String questionName = rs.getString(7);
int orderNum = rs.getInt(8);
String answer = rs.getString(9);
-
+ int frequency = rs.getInt("frequency");
+ String sterilizerName = rs.getString("sterilizerName");
newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
- dataStr, orderNum, "-",questionName, answer);
+ dataStr, orderNum, "-",questionName, answer, frequency, sterilizerName);
}
} catch (SQLException e) {
e.printStackTrace();
@@ -11864,9 +11885,10 @@
String questionName = rs.getString(4);
int orderNum = rs.getInt(5);
String answer = rs.getString(6);
-
+ int frequency = rs.getInt("frequency");
+ String sterilizerName = rs.getString("sterilizerName");
newMonitoringItem(list, 0,"","",qmiId,positionMsg,
- dataStr, orderNum, "-",questionName, answer);
+ dataStr, orderNum, "-",questionName, answer ,frequency ,sterilizerName);
}
} catch (SQLException e) {
e.printStackTrace();
@@ -11892,9 +11914,10 @@
int amount = rs.getInt(4);
Long qmiId = rs.getLong(5);
String positionMsg = rs.getString(6);
-
+ int frequency = rs.getInt("frequency");
+ String sterilizerName = rs.getString("sterilizerName");
newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
- dataStr, 1, "-","-", "");
+ dataStr, 1, "-","-", "", frequency, sterilizerName);
}
} catch (SQLException e) {
e.printStackTrace();
@@ -11921,9 +11944,10 @@
Long qmiId = rs.getLong(5);
String positionMsg = rs.getString(6);
String result = rs.getString(7);
-
+ int frequency = rs.getInt("frequency");
+ String sterilizerName = rs.getString("sterilizerName");
newMonitoringItem(list, amount,tousseName,materialName,qmiId,positionMsg,
- dataStr, 100, "-","监测结果", result);
+ dataStr, 100, "-","监测结果", result, frequency, sterilizerName);
}
} catch (SQLException e) {
e.printStackTrace();