Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r15317 -r15736
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 15317)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 15736)
@@ -6,6 +6,7 @@
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoring"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
@@ -23,6 +24,8 @@
<%
LoginUserData userData = AcegiHelper.getLoginUser();
+ Integer biologicalMonitoringTime = ((SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager")).getSystemParamsObj().getBiologicalMonitoringTime();
+ request.setAttribute("biologicalMonitoringTime",biologicalMonitoringTime==null?190:biologicalMonitoringTime); //生物 监测的时间默认190分钟
request.setAttribute("userName",userData.getUserFullName());
request.setAttribute("orgUnitCoding",userData.getOrgUnitCodingFromSupplyRoomConfig());
%>
@@ -98,6 +101,7 @@
if('${param.type }'){
isQueryToday = true;
}
+var _biologicalMonitoringTime = <%=request.getAttribute("biologicalMonitoringTime")%>*60*1000; //生物监测的时间
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r15685 -r15736
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 15685)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 15736)
@@ -2048,7 +2048,11 @@
Ext.getCmp('ftDefaultPackageType').setValue(supplyRoomConfig.ftDefaultPackageType);
}
var biologicalMonitoringTime = supplyRoomConfig.biologicalMonitoringTime;
- Ext.getCmp('biologicalMonitoringTime').setValue(biologicalMonitoringTime?biologicalMonitoringTime:250);
+ if (biologicalMonitoringTime == 0) {
+ Ext.getCmp('biologicalMonitoringTime').setValue(0);
+ } else {
+ Ext.getCmp('biologicalMonitoringTime').setValue(biologicalMonitoringTime?biologicalMonitoringTime:190);
+ }
Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r15720 -r15736
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15720)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15736)
@@ -2384,8 +2384,11 @@
var biologicalMonitoringStartDate = action.result.data.biologicalMonitoringStartDate;
if (biologicalMonitoringStartDate) {
top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(biologicalMonitoringStartDate));
- } else {
+ } else { //已经添加过生物监测
top.Ext.getCmp('biologicalMonitoringStartDate').setValue(top.Ext.getCmp('endDate').getValue());
+
+ var temp = top.Ext.getCmp('biologicalMonitoringStartDate').getValue().getTime() + _biologicalMonitoringTime;
+ top.Ext.getCmp('biologicalMonitoringEndDate').setValue(new Date(temp));
}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r15687 -r15736
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 15687)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 15736)
@@ -66,7 +66,7 @@
private String ftDefaultPackageType; //外来器械默认的灭菌程序
/**
- * 外来器械做生物监测的默认时间(单位：分钟)默认250分钟
+ * 外来器械做生物监测的默认时间(单位：分钟)默认190分钟
*/
private Integer biologicalMonitoringTime;
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r15718 -r15736
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15718)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15736)
@@ -9540,250 +9540,219 @@
- //回收的数量（按器械包算）
- String sql1 = "select i.tousseName,sum(i.amount) "
- + "from RecyclingRecord r,TousseItem i"
- + " where r.id = i.recyclingRecord_id and r.orgUnitCoding = '"+departCoding
- + "' and r.recyclingTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS")
- + " and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-mm-dd HH24:MI:SS")
- + " group by i.tousseName"
- + (optionSqlArray.length == 0 ? " having i.tousseName in('')" : createInFilterSql("i.tousseName", optionSqlArray))
- ;
-
- ResultSet result1 = objectDao.executeSql(sql1);
- try {
- while(result1.next()){
- String tousseName = result1.getString(1);
- int tousseAmount = result1.getInt(2);
-
- TousseDeliverDetailVO vo = voMap.get(tousseName);
- if(vo == null){
- vo = new TousseDeliverDetailVO();
- vo.setTousseName(tousseName);
- voMap.put(tousseName, vo);
- }
- vo.setRecyclingAmount(tousseAmount);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }finally {
- DatabaseUtil.closeResultSetAndStatement(result1);
- }
+ String betweenTemp = " between "+dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS")+" and "+dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS")+" ";
-
- //清洗的数量（按材料算）
- String sql2 =
- "select t.tousseName, sum(t.materialCount) materialCount " +
- "from (" +
- "(select ci.tousseNameForMaterial tousseName, sum(ci.amount) materialCount " +
- "from washAndDisinfectRecord wr, classifyBasket_washRecord cw, classifyBasket cb, classifiedItem ci " +
- "where wr.id = cw.washanddisinfectrecord_id and cw.classifybasket_id = cb.id and ci.classifybasket_id = cb.id and ci.itemType = '材料' " +
- "and wr.orgunitcoding='" + departCoding + "' "+
- "and wr.endDate between " + dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS") +
- " and " + dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS") +
- " group by ci.tousseNameForMaterial)" +
-
- " union all " +
+ String sql =
+ //回收数量（包的数量）
+ "select 'recycling' 'type',ti.tousseName tousseName,sum(ti.amount) amount "
+ + "from RecyclingRecord rr "
+ + "inner join TousseItem ti on ti.recyclingRecord_id=rr.id "
+ + "where 1=1 "
+ + "and rr.orgUnitCoding='"+departCoding+"' "
+ + "and rr.recyclingTime"+betweenTemp
+ + "group by ti.tousseName "
+ + (optionSqlArray.length==0?"having ti.tousseName in('')":createInFilterSql("ti.tousseName", optionSqlArray))
- "(select ci.name tousseName, sum(ci.amount*mi.count) materialCount " +
- "from washAndDisinfectRecord wr, classifyBasket_washRecord cw, classifyBasket cb, classifiedItem ci, tousseDefinition td, materialInstance mi " +
- "where cw.washanddisinfectrecord_id = wr.id and cw.classifybasket_id = cb.id and ci.classifybasket_id = cb.id and ci.tousseDefinition_id = td.id and mi.tousse_id = td.id and ci.itemType <> '材料' " +
- "and wr.orgunitcoding='" + departCoding + "' "+
- "and wr.endDate between " + dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS") +
- " and " + dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS") +
- " group by ci.name)" +
- ") t " +
- "group by t.tousseName"
- + (optionSqlArray.length == 0 ? " having t.tousseName in('')" : createInFilterSql("t.tousseName", optionSqlArray))
- ;
-
-
-
- ResultSet result2 = objectDao.executeSql(sql2);
- try {
- while(result2.next()){
- String tousseName = result2.getString(1);
- int materialCount = result2.getInt(2);
+ + " union all "
- TousseDeliverDetailVO vo = voMap.get(tousseName);
- if(vo == null){
- vo = new TousseDeliverDetailVO();
- vo.setTousseName(tousseName);
- voMap.put(tousseName, vo);
- }
- vo.setWashAndDisinfectAmount(materialCount);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }finally {
- DatabaseUtil.closeResultSetAndStatement(result2);
- }
-
-
-
- //装配的数量（按器械包算）
- String sql3 = "select i.tousseName,count(*) tousseAmount from PackingRecord r,tousseInstance i"
- + " where r.id = i.packingRecord_id and r.orgUnitCoding = '"+departCoding
- + "' and r.packTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS")
- + " and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-mm-dd HH24:MI:SS")
- + " group by i.tousseName"
- + (optionSqlArray.length == 0 ? " having i.tousseName in('')" : createInFilterSql("i.tousseName", optionSqlArray))
- ;
-
- ResultSet result3 = objectDao.executeSql(sql3);
- try {
- while(result3.next()){
- String tousseName = result3.getString(1);
- int tousseAmount = result3.getInt(2);
+ //清洗数量（材料的数量）
+ + "select 'washForMaterial' 'type',t1.tousseName tousseName,sum(t1.materialCount) amount "
+ + "from (select ci.tousseNameForMaterial tousseName,sum(ci.amount) materialCount "
+ + "from WashAndDisinfectRecord wr "
+ + "inner join ClassifyBasket_WashRecord cw on cw.WashAndDisinfectRecord_ID=wr.id "
+ + "inner join ClassifyBasket cb on cb.id=cw.ClassifyBasket_ID "
+ + "inner join ClassifiedItem ci on ci.classifybasket_id=cb.id "
+ + "where ci.itemType = '材料' "
+ + "and wr.orgunitcoding='"+departCoding+"' "
+ + "and wr.endDate"+betweenTemp
+ + "group by ci.tousseNameForMaterial "
+ + "union all "
+ + "select td.name tousseName,sum(ci.amount*mi.count) materialCount "
+ + "from WashAndDisinfectRecord wr "
+ + "inner join ClassifyBasket_WashRecord cw on cw.WashAndDisinfectRecord_ID=wr.id "
+ + "inner join ClassifyBasket cb on cb.id=cw.ClassifyBasket_ID "
+ + "inner join ClassifiedItem ci on ci.classifybasket_id=cb.id "
+ + "inner join TousseDefinition td on ci.toussedefinition_id=td.id "
+ + "inner join MaterialInstance mi on mi.tousse_id=td.id "
+ + "where ci.itemType <> '材料' "
+ + "and wr.orgunitcoding='"+departCoding+"' "
+ + "and wr.endDate"+betweenTemp
+ + "group by td.name) t1 "
+ + "group by t1.tousseName "
+ + (optionSqlArray.length==0?"having t1.tousseName in('')":createInFilterSql("t1.tousseName", optionSqlArray))
- TousseDeliverDetailVO vo = voMap.get(tousseName);
- if(vo == null){
- vo = new TousseDeliverDetailVO();
- vo.setTousseName(tousseName);
- voMap.put(tousseName, vo);
- }
- vo.setPackingAmount(tousseAmount);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }finally {
- DatabaseUtil.closeResultSetAndStatement(result3);
- }
-
- //审核的数量（按器械包算）
- String sql4 = "select i.tousseName,count(*) from tousseInstance i"
- + " where i.orgUnitCoding = '"+departCoding
- + "' and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS")
- + " and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-mm-dd HH24:MI:SS")
- + " group by i.tousseName"
- + (optionSqlArray.length == 0 ? " having i.tousseName in('')" : createInFilterSql("i.tousseName", optionSqlArray))
- ;
-
- ResultSet result4 = objectDao.executeSql(sql4);
- try {
- while(result4.next()){
- String tousseName = result4.getString(1);
- int tousseAmount = result4.getInt(2);
+ + " union all "
- TousseDeliverDetailVO vo = voMap.get(tousseName);
- if(vo == null){
- vo = new TousseDeliverDetailVO();
- vo.setTousseName(tousseName);
- voMap.put(tousseName, vo);
- }
- vo.setReviewAmount(tousseAmount);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- } finally {
- DatabaseUtil.closeResultSetAndStatement(result4);
- }
-
- //灭菌的数量（按器械包算）
- String sql5 =
- "select i.tousseName,"
- + "count(*) "
- + "from SterilizationRecord r,"
- + "tousseInstance i "
- + "where r.id=i.sterilizationRecord_id "
- + "and i.orgUnitCoding='"+departCoding+"' "
- + "and r.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS")+" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-mm-dd HH24:MI:SS")+" "
- + "group by i.tousseName "
- + (optionSqlArray.length == 0 ? " having i.tousseName in('')" : createInFilterSql("i.tousseName", optionSqlArray))
- ;
-
- ResultSet result5 = objectDao.executeSql(sql5);
- try {
- while(result5.next()){
- String tousseName = result5.getString(1);
- int tousseAmount = result5.getInt(2);
+ //装配数量（包的数量）
+ + "select 'packing' 'type',t2.tousseName tousseName,sum(t2.amount) amount "
+ + "from (select ti.tousseName tousseName,count(ti.tousseName) amount "
+ + "from PackingRecord pr "
+ + "inner join TousseInstance ti on ti.packingRecord_id=pr.id "
+ + "where 1=1 "
+ + "and pr.orgUnitCoding='"+departCoding+"' "
+ + "and pr.packTime"+betweenTemp
+ + "group by ti.tousseName "
+ + "union all "
+ + "select packingRecordTemp.tousseName tousseName,count(packingRecordTemp.tousseName) amount "
+ + "from (select fta.tousseName tousseName "
+ + "from PackingRecord pr "
+ + "inner join TousseInstance ti on ti.packingRecord_id=pr.id "
+ + "inner join TousseDefinition td on td.id=ti.tousseDefinition_id "
+ + "inner join ForeignTousseApplication fta on fta.id=ti.foreignTousseApp_id "
+ + "where 1=1 "
+ + "and td.tousseType='外来器械拆分小包' "
+ + "and pr.orgUnitCoding='"+departCoding+"' "
+ + "and pr.packTime"+betweenTemp
+ + "group by fta.tousseName,fta.id) packingRecordTemp "
+ + "group by packingRecordTemp.tousseName) t2 "
+ + "group by t2.tousseName "
+ + (optionSqlArray.length==0?"having t2.tousseName in('')":createInFilterSql("t2.tousseName", optionSqlArray))
- TousseDeliverDetailVO vo = voMap.get(tousseName);
- if(vo == null){
- vo = new TousseDeliverDetailVO();
- vo.setTousseName(tousseName);
- voMap.put(tousseName, vo);
- }
- vo.setSterilizationAmount(tousseAmount);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- } finally {
- DatabaseUtil.closeResultSetAndStatement(result5);
- }
-
- //发货的数量（按器械包算）
- String sql6 =
- "select ti.tousseName tousseName,"
- + "count(ti.tousseName) tousseAmount "
+ + " union all "
+
+ //审核数量（包的数量）
+ + "select 'review' 'type',t3.tousseName tousseName,sum(t3.amount) amount "
+ + "from (select ti.tousseName tousseName,count(ti.tousseName) amount "
+ + "from TousseInstance ti "
+ + "where 1=1 "
+ + "and ti.orgUnitCoding='"+departCoding+"' "
+ + "and ti.reviewTime"+betweenTemp
+ + "group by ti.tousseName "
+ + "union all "
+ + "select tousseInstanceTemp.tousseName tousseName,count(tousseInstanceTemp.tousseName) amount "
+ + "from (select fta.tousseName tousseName "
+ + "from TousseInstance ti "
+ + "inner join TousseDefinition td on td.id=ti.tousseDefinition_id "
+ + "inner join ForeignTousseApplication fta on fta.id=ti.foreignTousseApp_id "
+ + "where 1=1 "
+ + "and td.tousseType='外来器械拆分小包' "
+ + "and ti.orgUnitCoding='"+departCoding+"' "
+ + "and ti.reviewTime"+betweenTemp
+ + "group by fta.tousseName,fta.id) tousseInstanceTemp "
+ + "group by tousseInstanceTemp.tousseName) t3 "
+ + "group by t3.tousseName "
+ + (optionSqlArray.length==0?"having t3.tousseName in('')":createInFilterSql("t3.tousseName", optionSqlArray))
+
+ + " union all "
+
+ //灭菌数量（包的数量）
+ + "select 'sterilization' 'type',t4.tousseName tousseName,sum(t4.amount) amount "
+ + "from (select ti.tousseName tousseName,count(ti.tousseName) amount "
+ + "from SterilizationRecord sr "
+ + "inner join TousseInstance ti on ti.sterilizationRecord_id=sr.id "
+ + "where 1=1 "
+ + "and ti.orgUnitCoding='"+departCoding+"' "
+ + "and sr.endDate"+betweenTemp
+ + "group by ti.tousseName "
+ + "union all "
+ + "select sterilizationTemp.tousseName tousseName,count(sterilizationTemp.tousseName) amount "
+ + "from (select fta.tousseName tousseName "
+ + "from SterilizationRecord sr "
+ + "inner join TousseInstance ti on ti.sterilizationRecord_id=sr.id "
+ + "inner join TousseDefinition td on td.id=ti.tousseDefinition_id "
+ + "inner join ForeignTousseApplication fta on fta.id=ti.foreignTousseApp_id "
+ + "where 1=1 "
+ + "and td.tousseType='外来器械拆分小包' "
+ + "and ti.orgUnitCoding='"+departCoding+"' "
+ + "and sr.endDate"+betweenTemp
+ + "group by fta.tousseName,fta.id) sterilizationTemp "
+ + "group by sterilizationTemp.tousseName) t4 "
+ + "group by t4.tousseName "
+ + (optionSqlArray.length==0?"having t4.tousseName in('')":createInFilterSql("t4.tousseName", optionSqlArray))
+
+ + " union all "
+
+ //发货数量（包的数量）
+ + "select 'invoice' 'type',t5.tousseName tousseName,sum(t5.amount) amount "
+ + "from (select ti.tousseName tousseName,count(ti.tousseName) amount "
+ "from Invoice i "
+ "inner join TousseInstance ti on ti.invoice_id=i.id "
+ "where 1=1 "
+ "and i.orgUnitCoding='"+departCoding+"' "
- + "and i.sendTime between "+dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS")+" and "+dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS")+" "
+ + "and i.sendTime"+betweenTemp
+ "group by ti.tousseName "
- + (optionSqlArray.length == 0 ? " having ti.tousseName in('')" : createInFilterSql("ti.tousseName", optionSqlArray))
- ;
-
- ResultSet result6 = objectDao.executeSql(sql6);
- try {
- while(result6.next()){
- String tousseName = result6.getString(1);
- int tousseAmount = result6.getInt(2);
+ + "union all "
+ + "select invoiceTemp.tousseName tousseName,count(invoiceTemp.tousseName) amount "
+ + "from (select fta.tousseName tousseName "
+ + "from Invoice i "
+ + "inner join TousseInstance ti on ti.invoice_id=i.id "
+ + "inner join TousseDefinition td on td.id=ti.tousseDefinition_id "
+ + "inner join ForeignTousseApplication fta on fta.id=ti.foreignTousseApp_id "
+ + "where 1=1 "
+ + "and td.tousseType='外来器械拆分小包' "
+ + "and i.orgUnitCoding='"+departCoding+"' "
+ + "and i.sendTime"+betweenTemp
+ + "group by fta.tousseName,fta.id) invoiceTemp "
+ + "group by invoiceTemp.tousseName) t5 "
+ + "group by t5.tousseName "
+ + (optionSqlArray.length==0?"having t5.tousseName in('')":createInFilterSql("t5.tousseName", optionSqlArray))
+ + " union all "
- TousseDeliverDetailVO vo = voMap.get(tousseName);
- if(vo == null){
- vo = new TousseDeliverDetailVO();
- vo.setTousseName(tousseName);
- voMap.put(tousseName, vo);
- }
- vo.setTousseAmount(tousseAmount);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }finally {
- DatabaseUtil.closeResultSetAndStatement(result6);
- }
-
-
- //发货的数量（按材料算）
- String sql7 =
- "select ti.tousseName tousseName,"
- + "sum(mi.count) materialAmount "
+ //发货数量（材料的数量）
+ + "select 'invoiceForMaterial' 'type',t6.tousseName tousseName,sum(t6.amount) amount "
+ + "from (select ti.tousseName tousseName,sum(mi.count) amount "
+ "from Invoice i "
+ "inner join TousseInstance ti on ti.invoice_id=i.id "
+ "inner join TousseDefinition td on td.id=ti.tousseDefinition_id "
+ "inner join MaterialInstance mi on mi.tousse_id=td.id "
+ "where 1=1 "
+ "and i.orgUnitCoding='"+departCoding+"' "
- + "and i.sendTime between "+dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS")+" and "+dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS")+" "
+ + "and i.sendTime"+betweenTemp
+ "group by ti.tousseName "
- + (optionSqlArray.length == 0 ? " having ti.tousseName in('')" : createInFilterSql("ti.tousseName", optionSqlArray))
+ + "union all "
+ + "select fta.tousseName tousseName,sum(mi.count) amount "
+ + "from Invoice i "
+ + "inner join TousseInstance ti on ti.invoice_id=i.id "
+ + "inner join TousseDefinition td on td.id=ti.tousseDefinition_id "
+ + "inner join MaterialInstance mi on mi.tousse_id=td.id "
+ + "inner join ForeignTousseApplication fta on fta.id=ti.foreignTousseApp_id "
+ + "where 1=1 "
+ + "and td.tousseType='外来器械拆分小包' "
+ + "and i.orgUnitCoding='"+departCoding+"' "
+ + "and i.sendTime"+betweenTemp
+ + "group by fta.tousseName,fta.id) t6 "
+ + "group by t6.tousseName "
+ + (optionSqlArray.length==0?"having t6.tousseName in('')":createInFilterSql("t6.tousseName", optionSqlArray))
;
- ResultSet result7 = objectDao.executeSql(sql7);
+ ResultSet result = objectDao.executeSql(sql);
try {
- while(result7.next()){
- String tousseName = result7.getString(1);
- int materialAmount = result7.getInt(2);
+ while(result.next()){
+ String type = result.getString("type");
+ String tousseName = result.getString("tousseName");
+ Integer amount = result.getInt("amount");
-
TousseDeliverDetailVO vo = voMap.get(tousseName);
if(vo == null){
vo = new TousseDeliverDetailVO();
vo.setTousseName(tousseName);
voMap.put(tousseName, vo);
}
- vo.setMaterialAmount(materialAmount);
+
+ if ("recycling".equals(type)) {
+ vo.setRecyclingAmount(amount);
+ } else if ("washForMaterial".equals(type)) {
+ vo.setWashAndDisinfectAmount(amount);
+ } else if ("packing".equals(type)) {
+ vo.setPackingAmount(amount);
+ } else if ("review".equals(type)) {
+ vo.setReviewAmount(amount);
+ } else if ("sterilization".equals(type)) {
+ vo.setSterilizationAmount(amount);
+ } else if ("invoice".equals(type)) {
+ vo.setSendOutAmount(amount);
+ } else if ("invoiceForMaterial".equals(type)) {
+ vo.setMaterialAmount(amount);
+ }
+
}
} catch (SQLException e) {
e.printStackTrace();
}finally {
- DatabaseUtil.closeResultSetAndStatement(result7);
+ DatabaseUtil.closeResultSetAndStatement(result);
}
-
List voList = new ArrayList();
int serialNum = 0;
if(voMap.size() > 0){