Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r32578 -r32995 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 32578) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 32995) @@ -1076,25 +1076,7 @@ //灭菌记录 JSONObject sterilizationRecordJSON = new JSONObject(); - SterilizationRecord sr = null; - if(ti.getSterilizationRecord_id() != null){ - // 根据灭菌记录id关联查询灭菌信息 - sr = ti.getSterilizationRecord(objectDao); - } else if(ti.getReviewBasket_id() != null){ - // 根据灭菌篮筐id关联查找灭菌记录 - 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)){ - sr = list.get(0); - } - } else { - // 根据sterilization_tousseInstance中间表查灭菌记录 - String hql = String.format("select sr from SterilizationRecord sr join sr.tousseInstanceList ti where ti.id = %d", ti.getId()); - List list = objectDao.findByHql(hql); - if(CollectionUtils.isNotEmpty(list)){ - sr = list.get(0); - } - } + SterilizationRecord sr = tousseInstanceManager.getTousseInstanceSterilizationRecord(ti.getId()); if(sr != null){ sterilizationRecordJSON.put("sterilizerName", sr.getSterilizerName() == null ? "" : sr.getSterilizerName()); //灭菌记录_灭菌炉 sterilizationRecordJSON.put("sterilizationType", sr.getSterilizationType() == null ? "" : sr.getSterilizationType()); //灭菌记录_灭菌程序 Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r32994 -r32995 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 32994) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 32995) @@ -9499,25 +9499,9 @@ * @param tousseInstance * @return */ - @SuppressWarnings("unchecked") private String getTousseInstanceSterilingType(TousseInstance tousseInstance) { if(tousseInstance.isSteriling()){ - SterilizationRecord sr = null; - if(tousseInstance.getReviewBasket_id() != null){ - // 根据灭菌篮筐id关联查找灭菌记录 - String hql = String.format("select sr from SterilizationRecord sr join sr.reviewedBaskets rb where rb.id = %d", tousseInstance.getReviewBasket_id()); - List list = objectDao.findByHql(hql); - if(CollectionUtils.isNotEmpty(list)){ - sr = list.get(0); - } - } else { - // 根据sterilization_tousseInstance中间表查灭菌记录 - String hql = String.format("select sr from SterilizationRecord sr join sr.tousseInstanceList ti where ti.id = %d", tousseInstance.getId()); - List list = objectDao.findByHql(hql); - if(CollectionUtils.isNotEmpty(list)){ - sr = list.get(0); - } - } + SterilizationRecord sr = this.getTousseInstanceSterilizationRecord(tousseInstance.getId()); if(sr == null){ return tousseInstance.getSterilingType(); } @@ -9571,4 +9555,33 @@ } return null; } + + @SuppressWarnings("unchecked") + @Override + public SterilizationRecord getTousseInstanceSterilizationRecord(Long tousseInstanceId) { + TousseInstance tousseInstance = this.get(tousseInstanceId); + if(tousseInstance == null){ + return null; + } + SterilizationRecord sr = null; + if(tousseInstance.getSterilizationRecord_id() != null){ + // 根据灭菌记录id关联查询灭菌信息 + sr = tousseInstance.getSterilizationRecord(objectDao); + }else if(tousseInstance.getReviewBasket_id() != null){ + // 根据灭菌篮筐id关联查找灭菌记录 + String hql = String.format("select sr from SterilizationRecord sr join sr.reviewedBaskets rb where rb.id = %d", tousseInstance.getReviewBasket_id()); + List list = objectDao.findByHql(hql); + if(CollectionUtils.isNotEmpty(list)){ + sr = list.get(0); + } + } else { + // 根据sterilization_tousseInstance中间表查灭菌记录 + String hql = String.format("select sr from SterilizationRecord sr join sr.tousseInstanceList ti where ti.id = %d", tousseInstance.getId()); + List list = objectDao.findByHql(hql); + if(CollectionUtils.isNotEmpty(list)){ + sr = list.get(0); + } + } + return sr; + } } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java =================================================================== diff -u -r32956 -r32995 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 32956) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 32995) @@ -1190,5 +1190,12 @@ * @return */ public int displayEstimatedSterilizationCompletionTime(Long tousseInstanceId); + + /** + * 获取器械包实例关联的灭菌记录 + * @param tousseInstanceId + * @return + */ + public SterilizationRecord getTousseInstanceSterilizationRecord(Long tousseInstanceId); }