Index: ssts-web/src/main/webapp/jasperRtp/useRecordTotalView2.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordTotalView2.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordTotalView2.jrxml (revision 21042)
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="30" splitType="Stretch">
+ <textField>
+ <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" x="0" y="0" width="831" height="30"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle">
+ <font size="16" isBold="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordItemBean.java
===================================================================
diff -u -r20983 -r21042
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordItemBean.java (.../UseRecordItemBean.java) (revision 20983)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordItemBean.java (.../UseRecordItemBean.java) (revision 21042)
@@ -27,6 +27,10 @@
*/
private int disposableGoodsAmount = 0;
+ /**
+ * 高值耗材数量
+ */
+ private int expensiveGoodsAmount = 0;
public String getUserName() {
return userName;
@@ -52,5 +56,11 @@
public void setDisposableGoodsAmount(int disposableGoodsAmount) {
this.disposableGoodsAmount = disposableGoodsAmount;
}
+ public int getExpensiveGoodsAmount() {
+ return expensiveGoodsAmount;
+ }
+ public void setExpensiveGoodsAmount(int expensiveGoodsAmount) {
+ this.expensiveGoodsAmount = expensiveGoodsAmount;
+ }
}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r21036 -r21042
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21036)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21042)
@@ -10665,16 +10665,25 @@
ResultSet rs = objectDao.executeSql(sql);
try {
while (rs.next()) {
+ String operator2 = rs.getString("operator"); //录入人
+ int amount = rs.getInt("amount"); //录入的使用记录条数
+
+ int tousseAmount = useRecordManager.getTousseAmountByDepartAndUserName(coding, operator2, startDate, endDate);
+ int disposableGoodsAmount = useRecordManager.getDisposableGoodsAmount(coding, operator2, startDate, endDate);
+
+
UseRecordItemBean itemBean = new UseRecordItemBean();
- itemBean.setUserName(rs.getString("operator"));
- itemBean.setRecordAmount(rs.getInt("amount"));// 录入的使用记录条数
- int tousseAmount = useRecordManager
- .getTousseAmountByDepartAndUserName(coding,
- itemBean.getUserName(), startDate, endDate);// getTousseAmountByDepartAndUserName()
+ itemBean.setUserName(operator2);
+ itemBean.setRecordAmount(amount);
itemBean.setTousseAmount(tousseAmount);
- int disposableGoodsAmount = useRecordManager.getDisposableGoodsAmount(coding,
- itemBean.getUserName(), startDate, endDate);
itemBean.setDisposableGoodsAmount(disposableGoodsAmount);
+
+ //新的高值耗材
+ if (CssdUtils.getSystemSetConfigByNameBool("enableExpensiveGoods", false)) {
+ int expensiveGoodsAmount= useRecordManager.getExpensiveGoodsAmount(coding, operator2, startDate, endDate);
+ itemBean.setExpensiveGoodsAmount(expensiveGoodsAmount);
+ }
+
itemBeans.add(itemBean);
}
} catch (Exception e) {
Index: ssts-web/src/main/webapp/jasperRtp/useRecordTotalView2.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js
===================================================================
diff -u -r17626 -r21042
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js (.../useRecordTotalView.js) (revision 17626)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js (.../useRecordTotalView.js) (revision 21042)
@@ -8,13 +8,22 @@
var departSearch = $Id('departSearch').value;
var operatorSearch = $Id('operatorSearch').value;
+ var jasperreportName = 'useRecordTotalView.jasper';
+ if (sstsConfig.enableExpensiveGoods) {
+ jasperreportName = 'useRecordTotalView2.jasper';
+ }
+
myMask = new Ext.LoadMask(Ext.getBody(), {
msg: '正在加载，请稍候！',
removeMask: true
});
myMask.show();
+
+
+
window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
- "?jasperreportName=useRecordTotalView.jasper&reportName=useRecordTotalView" +
+ "?jasperreportName=" + jasperreportName +
+ "&reportName=useRecordTotalView" +
"&startDay=" + startTime +
"&endDay=" + endTime +
"&depart=" + departSearch +
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml
===================================================================
diff -u -r17547 -r21042
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml (.../useRecordItemView.jrxml) (revision 17547)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml (.../useRecordItemView.jrxml) (revision 21042)
@@ -220,7 +220,7 @@
-
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordTotalViewSub2.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordTotalViewSub2.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordTotalViewSub2.jrxml (revision 21042)
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
===================================================================
diff -u -r20983 -r21042
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 20983)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 21042)
@@ -62,6 +62,15 @@
*/
public int getDisposableGoodsAmount(String departCoding,String operator,String startDate,String endDate);
/**
+ * 获取某科室某人在指定时间段内,录入的使用记录中,高值耗材的总数量.
+ * @param departCoding 科室编码
+ * @param operator 录入人
+ * @param startDate 开始时间(包括年月日时分秒)
+ * @param endDate 结束时间(包括年月日时分秒)
+ * @return
+ */
+ public int getExpensiveGoodsAmount(String departCoding,String operator,String startDate,String endDate);
+ /**
* 根据使用记录Id删除使用记录,并将使用记录关联的包实例状态还原
* @param useRecordId 使用记录id,多条时采用分号拼接
*/
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.jsp
===================================================================
diff -u -r17612 -r21042
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.jsp (.../useRecordTotalView.jsp) (revision 17612)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.jsp (.../useRecordTotalView.jsp) (revision 21042)
@@ -20,6 +20,7 @@
%>
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordTotalViewSub2.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r21035 -r21042
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21035)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21042)
@@ -3833,17 +3833,40 @@
//按录入人过滤
String operatorSql = String.format(" and r.operator='%s' ", operator);
- String sql1 = String.format("select sum(udgi.amount) amount from UseDiposableGoodsItem udgi join useRecord r on udgi.useRecord_id = r.id "
+ String sql = String.format("select sum(udgi.amount) amount from UseDiposableGoodsItem udgi join useRecord r on udgi.useRecord_id = r.id "
+ "where 1=1 %s %s %s", betweenSql, departCodingSql, operatorSql);
- String sql2 = String.format("select count(*) amount from UseRecord r join ExpensiveGoodsInstance egi on egi.userecordId=r.id "
+ ResultSet rs = objectDao.executeSql(sql);
+ int amount = 0;
+ try {
+ if (rs.next()){
+ amount += rs.getInt(1);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }finally {
+ DatabaseUtil.closeResultSetAndStatement(rs);
+ }
+ return amount;
+ }
+
+ @Override
+ public int getExpensiveGoodsAmount(String departCoding, String operator,
+ String startDate, String endDate) {
+ //按时间过滤
+ String betweenSql = String.format(" and %s ", dateQueryAdapter.dateAreaSql("r.enteringDate", startDate, endDate));
+ //按科室过滤
+ String departCodingSql = String.format(" and r.departCoding='%s' ", departCoding);
+ //按录入人过滤
+ String operatorSql = String.format(" and r.operator='%s' ", operator);
+
+ String sql = String.format("select count(*) amount from UseRecord r join ExpensiveGoodsInstance egi on egi.userecordId=r.id "
+ "where 1=1 %s %s %s", betweenSql, departCodingSql, operatorSql);
- String sql = String.format(" %s union all %s ", sql1, sql2);
ResultSet rs = objectDao.executeSql(sql);
int amount = 0;
try {
- while(rs.next()){
+ if (rs.next()){
amount += rs.getInt(1);
}
} catch (SQLException e) {
@@ -3855,7 +3878,6 @@
}
-
public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
this.dateQueryAdapter = dateQueryAdapter;
}
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper
===================================================================
diff -u -r17547 -r21042
Binary files differ