Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r34716 -r34729 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 34716) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 34729) @@ -8160,7 +8160,15 @@ } @Override public JSONArray getSteriConsumeMaterialUseDetailInfo( - SterilizationRecord sterilizationRecord, HttpOption httpOption) { + SterilizationRecord sterilizationRecord, Map map) { + HttpOption httpOption = null; + if(StringUtils.isNotBlank(sterilizationRecord.getSterilizationPurpose())){ + httpOption = (HttpOption)objectDao.getBySql(HttpOption.class.getSimpleName(), " where optionListId='"+ HttpOption.SYSTEMSETTING_STERILIZATIONPURPOSE +"' and optionText='" + + sterilizationRecord.getSterilizationPurpose() +"'"); + if(httpOption!=null){ + map.put("sterilizationPurposeId", httpOption.getId()); + } + } boolean enableSterilizerConsumptiveMaterialConsumptionFunction = CssdUtils.getSystemSetConfigByNameBool("enableSterilizerConsumptiveMaterialConsumptionFunction", false); if(!enableSterilizerConsumptiveMaterialConsumptionFunction){ return null; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r34671 -r34729 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 34671) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 34729) @@ -686,8 +686,8 @@ /** * 获取灭菌记录的耗材记录 * @param sterilizationRecord - * @param HttpOption 灭菌目的 + * @param map 存放返回数据的map * @return */ - public JSONArray getSteriConsumeMaterialUseDetailInfo(SterilizationRecord sterilizationRecord, HttpOption httpOption); + public JSONArray getSteriConsumeMaterialUseDetailInfo(SterilizationRecord sterilizationRecord, Map map); } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r34689 -r34729 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 34689) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 34729) @@ -690,16 +690,7 @@ sterilizationRecord.setIncludeImplant(objectDao); Map map = new HashMap(); map.put("success", true); - - HttpOption httpOption = null; - if(StringUtils.isNotBlank(sterilizationRecord.getSterilizationPurpose())){ - httpOption = (HttpOption)objectDao.getBySql(HttpOption.class.getSimpleName(), " where optionListId='sterilizationPurpose' and optionText='" - + sterilizationRecord.getSterilizationPurpose() +"'"); - if(httpOption!=null){ - map.put("sterilizationPurposeId", httpOption.getId()); - } - } - map.put("steriConsumeMaterialUseRecordArr", sterilizationRecordManager.getSteriConsumeMaterialUseDetailInfo(sterilizationRecord,httpOption)); + map.put("steriConsumeMaterialUseRecordArr", sterilizationRecordManager.getSteriConsumeMaterialUseDetailInfo(sterilizationRecord,map)); map.put("data", sterilizationRecord); map.put("interruptRecords", interruptRecords);