Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r41275 -r41301 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41275) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41301) @@ -10641,4 +10641,33 @@ return true; } } + @Override + public SterilizationRecord getSterilizationRecordByFrequency( + String startDate, String endDate, Long sterilizerId, Integer frequency) { + List sterilizationRecords = objectDao.findByHql( + getSterilizationRecordByFrequencySql(startDate, endDate, sterilizerId, frequency), 0, 1); + + return CollectionUtils.isNotEmpty(sterilizationRecords)?sterilizationRecords.get(0):null; + } + /** + * 根据灭菌炉和炉次获取灭菌记录的查询语句 + * @param queryDate 年月日 + * @param sterilizerId + * @param frequency + * @return + */ + private String getSterilizationRecordByFrequencySql(String startDate, String endDate , Long sterilizerId, Integer frequency){ + String sql = "select po from " + + SterilizationRecord.class.getSimpleName() + " po where po.sterilizer.id=" + + sterilizerId + + " and endDate between " + + dateQueryAdapter + .dateAdapter(startDate) + + " and " + + dateQueryAdapter.dateAdapter(endDate) + + " and frequency=" + + frequency + + " order by id desc"; + return sql; + } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r41239 -r41301 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 41239) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 41301) @@ -821,4 +821,14 @@ * @return */ public boolean checkXinhuaCleanH10151(Sterilizer sterilizer, SterilizationRecord sterilizationRecord); + /** + * 根据灭菌炉和炉次获取灭菌记录 + * 开始和结束时间 注意可能要用系统设置的每天开始时间 + * @param startDate 开始时间 + * @param endDate 结束时间 + * @param sterilizerId + * @param frequency + * @return + */ + public SterilizationRecord getSterilizationRecordByFrequency(String startDate, String endDate, Long sterilizerId, Integer frequency); }