Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33383 -r33392 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33383) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33392) @@ -15914,8 +15914,8 @@ continue; } MonitoringItemBean bean1 = new MonitoringItemBean(); - bean1.setGoodsName("汇总"); - bean1.setDateTime("汇总"); + bean1.setGoodsName("合计"); + bean1.setDateTime("合计"); bean1.setOrderNumber(_orderNumber); bean1.setOption(_option); bean1.setQuestionName(_questionName); @@ -15926,42 +15926,13 @@ } } } - if(beanStatisticsMap2 != null){ - for (Map.Entry entry : beanStatisticsMap2.entrySet()){ - String key = entry.getKey(); - String[] arr = key.split("_"); - if(arr.length >=3){ - int _orderNumber = Integer.valueOf(arr[0]); - String _option = arr[1]; - String _questionName = arr[2]; - int anwserInt = entry.getValue(); - if(anwserInt == 0){ - continue; - } - MonitoringItemBean bean2 = new MonitoringItemBean(); - bean2.setGoodsName("材料数量汇总"); - bean2.setDateTime("材料数量汇总"); - bean2.setOrderNumber(_orderNumber); - bean2.setOption(_option); - bean2.setQuestionName(_questionName); - bean2.setAmount(totalAmount); - if(key.equals("1_-_-")){ - bean2.setAnswer(""); - }else{ - bean2.setAnswer(anwserInt+""); - } - bean2.setPositionMsg(""); - list.add(bean2); - } - } - } } Integer tousseAmoutSum = amoutSumJson.optInt("tousseAmoutSum"); Integer forgonAmoutSum = amoutSumJson.optInt("forgonAmoutSum"); if(tousseAmoutSum != null && tousseAmoutSum > 0){ MonitoringItemBean bean1 = new MonitoringItemBean(); - bean1.setGoodsName("汇总"); - bean1.setDateTime("汇总"); + bean1.setGoodsName("合计"); + bean1.setDateTime("合计"); bean1.setOrderNumber(15); bean1.setOption("当天清洗件数"); bean1.setQuestionName("清洗情况"); @@ -15972,8 +15943,8 @@ } if(forgonAmoutSum != null && forgonAmoutSum > 0){ MonitoringItemBean bean2 = new MonitoringItemBean(); - bean2.setGoodsName("汇总"); - bean2.setDateTime("汇总"); + bean2.setGoodsName("合计"); + bean2.setDateTime("合计"); bean2.setOrderNumber(15); bean2.setOption("当天清洗外来器械件数"); bean2.setQuestionName("清洗情况"); @@ -16013,8 +15984,8 @@ continue; } MonitoringItemBean bean1 = new MonitoringItemBean(); - bean1.setGoodsName("汇总"); - bean1.setDateTime("汇总"); + bean1.setGoodsName("合计"); + bean1.setDateTime("合计"); bean1.setOrderNumber(_orderNumber); bean1.setOption(_option); bean1.setQuestionName(_questionName); @@ -23495,7 +23466,7 @@ }else{ thisMonitoringItemBeans = new ArrayList(); thisFrequencyMap.put(frequencyKey, thisMonitoringItemBeans); - if(!dateTime.contains("汇总") && dateTime.startsWith("20")){ + if(!dateTime.contains("合计") && dateTime.startsWith("20")){ totalRows++; if(!dateToFrequencyAmount.containsKey(dateTime)){ dateToFrequencyAmount.put(dateTime, 1); @@ -23560,7 +23531,7 @@ }else{ thisMonitoringItemBeans = new ArrayList(); thisMaterialMap.put(materialName, thisMonitoringItemBeans); - if(!dateTime.contains("汇总") && dateTime.startsWith("20")){ + if(!dateTime.contains("合计") && dateTime.startsWith("20")){ totalRows++; if(!dateToMaterialNameAmount.containsKey(dateTime)){ dateToMaterialNameAmount.put(dateTime, 1); @@ -23576,9 +23547,9 @@ obj.put("dateRowsAmountMap", JSONObject.fromObject(dateToMaterialNameAmount)); obj.put("totalRows", totalRows); if(isShowTousseMaerialSumAmount){ - obj.put("fixedColumnNames", new String[]{"日期","器械包名称","器械包材料总件数","材料名称","数量","位置","登记人"}); + obj.put("fixedColumnNames", new String[]{"日期","器械包名称","器械包材料总件数","材料名称","包数","件数","位置","登记人"}); }else{ - obj.put("fixedColumnNames", new String[]{"日期","器械包名称","材料名称","数量","位置","登记人"}); + obj.put("fixedColumnNames", new String[]{"日期","器械包名称","材料名称","包数","件数","位置","登记人"}); } }else{ Map>> dataTimeMap = new HashMap>>(); @@ -23601,7 +23572,7 @@ }else{ thisMonitoringItemBeans = new ArrayList(); thisTousseMap.put(goodsName, thisMonitoringItemBeans); - if(!dateTime.contains("汇总") && dateTime.startsWith("20")){ + if(!dateTime.contains("合计") && dateTime.startsWith("20")){ totalRows++; } } @@ -23619,14 +23590,20 @@ }else if("质量监测".equals(monitoringType)){ if(hiddenNameAndAmount){ obj.put("fixedColumnNames", new String[]{"日期","位置","登记人"}); - }else{ - obj.put("fixedColumnNames", new String[]{"日期","物品名称","数量","位置","登记人"}); + }else if("材料".equals(scope)){ + obj.put("fixedColumnNames", new String[]{"日期","物品名称","件数","位置","登记人"}); + }else if("器械包".equals(scope)){ + obj.put("fixedColumnNames", new String[]{"日期","物品名称","包数","位置","登记人"}); } }else if("定期监测".equals(monitoringType)){ if(hiddenNameAndAmount){ obj.put("fixedColumnNames", new String[]{"日期","登记人"}); - }else{ - obj.put("fixedColumnNames", new String[]{"日期","物品名称","数量","登记人"}); + }else if("材料".equals(scope)){ + obj.put("fixedColumnNames", new String[]{"日期","物品名称","件数","登记人"}); + }else if("器械包".equals(scope)){ + obj.put("fixedColumnNames", new String[]{"日期","物品名称","包数","登记人"}); + }else if("材料和器械包".equals(scope)){ + obj.put("fixedColumnNames", new String[]{"日期","物品名称","包数","件数","登记人"}); } } } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ExtendedFieldsUseRecordEntryDetailReportVo.java =================================================================== diff -u --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ExtendedFieldsUseRecordEntryDetailReportVo.java (revision 0) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ExtendedFieldsUseRecordEntryDetailReportVo.java (revision 33392) @@ -0,0 +1,111 @@ +package com.forgon.disinfectsystem.jasperreports.javabeansource; +/** + * 2022-03-02 + * @author zc.li + * 使用记录录入明细扩展报表报表Vo + * 配置项 enableExtendedFieldsUseRecordEntryDetailReports + * 问题编号 ZJYY-78 + */ +public class ExtendedFieldsUseRecordEntryDetailReportVo { + /** + * 科室 + */ + private String depart; + /** + * 录入人 + */ + private String operator; + /** + * 录入时间 + */ + private String enterTimeStr; + /** + * 病人 + */ + private String patient; + /** + * 住院号 + */ + private String hospotalNum; + /** + * 医生名称 + */ + private String doctorName; + /** + * 手术名称 + */ + private String operation; + /** + * 包条码 + */ + private String barcode; + /** + * 标识牌 + */ + private String idCardInstanceBarcode; + /** + * 使用次数 + */ + private Integer useAmount; + public String getDepart() { + return depart; + } + public void setDepart(String depart) { + this.depart = depart; + } + public String getOperator() { + return operator; + } + public void setOperator(String operator) { + this.operator = operator; + } + public String getEnterTimeStr() { + return enterTimeStr; + } + public void setEnterTimeStr(String enterTimeStr) { + this.enterTimeStr = enterTimeStr; + } + public String getPatient() { + return patient; + } + public void setPatient(String patient) { + this.patient = patient; + } + public String getHospotalNum() { + return hospotalNum; + } + public void setHospotalNum(String hospotalNum) { + this.hospotalNum = hospotalNum; + } + public String getDoctorName() { + return doctorName; + } + public void setDoctorName(String doctorName) { + this.doctorName = doctorName; + } + public String getOperation() { + return operation; + } + public void setOperation(String operation) { + this.operation = operation; + } + public String getBarcode() { + return barcode; + } + public void setBarcode(String barcode) { + this.barcode = barcode; + } + public String getIdCardInstanceBarcode() { + return idCardInstanceBarcode; + } + public void setIdCardInstanceBarcode(String idCardInstanceBarcode) { + this.idCardInstanceBarcode = idCardInstanceBarcode; + } + public Integer getUseAmount() { + return useAmount; + } + public void setUseAmount(Integer useAmount) { + this.useAmount = useAmount; + } + +}