Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r27895 -r27898 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27895) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27898) @@ -10094,159 +10094,57 @@ } } Map voMap = new HashMap(); - Map isUnderlineTousseMap = new HashMap(); - String departSql = null; - if(StringUtils.isNotBlank(departCoding)){ - departSql = " and r.orgUnitCoding = '"+departCoding + "'"; - }else{ - departSql = ""; - } + //回收 - String sql2 = "select i.tousseName,sum(i.amount) from RecyclingRecord r " - + "join invoicePlan ip on ip.id=r.recyclingApplication_id " - + "join TousseItem i on i.recyclingApplication_ID=ip.id" - + " where 1=1 " - + departSql - + " and r.recyclingTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS") + String sql2 = "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 order by i.tousseName desc "; + + " group by i.tousseName "; ResultSet result2 = null; try { result2 = objectDao.executeSql(sql2); while(result2.next()){ String tousseName = result2.getString(1); - String rName = ""; - if(isUnderlineTousseMap.containsKey(tousseName)){ - Boolean isUnderlineTousse = isUnderlineTousseMap.get(tousseName); - if(isUnderlineTousse == true){ - // 去消毒物品名称中的括号 - String tname = CssdUtils.filterDisinfectGoodsNameBracket(tousseName); - // 下划线 - rName = getTousseSourceName(tname); - } - }else{ - rName = tousseName; - isUnderlineTousseMap.put(tousseName, false); - } - if(StringUtils.isBlank(rName)){ - rName = tousseName; - } - if(optionMap.size() == 0 || optionMap.get(rName) != null){ + if(optionMap.size() == 0 || optionMap.get(tousseName) != null){ int tousseAmount = result2.getInt(2); - TousseDeliverDetailVO vo = voMap.get(rName); + TousseDeliverDetailVO vo = voMap.get(tousseName); if(vo == null){ vo = new TousseDeliverDetailVO(); - vo.setTousseName(rName); - vo.setRecyclingAmount(tousseAmount); - voMap.put(rName, vo); - }else{ - vo.setTousseName(rName); - int curAmount = vo.getRecyclingAmount(); - vo.setRecyclingAmount(curAmount+tousseAmount); - voMap.put(rName, vo); + voMap.put(tousseName, vo); } + vo.setTousseName(tousseName); + vo.setRecyclingAmount(tousseAmount); } } } catch (SQLException e) { e.printStackTrace(); }finally { DatabaseUtil.closeResultSetAndStatement(result2); } - // 清洗 - String sql21 = " select td.name,sum(ci.amount) from WashAndDisinfectRecord wdr,ClassifyBasket_WashRecord cw," + - " ClassifyBasket cb,ClassifiedItem ci,TousseDefinition td where wdr.id = cw.WashAndDisinfectRecord_ID " - +" and cw.ClassifyBasket_ID = cb.id and cb.id = ci.classifybasket_id and ci.toussedefinition_id = td.id " - +" and ci.itemType != '材料' and wdr.orgUnitCoding = '"+departCoding+"'" - +" and wdr.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS") - +" and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-mm-dd HH24:MI:SS") - +" group by td.name "; - - ResultSet result21 = objectDao.executeSql(sql21); - try { - while(result21.next()){ - String tousseName = result21.getString(1); - String rName = ""; - if(isUnderlineTousseMap.containsKey(tousseName)){ - Boolean isUnderlineTousse = isUnderlineTousseMap.get(tousseName); - if(isUnderlineTousse == true){ - // 去消毒物品名称中的括号 - String tname = CssdUtils.filterDisinfectGoodsNameBracket(tousseName); - // 下划线 - rName = getTousseSourceName(tname); - } - }else{ - rName = tousseName; - isUnderlineTousseMap.put(tousseName, false); - } - if(StringUtils.isBlank(rName)){ - rName = tousseName; - } - if(optionMap.size() == 0 || optionMap.get(rName) != null){ - int tousseAmount = result21.getInt(2); - TousseDeliverDetailVO vo = voMap.get(rName); - if(vo == null){ - vo = new TousseDeliverDetailVO(); - vo.setTousseName(rName); - vo.setWashAndDisinfectAmount(tousseAmount); - //vo.setWashAmount(tousseAmount); - voMap.put(rName, vo); - }else{ - vo.setTousseName(rName); - //int curAmount = vo.getWashAmount(); - //vo.setWashAmount(curAmount + tousseAmount);; - int curAmount = vo.getWashAndDisinfectAmount(); - vo.setWashAndDisinfectAmount(tousseAmount); - voMap.put(rName, vo); - } - } - } - } catch (SQLException e) { - e.printStackTrace(); - }finally { - DatabaseUtil.closeResultSetAndStatement(result2); - } + //装配 String sql3 = "select i.tousseName,count(*) 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 order by i.tousseName desc "; + + " group by i.tousseName "; - ResultSet result3 = objectDao.executeSql(sql3); + ResultSet result3 = null; try { + result3 = objectDao.executeSql(sql3); while(result3.next()){ String tousseName = result3.getString(1); - String rName = ""; - if(isUnderlineTousseMap.containsKey(tousseName)){ - Boolean isUnderlineTousse = isUnderlineTousseMap.get(tousseName); - if(isUnderlineTousse == true){ - // 去消毒物品名称中的括号 - String tname = CssdUtils.filterDisinfectGoodsNameBracket(tousseName); - // 下划线 - rName = getTousseSourceName(tname); - } - }else{ - rName = tousseName; - isUnderlineTousseMap.put(tousseName, false); - } - if(StringUtils.isBlank(rName)){ - rName = tousseName; - } - if(optionMap.size() == 0 || optionMap.get(rName) != null){ + if(optionMap.size() == 0 || optionMap.get(tousseName) != null){ int tousseAmount = result3.getInt(2); - TousseDeliverDetailVO vo = voMap.get(rName); + TousseDeliverDetailVO vo = voMap.get(tousseName); if(vo == null){ vo = new TousseDeliverDetailVO(); - vo.setTousseName(rName); - vo.setPackingAmount(tousseAmount); - voMap.put(rName, vo); - }else{ - vo.setTousseName(rName); - int curAmount = vo.getPackingAmount(); - vo.setPackingAmount(curAmount + tousseAmount); - voMap.put(rName, vo); + voMap.put(tousseName, vo); } + vo.setTousseName(tousseName); + vo.setPackingAmount(tousseAmount); } } } catch (SQLException e) { @@ -10260,42 +10158,22 @@ + " 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 order by i.tousseName desc "; + + " group by i.tousseName "; - ResultSet result4 = objectDao.executeSql(sql4); + ResultSet result4 = null; try { + result4 = objectDao.executeSql(sql4); while(result4.next()){ String tousseName = result4.getString(1); - String rName = ""; - if(isUnderlineTousseMap.containsKey(tousseName)){ - Boolean isUnderlineTousse = isUnderlineTousseMap.get(tousseName); - if(isUnderlineTousse == true){ - // 去消毒物品名称中的括号 - String tname = CssdUtils.filterDisinfectGoodsNameBracket(tousseName); - // 下划线 - rName = getTousseSourceName(tname); - } - }else{ - rName = tousseName; - isUnderlineTousseMap.put(tousseName, false); - } - if(StringUtils.isBlank(rName)){ - rName = tousseName; - } - if(optionMap.size() == 0 || optionMap.get(rName) != null){ + if(optionMap.size() == 0 || optionMap.get(tousseName) != null){ int tousseAmount = result4.getInt(2); - TousseDeliverDetailVO vo = voMap.get(rName); + TousseDeliverDetailVO vo = voMap.get(tousseName); if(vo == null){ vo = new TousseDeliverDetailVO(); - vo.setTousseName(rName); - vo.setReviewAmount(tousseAmount); - voMap.put(rName, vo); - }else{ - vo.setTousseName(rName); - int curAmount = vo.getReviewAmount(); - vo.setReviewAmount(curAmount + tousseAmount); - voMap.put(rName, vo); + voMap.put(tousseName, vo); } + vo.setTousseName(tousseName); + vo.setReviewAmount(tousseAmount); } } } catch (SQLException e) { @@ -10309,42 +10187,22 @@ + " 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 order by i.tousseName desc "; + + " group by i.tousseName "; - ResultSet result5 = objectDao.executeSql(sql5); + ResultSet result5 = null; try { + result5 = objectDao.executeSql(sql5); while(result5.next()){ String tousseName = result5.getString(1); - String rName = ""; - if(isUnderlineTousseMap.containsKey(tousseName)){ - Boolean isUnderlineTousse = isUnderlineTousseMap.get(tousseName); - if(isUnderlineTousse == true){ - // 去消毒物品名称中的括号 - String tname = CssdUtils.filterDisinfectGoodsNameBracket(tousseName); - // 下划线 - rName = getTousseSourceName(tname); - } - }else{ - rName = tousseName; - isUnderlineTousseMap.put(tousseName, false); - } - if(StringUtils.isBlank(rName)){ - rName = tousseName; - } - if(optionMap.size() == 0 || optionMap.get(rName) != null){ + if(optionMap.size() == 0 || optionMap.get(tousseName) != null){ int tousseAmount = result5.getInt(2); - TousseDeliverDetailVO vo = voMap.get(rName); + TousseDeliverDetailVO vo = voMap.get(tousseName); if(vo == null){ vo = new TousseDeliverDetailVO(); - vo.setTousseName(rName); - vo.setSterilizationAmount(tousseAmount); - voMap.put(rName, vo); - }else{ - vo.setTousseName(rName); - int curAmount = vo.getSterilizationAmount(); - vo.setSterilizationAmount(curAmount + tousseAmount); - voMap.put(rName, vo); + voMap.put(tousseName, vo); } + vo.setTousseName(tousseName); + vo.setSterilizationAmount(tousseAmount); } } } catch (SQLException e) { @@ -10353,103 +10211,31 @@ DatabaseUtil.closeResultSetAndStatement(result5); } - //退货 科室用器械包的处理科室 - String sql6 = " select ti.tousseName,count(*) from ReturnGoodsRecord rgr,ReturnGoodsItem rgi, TousseInstance ti" - + " where rgr.id = rgi.returnGoodsRecord_ID and ti.returnGoodsItem_ID=rgi.id " - + " and ti.orgUnitCoding = '" + departCoding - + "' and rgr.returnTime between "+dateQueryAdapter.dateConverAdapter2(startTime,"yyyy-mm-dd HH24:MI:SS") - + " and "+dateQueryAdapter.dateConverAdapter2(endTime,"yyyy-mm-dd HH24:MI:SS") - + " group by ti.tousseName order by ti.tousseName desc "; - ResultSet result6 = objectDao.executeSql(sql6); - try { - while(result6.next()){ - String tousseName = result6.getString(1); - String rName = ""; - if(isUnderlineTousseMap.containsKey(tousseName)){ - Boolean isUnderlineTousse = isUnderlineTousseMap.get(tousseName); - if(isUnderlineTousse == true){ - // 去消毒物品名称中的括号 - String tname = CssdUtils.filterDisinfectGoodsNameBracket(tousseName); - // 下划线 - rName = getTousseSourceName(tname); - } - }else{ - rName = tousseName; - isUnderlineTousseMap.put(tousseName, false); - } - if(StringUtils.isBlank(rName)){ - rName = tousseName; - } - if(optionMap.size() == 0 || optionMap.get(rName) != null){ - int tousseAmount = result6.getInt(2); - TousseDeliverDetailVO vo = voMap.get(rName); - if(vo == null){ - vo = new TousseDeliverDetailVO(); - vo.setTousseName(rName); - vo.setReturnGoodsAmount(tousseAmount); - voMap.put(rName, vo); - }else{ - vo.setTousseName(rName); - int curAmount = vo.getReturnGoodsAmount(); - vo.setReturnGoodsAmount(tousseAmount+ curAmount); - voMap.put(rName, vo); - } - } - } - } catch (SQLException e) { - e.printStackTrace(); - }finally { - DatabaseUtil.closeResultSetAndStatement(result6); - } - - //发货 String sql = " select ti.tousseName,count(*) from invoice i,TousseInstance ti" + " where i.id = ti.invoice_id 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") - + " group by ti.tousseName order by ti.tousseName desc "; + + " group by ti.tousseName "; - ResultSet result = objectDao.executeSql(sql); + ResultSet result = null; Map map = new HashMap(); try { + result = objectDao.executeSql(sql); while(result.next()){ String tousseName = result.getString(1); - String rName = ""; - if(isUnderlineTousseMap.containsKey(tousseName)){ - Boolean isUnderlineTousse = isUnderlineTousseMap.get(tousseName); - if(isUnderlineTousse == true){ - // 去消毒物品名称中的括号 - String tname = CssdUtils.filterDisinfectGoodsNameBracket(tousseName); - // 下划线 - rName = getTousseSourceName(tname); - } - }else{ - rName = tousseName; - isUnderlineTousseMap.put(tousseName, false); - } - if(StringUtils.isBlank(rName)){ - rName = tousseName; - } - if(optionMap.size() == 0 || optionMap.get(rName) != null){ + if(optionMap.size() == 0 || optionMap.get(tousseName) != null){ int tousseAmount = result.getInt(2); - TousseDeliverDetailVO vo = voMap.get(rName); + + TousseDeliverDetailVO vo = voMap.get(tousseName); if(vo == null){ vo = new TousseDeliverDetailVO(); - vo.setTousseName(rName); - vo.setSendOutAmount(tousseAmount); - Integer materialAmount = getMaterialAmountByTousse(tousseName,map); - vo.setMaterialAmount(materialAmount*tousseAmount); - voMap.put(rName, vo); - }else{ - vo.setTousseName(rName); - int curAmount = vo.getSendOutAmount(); - vo.setSendOutAmount(curAmount + tousseAmount); - int curMaterialAmount = vo.getMaterialAmount(); - Integer materialAmount = getMaterialAmountByTousse(tousseName,map); - vo.setMaterialAmount(tousseAmount*materialAmount + curMaterialAmount); - voMap.put(rName, vo); + voMap.put(tousseName, vo); } + vo.setTousseName(tousseName); + vo.setTousseAmount(tousseAmount); + Integer materialAmount = getMaterialAmountByTousse(tousseName,map); + vo.setMaterialAmount(materialAmount*tousseAmount); } } } catch (SQLException e) { @@ -10461,54 +10247,15 @@ int serialNum = 0; if(voMap.size() > 0){ for (String tousseName : voMap.keySet()) { + serialNum++; TousseDeliverDetailVO vo = voMap.get(tousseName); vo.setSerialNumber(serialNum); voList.add(voMap.get(tousseName)); } } - Collections.sort(voList, new Comparator() { - @Override - public int compare(TousseDeliverDetailVO o1, - TousseDeliverDetailVO o2) { - int result = ObjectUtils.compare(o1.getTousseName(), o2.getTousseName()); - return result; - } - }); - if(voList.size() > 0){ - for (TousseDeliverDetailVO vo : voList) { - serialNum++; - vo.setSerialNumber(serialNum); - } - } return voList; } /** - * 获取器械包去下划线后的名字 - * @param name - * @return - */ - private String getTousseSourceName(String tousseName){ - if(StringUtils.isBlank(tousseName)){ - return null; - } - String sName = ""; - // 去下划线处理 - String[] arr = tousseName.split("_"); - int length = arr.length; - if(length > 1){ - // 去下划线处理 - for(int i=0; i < length -1; i++){ - sName += arr[i]; - if(i != (length -2)){ - sName += "_"; - } - } - }else{ - sName = tousseName; - } - return sName; - } - /** * 获取灭菌炉使用次数报表在一个时间段内明细的数据 */ @Override Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml =================================================================== diff -u -r27889 -r27898 --- ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml (.../tousseDeliverDetailReport.jrxml) (revision 27889) +++ ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml (.../tousseDeliverDetailReport.jrxml) (revision 27898) @@ -1,5 +1,5 @@ - + @@ -55,12 +55,6 @@ - - - - - - @@ -79,16 +73,10 @@ - - - - - - <band height="30" splitType="Stretch"> <textField> - <reportElement uuid="5286744f-96b7-4890-aec7-99ef9eb1a7b3" x="0" y="0" width="999" height="30"/> + <reportElement uuid="5286744f-96b7-4890-aec7-99ef9eb1a7b3" x="0" y="0" width="799" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -113,68 +101,47 @@ <text><![CDATA[器械包名称]]></text> </staticText> <staticText> - <reportElement uuid="7e199088-76ed-4abd-b0d8-48ac92f129e2" style="table_TH" x="709" y="0" width="90" height="30"/> + <reportElement uuid="7e199088-76ed-4abd-b0d8-48ac92f129e2" style="table_TH" x="619" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[发货数量]]></text> </staticText> <staticText> - <reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="799" y="0" width="90" height="30"/> + <reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="709" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[发货器械数量]]></text> </staticText> <staticText> - <reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="439" y="0" width="90" height="30"/> + <reportElement uuid="e175ace2-26cc-4f31-8175-e858554a772d" style="table_TH" x="260" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> - <text><![CDATA[装配数量]]></text> + <text><![CDATA[回收数量]]></text> </staticText> <staticText> - <reportElement uuid="3b548f4b-bd46-4358-8eb1-dd4cee91f549" style="table_TH" x="529" y="0" width="90" height="30"/> + <reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="349" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> - <text><![CDATA[审核数量]]></text> + <text><![CDATA[装配数量]]></text> </staticText> <staticText> - <reportElement uuid="67af36bc-f6bc-40f9-9c1a-5acac42f9b45" style="table_TH" x="619" y="0" width="90" height="30"/> + <reportElement uuid="3b548f4b-bd46-4358-8eb1-dd4cee91f549" style="table_TH" x="439" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> - <text><![CDATA[灭菌数量]]></text> + <text><![CDATA[审核数量]]></text> </staticText> <staticText> - <reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="889" y="0" width="90" height="30"/> + <reportElement uuid="67af36bc-f6bc-40f9-9c1a-5acac42f9b45" style="table_TH" x="529" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> - <text><![CDATA[退货数量]]></text> + <text><![CDATA[灭菌数量]]></text> </staticText> - <staticText> - <reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="889" y="0" width="90" height="30"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12" isBold="true"/> - </textElement> - <text><![CDATA[退货数量]]></text> - </staticText> - <staticText> - <reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="260" y="0" width="89" height="30"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12" isBold="true"/> - </textElement> - <text><![CDATA[回收数量]]></text> - </staticText> - <staticText> - <reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="349" y="0" width="90" height="30"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12" isBold="true"/> - </textElement> - <text><![CDATA[清洗数量]]></text> - </staticText> </band> </columnHeader> <detail> @@ -194,14 +161,14 @@ <textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="da045ae7-2d36-46b1-a8b8-a58212e4a186" style="table_TD" x="709" y="0" width="90" height="30"/> + <reportElement uuid="da045ae7-2d36-46b1-a8b8-a58212e4a186" style="table_TD" x="619" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{tousseAmount}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="799" y="0" width="90" height="30"/> + <reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="709" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -215,44 +182,30 @@ <textFieldExpression><![CDATA[$F{recyclingAmount}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="cd906c58-422b-4aaa-ad26-201597026308" style="table_TD" x="529" y="0" width="90" height="30"/> + <reportElement uuid="cd906c58-422b-4aaa-ad26-201597026308" style="table_TD" x="439" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{reviewAmount}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="cf64ddaf-566e-411b-af7a-f3c51a845c1a" style="table_TD" x="619" y="0" width="90" height="30"/> + <reportElement uuid="cf64ddaf-566e-411b-af7a-f3c51a845c1a" style="table_TD" x="529" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{sterilizationAmount}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="0e898ad6-77eb-4dd8-943c-be899267c173" style="table_TD" x="439" y="0" width="90" height="30"/> + <reportElement uuid="0e898ad6-77eb-4dd8-943c-be899267c173" style="table_TD" x="349" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{packingAmount}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="889" y="0" width="90" height="30"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12"/> - </textElement> - <textFieldExpression><![CDATA[$F{returnGoodsAmount}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="0e898ad6-77eb-4dd8-943c-be899267c173" style="table_TD" x="349" y="0" width="90" height="30"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12"/> - </textElement> - <textFieldExpression><![CDATA[$F{washAndDisinfectAmount}]]></textFieldExpression> - </textField> </band> </detail> <summary> - <band height="37" splitType="Stretch"> + <band height="30" splitType="Stretch"> <staticText> <reportElement uuid="85766b43-0bf1-4f42-9c16-0b1026261597" style="table_CH" x="0" y="0" width="260" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> @@ -261,14 +214,14 @@ <text><![CDATA[合计]]></text> </staticText> <textField> - <reportElement uuid="ae3d31fc-9be6-49af-b773-3cc591934f1b" style="table_CH" x="709" y="0" width="90" height="30"/> + <reportElement uuid="ae3d31fc-9be6-49af-b773-3cc591934f1b" style="table_CH" x="619" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{tAmount}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="799" y="0" width="90" height="30"/> + <reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="709" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -282,40 +235,26 @@ <textFieldExpression><![CDATA[$V{rAmount}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="439" y="0" width="90" height="30"/> + <reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="349" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{pAmount}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="faac7f2d-65df-4ee1-8d25-4e6c572c4a66" style="table_CH" x="529" y="0" width="90" height="30"/> + <reportElement uuid="faac7f2d-65df-4ee1-8d25-4e6c572c4a66" style="table_CH" x="439" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{reAmount}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="602cd463-0838-48ae-878f-e5aafb8f80d2" style="table_CH" x="619" y="0" width="90" height="30"/> + <reportElement uuid="602cd463-0838-48ae-878f-e5aafb8f80d2" style="table_CH" x="529" y="0" width="90" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{sAmount}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="false"> - <reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="889" y="0" width="90" height="30"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$V{retAmount}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="349" y="0" width="90" height="30"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$V{washAndDisinfectAmount}]]></textFieldExpression> - </textField> </band> </summary> </jasperReport> Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseDeliverDetailVO.java =================================================================== diff -u -r27889 -r27898 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseDeliverDetailVO.java (.../TousseDeliverDetailVO.java) (revision 27889) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseDeliverDetailVO.java (.../TousseDeliverDetailVO.java) (revision 27898) @@ -49,10 +49,6 @@ * 签收数量 */ private Integer signAmount = 0; - /** - * 退货数量 - */ - private Integer returnGoodsAmount = 0; public Integer getSerialNumber() { return serialNumber; @@ -150,12 +146,4 @@ this.signAmount = signAmount; } - public Integer getReturnGoodsAmount() { - return returnGoodsAmount; - } - - public void setReturnGoodsAmount(Integer returnGoodsAmount) { - this.returnGoodsAmount = returnGoodsAmount; - } - } Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverDetailView.js =================================================================== diff -u -r27889 -r27898 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverDetailView.js (.../tousseDeliverDetailView.js) (revision 27889) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverDetailView.js (.../tousseDeliverDetailView.js) (revision 27898) @@ -11,6 +11,14 @@ } } } +var rd = new Ext.data.JsonReader( { + fields : [ + {name : 'id'}, + {name : 'departId'}, + {name : 'name'} + + ] +}); supplyRoomStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', @@ -25,7 +33,7 @@ }] }), listeners:{ - load :function (thiz,records,options){ + load :function (thiz,records,options ){ if(records.length >0){ Ext.getCmp('querySupplyRoom').setValue(records[0].data.departId); Ext.getCmp('querySupplyRoom').setRawValue(records[0].data.name); @@ -179,7 +187,7 @@ showResult("请选择供应室"); return false; } - setapparatusInfuType(model,code,true); + setapparatusInfuType(model,code); } }] }); Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jasper =================================================================== diff -u -r27889 -r27898 Binary files differ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r27890 -r27898 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 27890) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 27898) @@ -803,17 +803,6 @@ } return result; } - // 过滤消毒物品名字中的括号 - public static String filterDisinfectGoodsNameBracket(String name) { - String nName = name; - int index1 = name.indexOf('（'); - int index2 = name.indexOf('）'); - if (index1 == 0 && index2 > 0) { - int begin = index2 + 1; - nName = name.substring(begin, name.length()); - } - return nName; - } // 过滤消毒物品的名字 public static String filterDisinfectGoodsName(String name) { // int index1 = name.indexOf('（');