Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java =================================================================== diff -u -r28672 -r28812 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java (.../QualityMonitoringInstanceAction.java) (revision 28672) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java (.../QualityMonitoringInstanceAction.java) (revision 28812) @@ -422,9 +422,12 @@ JSONObject jsonObject = JSONObject.fromObject(map, config); // 是否录入回收记录、清洗记录、灭菌记录 QualityMonitoringDefinition qualityMonitoringDefinition = (QualityMonitoringDefinition)qualityMonitoringInstance.getFormDefinition(); - jsonObject.optJSONObject("data").put("recordRecycleInformation", qualityMonitoringDefinition.getRecordRecycleInformation()); - jsonObject.optJSONObject("data").put("recordRinseInformation", qualityMonitoringDefinition.getRecordRinseInformation()); - jsonObject.optJSONObject("data").put("recordSterilizatioInformation", qualityMonitoringDefinition.getRecordSterilizatioInformation()); + // 监测项为“无”的质量监测记录,没有对应的质量监测定义 + if(qualityMonitoringDefinition != null){ + jsonObject.optJSONObject("data").put("recordRecycleInformation", qualityMonitoringDefinition.getRecordRecycleInformation()); + jsonObject.optJSONObject("data").put("recordRinseInformation", qualityMonitoringDefinition.getRecordRinseInformation()); + jsonObject.optJSONObject("data").put("recordSterilizatioInformation", qualityMonitoringDefinition.getRecordSterilizatioInformation()); + } // 关联的回收记录和灭菌记录 JSONObject tiJSON = qualityMonitoringInstanceManager.buildTousseJSON(qualityMonitoringInstance.getScanTousseInstance()); jsonObject.optJSONObject("data").put("scanTousseInstance", tiJSON);