Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java =================================================================== diff -u -r27727 -r27860 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java (.../QualityMonitoringInstanceAction.java) (revision 27727) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java (.../QualityMonitoringInstanceAction.java) (revision 27860) @@ -161,7 +161,7 @@ String tousseAmount = tousseBag.optString("tousseAmount"); String tousseRecycle = tousseBag.optString("tousseRecycle"); String tousseRePacking = tousseBag.optString("tousseRePacking"); - if(StringUtils.isNotBlank(tousseInstanceId) && StringUtils.isNotBlank(tousseName) && StringUtils.isNotBlank(tousseAmount) + if(StringUtils.isNotBlank(tousseName) && StringUtils.isNotBlank(tousseAmount) && StringUtils.isNotBlank(tousseRecycle) && StringUtils.isNotBlank(tousseRePacking)){ tousseInstanceInfo = tousseInstanceInfo + tousseBarcode + "@" + tousseInstanceId + "@" + tousseName + "@" + tousseAmount + "@" + tousseRecycle + "@" + tousseRePacking + "@" + orderNumber++ + ";"; Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r27715 -r27860 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 27715) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 27860) @@ -823,6 +823,7 @@ * @param ti * @return */ + @SuppressWarnings("unchecked") @Override public JSONObject buildTousseJSON(TousseInstance ti){ if(ti == null){ @@ -856,6 +857,17 @@ 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();