Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r30204 -r30303 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 30204) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 30303) @@ -40,6 +40,7 @@ import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition; import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstanceItem; import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstanceOptionValue; +import com.forgon.disinfectsystem.entity.idcarddefinition.IDCardDefinition; import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringGoods; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; @@ -977,7 +978,7 @@ if(CollectionUtils.isEmpty(classifyBasketList)){ throw new SystemException("该标识牌未录过清洗记录!"); } - + IDCardDefinition IDCardDefinition = idCardInstance.getIDCardDefinition(objectDao); for (ClassifyBasket classifyBasketObj : classifyBasketList) { List washAndDisinfectRecords = classifyBasketObj.getWashAndDisinfectRecords(); if(CollectionUtils.isNotEmpty(washAndDisinfectRecords)){ @@ -1009,6 +1010,7 @@ obj.put("endDate", washAndDisinfectRecord.getEndDateStr()); // 清洗结束时间 obj.put("tousseName", idCardInstance.getTousseName()); obj.put("lastTousseInstanceId", idCardInstance.getLastTousseInstanceId()); + obj.put("tousseDefinitionId", IDCardDefinition.getTousseDefinitionID()); washAndDisinfectRecordArr.add(obj); } }