Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r27860 -r28258 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 27860) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 28258) @@ -851,23 +851,11 @@ //灭菌记录 JSONObject sterilizationRecordJSON = new JSONObject(); - if(ti.getSterilizationRecord_id() != null){ + if(TousseInstance.STATUS_STERILING.equals(ti.getStatus()) || TousseInstance.STATUS_STERILED.equals(ti.getStatus())){ sterilizationRecordJSON.put("sterilizerName", ti.getSterilizerName() == null ? "" : ti.getSterilizerName()); //灭菌记录_灭菌炉 sterilizationRecordJSON.put("sterilizationType", ti.getSterilingType() == null ? "" : ti.getSterilingType()); //灭菌记录_灭菌程序 sterilizationRecordJSON.put("frequency", ti.getSterileFrequency() == null ? "" : ti.getSterileFrequency());//灭菌记录_炉次 sterilizationRecordJSON.put("startDate", ti.getSterileStartTime() == null ? "" : ti.getSterileStartTime()); //灭菌记录_开始时间 - sterilizationRecordJSON.put("endDate", ti.getSterileEndTime() == null ? "" : ti.getSterileEndTime()); //灭菌记录_结束时间 - } else if(ti.getReviewBasket_id() != null){ - String hql = String.format("select sr from SterilizationRecord sr join sr.reviewedBaskets rb where rb.id = %d", ti.getReviewBasket_id()); - List list = objectDao.findByHql(hql); - if(CollectionUtils.isNotEmpty(list)){ - SterilizationRecord sr = list.get(0); - sterilizationRecordJSON.put("sterilizerName", sr.getSterilizerName() == null ? "" : sr.getSterilizerName()); //灭菌记录_灭菌炉 - sterilizationRecordJSON.put("sterilizationType", sr.getSterilizationType() == null ? "" : sr.getSterilizationType()); //灭菌记录_灭菌程序 - sterilizationRecordJSON.put("frequency", sr.getFrequency() == null ? "" : sr.getFrequency());//灭菌记录_炉次 - sterilizationRecordJSON.put("startDate", sr.getStartDateStr() == null ? "" : sr.getStartDateStr()); //灭菌记录_开始时间 - sterilizationRecordJSON.put("endDate", sr.getEndDateStr() == null ? "" : sr.getEndDateStr()); //灭菌记录_结束时间 - } } JSONObject result = new JSONObject();