Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SterilizerRecord.java =================================================================== diff -u -r25616 -r35451 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SterilizerRecord.java (.../SterilizerRecord.java) (revision 25616) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SterilizerRecord.java (.../SterilizerRecord.java) (revision 35451) @@ -300,5 +300,29 @@ + sterilizationRecord + ", 设备ID=" + deviceInterfaceID + "]"; } - + public SterilizerRecord(){} + + public SterilizerRecord(String t1Temp, String p1Mbar, String time, String phase, Long cycleCounter){ + this.t1Temp = t1Temp; + this.p1Mbar = p1Mbar; + this.time = time; + this.phase = phase; + this.cycleCounter = cycleCounter; + } + public SterilizerRecord(String t1Temp, String p1Mbar, String time, Date procStartTime){ + this.t1Temp = t1Temp; + this.p1Mbar = p1Mbar; + this.time = time; + this.procStartTime = procStartTime; + } + /** + * 获取构造方法的sql 统一调用此处 便于管理 + * @return + */ + public static String buildConstructionMethodSql(String queryFields){ + return " new "+ SterilizerRecord.class.getSimpleName() + +"("+ queryFields +") "; + } + + } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r35449 -r35451 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35449) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35451) @@ -1377,9 +1377,9 @@ return (SterilizationRecord) objectDao.getByProperty( SterilizationRecord.class.getSimpleName(), "id", Long.valueOf(id)); } - @Override - public List getSterilizaerRecordsById(Long id){ + public List getSterilizaerRecordsById(Long id, + String queryFields) { SterilizationRecord sr = getSterilizationRecordById(id); if(sr != null){ Session session = objectDao.getHibernateSession(); @@ -1412,7 +1412,9 @@ if(df != null){ deviceInterfaceSql = " and deviceInterfaceID=" + df.getId(); } - String queryString = "select s from SterilizerRecord s" + String selectColumnsSql = StringUtils.isBlank(queryFields)?" s ":queryFields; + + String queryString = "select "+ selectColumnsSql +" from SterilizerRecord s" + " where s.machineNo ='" + sr.getSterilizer().getMachineNumber() + "' " @@ -1429,6 +1431,10 @@ return null; } @Override + public List getSterilizaerRecordsById(Long id){ + return getSterilizaerRecordsById(id, null); + } + @Override public LowTempSterilizerRecord getLowTempSterilizerRecord(String machineNo, Date startDate) { LowTempSterilizerRecord result = null; @@ -8780,7 +8786,8 @@ throw new SystemException("不支持的型号或无匹配的灭菌数据,型号代码为"+sr.getSterilizationParaType()); } }else{ - List sterilizerRecords = getSterilizaerRecordsById(sr.getId()); + List sterilizerRecords = getSterilizaerRecordsById(sr.getId() + ,SterilizerRecord.buildConstructionMethodSql("s.t1Temp,s.p1Mbar,s.time,s.phase,cycleCounter")); if(CollectionUtils.isNotEmpty(sterilizerRecords)){ for (SterilizerRecord detail : sterilizerRecords) { Date time = parseDateStr(sdfHms, sdfHms2, detail.getTime()); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r35450 -r35451 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 35450) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 35451) @@ -70,7 +70,8 @@ rueslt = sterilizerRecordManager.createEChartData(sterilizationRecord, queryTable); StrutsResponseUtils.output(true, rueslt); }else{ - sterilizerRecords = sterilizationRecordManager.getSterilizaerRecordsById(sterilizationRecord.getId()); + sterilizerRecords = sterilizationRecordManager.getSterilizaerRecordsById(sterilizationRecord.getId() + , SterilizerRecord.buildConstructionMethodSql("s.t1Temp,s.p1Mbar,s.time,s.procStartTime")); if ( CollectionUtils.isNotEmpty(sterilizerRecords)) { JSONArray timeArray = new JSONArray(); JSONArray t1TempArray = new JSONArray(); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r35445 -r35451 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 35445) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 35451) @@ -172,6 +172,12 @@ */ public List getSterilizaerRecordsById(Long id); /** + * 获取所有的温度和压力的灭菌记录. 只拿部分字段 + * @param id 灭菌记录id + * @param queryFields 要查询的字段 + */ + public List getSterilizaerRecordsById(Long id, String queryFields); + /** * 获取机器号相等且灭菌开始时间上下不超过5分钟的低温灭菌炉参数记录 * @param machineNo 机器号(文件的设备编号=灭菌炉机器号) * @param startDate 灭菌记录的开始日期