Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r29384 -r29413 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29384) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29413) @@ -349,7 +349,7 @@ record.setProxyTousseAmount(record .getProxyTousseAmount() - 1); }else if(td.isDisinfection()){ - record.setDisinfectantAmount(record.getDisinfectantAmount() - 1); + record.setDisinfectionAmount(record.getDisinfectionAmount() - 1); } record.setAmount(record.getAmount() - 1); objectDao.saveOrUpdate(record); @@ -2049,7 +2049,7 @@ int foreignTousseAmount = 0; // 外来器械包(包括但不限于"外来器械包"、"外来器械拆分小包"、"外来器械包当普通器械包") int dressingTousseAmount = 0; //敷料包 int proxyTousseAmount = 0; //代理灭菌包(包括但不限于"代理灭菌单申请的包"、"外部代理灭菌包") - int disinfectantAmount = 0;//消毒物品数量 + int disinfectionAmount = 0;//消毒物品数量 int amount = 0; //所有器械包的总数 // 获取所有器械包，包括直接隶属的器械包和在篮筐里的器械包 @@ -2095,15 +2095,15 @@ } else if (td.isForeignProxyTousse()) { proxyTousseAmount++; } else if(td.isDisinfection()){ - disinfectantAmount++; + disinfectionAmount++; } } sterilizationRecord.setTousseAmount(tousseAmount); sterilizationRecord.setForeignTousseAmount(foreignTousseAmount); sterilizationRecord.setDressingTousseAmount(dressingTousseAmount); sterilizationRecord.setProxyTousseAmount(proxyTousseAmount); - sterilizationRecord.setDisinfectantAmount(disinfectantAmount); + sterilizationRecord.setDisinfectionAmount(disinfectionAmount); sterilizationRecord.setAmount(amount); saveOrUpdate(sterilizationRecord); } Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.54_4.9.55.sql =================================================================== diff -u -r29384 -r29413 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.54_4.9.55.sql (.../4.9.54_4.9.55.sql) (revision 29384) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.54_4.9.55.sql (.../4.9.54_4.9.55.sql) (revision 29413) @@ -1 +1 @@ -update SterilizationRecord set disinfectantAmount=(select count(ti.id) from TousseInstance ti join TousseDefinition td on td.id=ti.tousseDefinition_id where td.tousseType='消毒物品' and ti.sterilizationRecord_id=SterilizationRecord.id) where id in (select ti.sterilizationRecord_id from TousseInstance ti join TousseDefinition td on td.id=ti.tousseDefinition_id where td.tousseType='消毒物品' and ti.sterilizationRecord_id=SterilizationRecord.id); \ No newline at end of file +update SterilizationRecord set disinfectionAmount=(select count(ti.id) from TousseInstance ti join TousseDefinition td on td.id=ti.tousseDefinition_id where td.tousseType='消毒物品' and ti.sterilizationRecord_id=SterilizationRecord.id) where id in (select ti.sterilizationRecord_id from TousseInstance ti join TousseDefinition td on td.id=ti.tousseDefinition_id where td.tousseType='消毒物品' and ti.sterilizationRecord_id=SterilizationRecord.id); \ No newline at end of file Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r29403 -r29413 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29403) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29413) @@ -1865,7 +1865,7 @@ sourceSortMap.put(TousseDefinition.PACKAGE_TYPE_DISINFECTION, 5); sourceSortMap.put("灭菌炉数", 6); sourceSortMap.put("灭菌总数", 7); - boolean hasDisinfectant = false; + boolean hasDisinfection = false; if (StringUtils.isNotBlank(month)) { List dateOfMonth = DisinfectionFractionDefectiveBean .getDateOfMonth(month); @@ -1890,7 +1890,7 @@ Integer foreignTousseAmount = 0;// 外来包总数 Integer dressingTousseAmount = 0;// 敷料包总数 Integer proxyTousseAmount = 0;// 代理灭菌包 - Integer disinfectantAmount = 0;//消毒物品数量 + Integer disinfectionAmount = 0;//消毒物品数量 Integer amount = 0;// 总数 int sterilizationAmount = 0; for (SterilizationRecord sterilizationRecord : list1) { @@ -1903,8 +1903,8 @@ .getDressingTousseAmount(); proxyTousseAmount += sterilizationRecord .getProxyTousseAmount(); - if(sterilizationRecord.getDisinfectantAmount() != null){ - disinfectantAmount += sterilizationRecord.getDisinfectantAmount(); + if(sterilizationRecord.getDisinfectionAmount() != null){ + disinfectionAmount += sterilizationRecord.getDisinfectionAmount(); } amount += sterilizationRecord.getAmount(); } @@ -1916,9 +1916,9 @@ sourceMap.put("外来器械包", foreignTousseAmount); sourceMap.put("敷料包", dressingTousseAmount); sourceMap.put("代理灭菌包", proxyTousseAmount); - sourceMap.put(TousseDefinition.PACKAGE_TYPE_DISINFECTION, disinfectantAmount); - if(!hasDisinfectant && disinfectantAmount > 0){ - hasDisinfectant = true; + sourceMap.put(TousseDefinition.PACKAGE_TYPE_DISINFECTION, disinfectionAmount); + if(!hasDisinfection && disinfectionAmount > 0){ + hasDisinfection = true; } sourceMap.put("灭菌总数", amount); sourceMap.put("灭菌炉数", sterilizationAmount); @@ -1979,7 +1979,7 @@ } } catch (Exception e) { } - if(!hasDisinfectant){//没有消毒物品,不显示消毒物品列 + if(!hasDisinfection){//没有消毒物品,不显示消毒物品列 Iterator it = returnList.iterator(); while(it.hasNext()){ if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(it.next().getTitle())){ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r29384 -r29413 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 29384) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 29413) @@ -263,7 +263,7 @@ /** * 消毒物品数量 */ - private Integer disinfectantAmount; + private Integer disinfectionAmount; /** * 总数 */ @@ -964,12 +964,12 @@ this.sterilizeUnloadStatus = sterilizeUnloadStatus; } - public Integer getDisinfectantAmount() { - return disinfectantAmount; + public Integer getDisinfectionAmount() { + return disinfectionAmount; } - public void setDisinfectantAmount(Integer disinfectantAmount) { - this.disinfectantAmount = disinfectantAmount; + public void setDisinfectionAmount(Integer disinfectionAmount) { + this.disinfectionAmount = disinfectionAmount; } }