Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r34671 -r34689 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 34671) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 34689) @@ -2439,15 +2439,15 @@ if(CollectionUtils.isNotEmpty(deleteDetailIds)){ objectDao.excuteSQL("update " + SteriConsumeMaterialUseDetail.class.getSimpleName() + " set isDisable='是' where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", deleteDetailIds)); } - HttpOption httpOption = null; + /*HttpOption httpOption = null; Long sterilizationPurposeId = paramObj.optLong("sterilizationPurposeId"); if(DatabaseUtil.isPoIdValid(sterilizationPurposeId)){ httpOption = (HttpOption)objectDao.getById(HttpOption.class.getSimpleName(), sterilizationPurposeId); } boolean consumptionMaterialRequired = consumptionMaterialRequired(sterilizationRecord.getSterilizationPurpose(), httpOption);//灭菌目的是否需要消耗耗材 if(!consumptionMaterialRequired){ return; - } + }*/ JSONArray steriConsumeMaterialArr = paramObj.optJSONArray("steriConsumeMaterialArr"); if(CollectionUtils.isEmpty(steriConsumeMaterialArr)){ return; @@ -8195,8 +8195,8 @@ return null; } JSONArray steriConsumeMaterialUseRecordArr = new JSONArray(); - boolean consumptionMaterialRequired = consumptionMaterialRequired(sterilizationRecord.getSterilizationPurpose(), httpOption);//灭菌目的是否需要消耗耗材 - if(consumptionMaterialRequired){ + //boolean consumptionMaterialRequired = consumptionMaterialRequired(sterilizationRecord.getSterilizationPurpose(), httpOption);//灭菌目的是否需要消耗耗材 + if(true){ String sql = "select bd.barcode,a.id,a.disposableGoodsId,a.disposableGoodsBatchId,a.useAmount,c.name,c.specification " + "from SteriConsumeMaterialUseDetail a " + "join SteriConsumeMaterialUseRecord b on b.id=a.useRecord_id " Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r34671 -r34689 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 34671) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 34689) @@ -690,14 +690,16 @@ sterilizationRecord.setIncludeImplant(objectDao); Map map = new HashMap(); map.put("success", true); + + HttpOption httpOption = null; if(StringUtils.isNotBlank(sterilizationRecord.getSterilizationPurpose())){ - HttpOption httpOption = (HttpOption)objectDao.getBySql(HttpOption.class.getSimpleName(), " where optionListId='sterilizationPurpose' and optionText='" + 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,httpOption)); map.put("data", sterilizationRecord); map.put("interruptRecords", interruptRecords);