Index: ssts-web/src/test/resources/test/forgon/AllTests.xml =================================================================== diff -u -r17506 -r17575 --- ssts-web/src/test/resources/test/forgon/AllTests.xml (.../AllTests.xml) (revision 17506) +++ ssts-web/src/test/resources/test/forgon/AllTests.xml (.../AllTests.xml) (revision 17575) @@ -28,6 +28,6 @@ - + \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/directory/service/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/directory/service/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/directory/service/AllTests.xml (revision 17575) @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseSterilizationInspectSituation.js =================================================================== diff -u -r17383 -r17575 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseSterilizationInspectSituation.js (.../tousseSterilizationInspectSituation.js) (revision 17383) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseSterilizationInspectSituation.js (.../tousseSterilizationInspectSituation.js) (revision 17575) @@ -14,6 +14,7 @@ var monthSearch= $Id('monthSearch').value; var sterilizationType= $Id('sterilizationType').value; + var sterilizationPurpose= $Id('sterilizationPurpose').value; var departCoding = Ext.getCmp('querySupplyRoom').getValue(); myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', @@ -24,6 +25,7 @@ "?jasperreportName=tousseSterilizationInspectSituation.jasper&reportName=tousseSterilizationInspectSituation" + "&monthSearch=" + monthSearch + "&sterilizationType=" + sterilizationType + + "&sterilizationPurpose=" + sterilizationPurpose + "&departCoding=" + departCoding, 'thisIframe', '_self'); } @@ -66,6 +68,20 @@ } }); + //“灭菌目的combo”的store + var sterilizationPurposeStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getSterilizationPurposeList.do', + method : 'POST' + }), + reader : new Ext.data.JsonReader({ + fields : [ + {name : 'id'}, + {name : 'optionText'} + ] + }) + }); + form = new Ext.form.FormPanel({ title : entityName, region : 'north', @@ -109,11 +125,25 @@ triggerAction : 'all', name : "sterilizationType", id : "sterilizationType", - allowBlank : false, readOnly:true, anchor : '95%' }] },{ + width : 230, + layout : 'form', + items : [{ + xtype : 'multiSelect', + fieldLabel : "灭菌目的", + valueField : 'optionText', + displayField : 'optionText', + store : sterilizationPurposeStore, + triggerAction : 'all', + name : "sterilizationPurpose", + id : "sterilizationPurpose", + readOnly:true, + anchor : '95%' + }] + },{ width : 250, layout : 'form', labelSeparator : '选择供应室:', Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r17527 -r17575 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17527) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17575) @@ -14391,28 +14391,38 @@ @Override public List getTousseSterilizationInspectSituationBeans( - String monthSearch, String sterilizationType, String departCoding) { + String monthSearch, String sterilizationType, String sterilizationPurpose, String departCoding) { List list = new ArrayList(); if (StringTools.isNotBlank(monthSearch) - && StringTools.isNotBlank(sterilizationType) && StringTools.isNotBlank(departCoding)) { List sterilizerNameList= sterilizerManager.getAllSterilizerName(); //灭菌炉 String total = "合计"; String proportion = "比率（%）"; sterilizerNameList.add(total); sterilizerNameList.add(proportion); - List sterilizationTypeList = new LinkedList(Arrays.asList(sterilizationType.split(","))); List tagList = new LinkedList(); String chemistryResultTag = "化学监测（次）"; String physicsResultTag = "物理监测（次）"; String biologyResultTag = "生物监测（次）"; tagList.add(chemistryResultTag); tagList.add(physicsResultTag); tagList.add(biologyResultTag); - tagList.addAll(sterilizationTypeList); + if (StringTools.isNotBlank(sterilizationType)) { //用户指定要查询的灭菌程序 + String[] sterilizationTypeArr = sterilizationType.split(","); + for (String temp : sterilizationTypeArr) { + tagList.add(temp.trim()); + } + } + if (StringTools.isNotBlank(sterilizationPurpose)) { //用户指定要查询的灭菌目的 + String[] sterilizationPurposeArr = sterilizationPurpose.split(","); + for (String temp : sterilizationPurposeArr) { + tagList.add(temp.trim()); + } + } String tousseAmountTypeTag = "出炉灭菌包（件）"; tagList.add(tousseAmountTypeTag); + Integer rowGroupSequence = 0; Map tempMap = new HashMap(); for (String name : sterilizerNameList) { @@ -14448,7 +14458,7 @@ String betweenSql = dateQueryAdapter.dateAreaSql("sr.endDate", monthSearch + "-01", monthSearch + "-" +lastDay, true); String sql = - "select s.name,sr.chemistryResult,sr.physicsResult,sr.biologyResult,sr.sterilizationType " + "select s.name,sr.chemistryResult,sr.physicsResult,sr.biologyResult,sr.sterilizationType,sr.sterilizationPurpose " + "from SterilizationRecord sr join Sterilizer s on s.id=sr.sterilizer_id " + "where " + betweenSql + " and sr.orgUnitCoding='" + departCoding+ "' " ; @@ -14460,6 +14470,7 @@ String physicsResult = StringTools.defaultString(result1.getString("physicsResult")); String biologyResult = StringTools.defaultString(result1.getString("biologyResult")); String sterilizationType2 = StringTools.defaultString(result1.getString("sterilizationType")); + String sterilizationPurpose2 = StringTools.defaultString(result1.getString("sterilizationPurpose")); //化学监测 TousseSterilizationInspectSituationBean bean1 = null; @@ -14530,9 +14541,11 @@ } } - //灭菌程序（三个监测只要有一个结果失败，则说明这个灭菌程序的灭菌结果也是失败） + //灭菌程序、灭菌目的（三个监测只要有一个结果失败，则为失败） TousseSterilizationInspectSituationBean bean4 = null; TousseSterilizationInspectSituationBean bean44 = null; + TousseSterilizationInspectSituationBean bean5 = null; + TousseSterilizationInspectSituationBean bean55 = null; if (StringTools.equals(chemistryResult, SterilizationRecord.MONITOR_RESULT_UNQUALIFIED) || StringTools.equals(physicsResult, SterilizationRecord.MONITOR_RESULT_UNQUALIFIED) || StringTools.equals(biologyResult, SterilizationRecord.MONITOR_RESULT_UNQUALIFIED)) { @@ -14544,6 +14557,15 @@ if (bean44 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 bean44.setAmount(bean44.getAmount() + 1); } + + bean5 = tempMap.get(name + sterilizationPurpose2 + SterilizationRecord.MONITOR_RESULT_UNQUALIFIED); + if (bean5 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 + bean5.setAmount(bean5.getAmount() + 1); + } + bean55 = tempMap.get(total + sterilizationPurpose2 + SterilizationRecord.MONITOR_RESULT_UNQUALIFIED); + if (bean55 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 + bean55.setAmount(bean55.getAmount() + 1); + } } else if (StringTools.equals(chemistryResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED) || StringTools.equals(physicsResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED) || StringTools.equals(biologyResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED)) { @@ -14555,6 +14577,15 @@ if (bean44 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 bean44.setAmount(bean44.getAmount() + 1); } + + bean5 = tempMap.get(name + sterilizationPurpose2 + SterilizationRecord.MONITOR_RESULT_QUALIFIED); + if (bean5 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 + bean5.setAmount(bean5.getAmount() + 1); + } + bean55 = tempMap.get(total + sterilizationPurpose2 + SterilizationRecord.MONITOR_RESULT_QUALIFIED); + if (bean55 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 + bean55.setAmount(bean55.getAmount() + 1); + } } } } catch (SQLException e) { @@ -14595,26 +14626,26 @@ String type = StringTools.defaultString(result2.getString("type")); String name = StringTools.defaultString(result2.getString("name")); int amount = result2.getInt("amount"); - //生物监测 - TousseSterilizationInspectSituationBean bean5 = null; - TousseSterilizationInspectSituationBean bean55 = null; + //出炉灭菌包 + TousseSterilizationInspectSituationBean bean6 = null; + TousseSterilizationInspectSituationBean bean66 = null; if (StringTools.equals(type, "success")) { - bean5 = tempMap.get(name + tousseAmountTypeTag + SterilizationRecord.MONITOR_RESULT_QUALIFIED); - if (bean5 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 - bean5.setAmount(bean5.getAmount() + amount); + bean6 = tempMap.get(name + tousseAmountTypeTag + SterilizationRecord.MONITOR_RESULT_QUALIFIED); + if (bean6 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 + bean6.setAmount(bean6.getAmount() + amount); } - bean55 = tempMap.get(total + tousseAmountTypeTag + SterilizationRecord.MONITOR_RESULT_QUALIFIED); - if (bean55 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 - bean55.setAmount(bean55.getAmount() + amount); + bean66 = tempMap.get(total + tousseAmountTypeTag + SterilizationRecord.MONITOR_RESULT_QUALIFIED); + if (bean66 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 + bean66.setAmount(bean66.getAmount() + amount); } } else { - bean5 = tempMap.get(name + tousseAmountTypeTag + SterilizationRecord.MONITOR_RESULT_UNQUALIFIED); - if (bean5 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 - bean5.setAmount(bean5.getAmount() + amount); + bean6 = tempMap.get(name + tousseAmountTypeTag + SterilizationRecord.MONITOR_RESULT_UNQUALIFIED); + if (bean6 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 + bean6.setAmount(bean6.getAmount() + amount); } - bean55 = tempMap.get(total + tousseAmountTypeTag + SterilizationRecord.MONITOR_RESULT_UNQUALIFIED); - if (bean55 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 - bean55.setAmount(bean55.getAmount() + amount); + bean66 = tempMap.get(total + tousseAmountTypeTag + SterilizationRecord.MONITOR_RESULT_UNQUALIFIED); + if (bean66 != null) { //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理 + bean66.setAmount(bean66.getAmount() + amount); } } } @@ -14626,7 +14657,6 @@ //计算比率 for (String tag : tagList) { - tag = tag.trim(); TousseSterilizationInspectSituationBean qualifiedBean = tempMap.get(total + tag + SterilizationRecord.MONITOR_RESULT_QUALIFIED); //正常情况这里不会出现空指针的，所以下面没有处理空指针 TousseSterilizationInspectSituationBean unqualifiedBean = tempMap.get(total + tag + SterilizationRecord.MONITOR_RESULT_UNQUALIFIED); Integer qualifiedTotal = qualifiedBean.getAmount(); //合格总数 Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r17547 -r17575 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 17547) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 17575) @@ -338,12 +338,12 @@ } else if (reportName.equals("tousseSterilizationInspectSituation")) { //器械消毒灭菌检查情况报表 String monthSearch = StrutsParamUtils.getPraramValue("monthSearch", ""); String sterilizationType = StrutsParamUtils.getPraramValue("sterilizationType", ""); + String sterilizationPurpose = StrutsParamUtils.getPraramValue("sterilizationPurpose", ""); String departCoding = StrutsParamUtils.getPraramValue("departCoding", ""); if (StringTools.isNotBlank(monthSearch) - && StringTools.isNotBlank(sterilizationType) && StringTools.isNotBlank(departCoding)) { List list = jasperReportManager - .getTousseSterilizationInspectSituationBeans(monthSearch, sterilizationType, departCoding); + .getTousseSterilizationInspectSituationBeans(monthSearch, sterilizationType, sterilizationPurpose, departCoding); return list; } } else if (reportName.equals("packingUnqualifieReport")) {// 包装区工作量不合格率 Fisheye: Tag 17575 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/directory/OrgUnitManagerTest.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java =================================================================== diff -u -r17564 -r17575 --- ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java (.../OrgUnitManagerTest.java) (revision 17564) +++ ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java (.../service/OrgUnitManagerTest.java) (revision 17575) @@ -1,4 +1,4 @@ -package test.forgon.directory; +package test.forgon.directory.service; import java.sql.ResultSet; import java.util.List; Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r17527 -r17575 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 17527) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 17575) @@ -492,11 +492,12 @@ * 获取器械消毒灭菌检查情况报表的数据 * @param monthSearch 查询年月 如： 2017-01 * @param sterilizationType 灭菌程序 + * @param sterilizationPurpose 灭菌目的 * @param departCoding 科室编码 * @return */ public List getTousseSterilizationInspectSituationBeans( - String monthSearch, String sterilizationType, String departCoding); + String monthSearch, String sterilizationType, String sterilizationPurpose, String departCoding); /** * 获取次日下送统计 报表的数据 * @param params