Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r37833 -r37851 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 37833) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 37851) @@ -24,14 +24,13 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempSterilizerRecord; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Melag43BPlusStageDetails; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Melag43BPlusSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.OneOfGetingeStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.OneOfGetingeSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.Johnson100NXManagerImpl; import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.MaTaSterilizerRecordManagerImpl; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.SterilizerParaManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.SterilizerRecordManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.Xg2cSterilizerRecordManagerImpl; import com.forgon.tools.StrutsParamUtils; @@ -55,6 +54,13 @@ private Xg2cSterilizerRecordManagerImpl xg2cSterilizerRecordManagerImpl; private Johnson100NXManagerImpl johnson100NXManagerImpl; + + private SterilizerParaManager melag43BPlusSterilizerParaManagerImpl; + + public void setMelag43BPlusSterilizerParaManagerImpl( + SterilizerParaManager melag43bPlusSterilizerParaManagerImpl) { + melag43BPlusSterilizerParaManagerImpl = melag43bPlusSterilizerParaManagerImpl; + } public void setJohnson100NXManagerImpl( Johnson100NXManagerImpl johnson100nxManagerImpl) { johnson100NXManagerImpl = johnson100nxManagerImpl; @@ -95,6 +101,8 @@ rueslt = xg2cSterilizerRecordManagerImpl.createEChartData(sterilizationRecord, false); } else if(SterilizationRecord.STERILIZATIONPARATYPE_JOHNSON_100NX.equals(sterilizationParaType)){ rueslt = johnson100NXManagerImpl.createEChartData(sterilizationRecord); + } else if(SterilizationRecord.STERILIZATIONPARATYPE_MELAG_43B_PLUS.equals(sterilizationParaType)){ + rueslt = melag43BPlusSterilizerParaManagerImpl.createEChartData(sterilizationRecord, false); }else{ rueslt = sterilizerRecordManager.createEChartData(sterilizationRecord, queryTable); } @@ -433,51 +441,4 @@ } } - /** - * 返回 “美莱格 快速灭菌炉 43B+ 灭菌器”的灭菌参数GDSRMYY-596 - */ - public void creatMelagVacuklav43BPlusSterilizerRecordEChartData() { - Long sterilizationRecordId = StrutsParamUtils.getPraramLongValue("sterilizationRecordId", 0L); - JSONObject rueslt = new JSONObject(); - try { - SterilizationRecord sterilizationRecord = sterilizationRecordManager.getSterilizationRecordById(sterilizationRecordId); - Melag43BPlusSterilizerRecord melagRecord = sterilizationRecordManager.getMelagVacuklav43BPlusSterilizerRecordSterilizerRecord(sterilizationRecord); - List stageDetailsList = null; - SimpleDateFormat sdf = new SimpleDateFormat(Constants.DATEFORMAT_YYYYMMDDHHMMSS); - if(melagRecord != null){ - stageDetailsList = melagRecord.getDetails(); - rueslt.put("sterilizerModel", melagRecord.getSterilizerModel()); - rueslt.put("sn", melagRecord.getSn()); - rueslt.put("program", melagRecord.getProgram()); - rueslt.put("temperature", melagRecord.getTemperatureWithOffset()); - rueslt.put("pressure", melagRecord.getPressureWithOffset()); - rueslt.put("plateauTime", melagRecord.getPlateauTimeFormat()); - rueslt.put("conductivity", melagRecord.getConductivity()); - rueslt.put("startTime", melagRecord.getStartTime() == null ? "" : sdf.format(melagRecord.getStartTime())); - rueslt.put("endTime", melagRecord.getEndTime() == null ? "" : sdf.format(melagRecord.getEndTime())); - rueslt.put("dailyBatches", melagRecord.getDailyBatches()); - rueslt.put("total", melagRecord.getTotal()); - } - if(CollectionUtils.isNotEmpty(stageDetailsList)) { - //rueslt.put("stageDetailsList", stageDetailsList); - JSONArray temperatureArr = new JSONArray(); - JSONArray pressureArr = new JSONArray(); - JSONArray timeArr = new JSONArray(); - for (Melag43BPlusStageDetails record : stageDetailsList) { - temperatureArr.add(record.getT1Temp()); - pressureArr.add(record.getP1Mbar()); - timeArr.add(record.getTime() == null ? "" : DateTools.getFormatDateStr(record.getTime(), DateTools.COMMON_DATE_HMS)); - } - rueslt.put("temperatureArr", temperatureArr); - rueslt.put("pressureArr", pressureArr); - rueslt.put("timeArr", timeArr); - StrutsResponseUtils.output(true, rueslt); - }else{ - StrutsResponseUtils.output(false, rueslt); - } - }catch (Exception e) { - StrutsResponseUtils.output(false ,e.getMessage()); - e.printStackTrace(); - } - } } \ No newline at end of file Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/Melag43BPlusSterilizerParaManagerImpl.java =================================================================== diff -u --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/Melag43BPlusSterilizerParaManagerImpl.java (revision 0) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/Melag43BPlusSterilizerParaManagerImpl.java (revision 37851) @@ -0,0 +1,101 @@ +package com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service; + +import java.text.SimpleDateFormat; +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import com.forgon.Constants; +import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; +import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Melag43BPlusStageDetails; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Melag43BPlusSterilizerRecord; +import com.forgon.tools.StrutsResponseUtils; +import com.forgon.tools.date.DateTools; +import com.forgon.tools.hibernate.ObjectDao; + +/** + * 返回 “美莱格 快速灭菌炉 43B+ 灭菌器”的灭菌参数GDSRMYY-596 + */ +@Component +public class Melag43BPlusSterilizerParaManagerImpl implements SterilizerParaManager { + + @Autowired + private ObjectDao objectDao; + + @Override + public JSONObject createEChartData(SterilizationRecord sterilizationRecord, + boolean queryTable) { + + JSONObject rueslt = new JSONObject(); + try { + Melag43BPlusSterilizerRecord melagRecord = this.getMelagVacuklav43BPlusSterilizerRecordSterilizerRecord(sterilizationRecord); + List stageDetailsList = null; + SimpleDateFormat sdf = new SimpleDateFormat(Constants.DATEFORMAT_YYYYMMDDHHMMSS); + if(melagRecord != null){ + stageDetailsList = melagRecord.getDetails(); + rueslt.put("sterilizerModel", melagRecord.getSterilizerModel()); + rueslt.put("sn", melagRecord.getSn()); + rueslt.put("program", melagRecord.getProgram()); + rueslt.put("temperature", melagRecord.getTemperatureWithOffset()); + rueslt.put("pressure", melagRecord.getPressureWithOffset()); + rueslt.put("plateauTime", melagRecord.getPlateauTimeFormat()); + rueslt.put("conductivity", melagRecord.getConductivity()); + rueslt.put("startTime", melagRecord.getStartTime() == null ? "" : sdf.format(melagRecord.getStartTime())); + rueslt.put("endTime", melagRecord.getEndTime() == null ? "" : sdf.format(melagRecord.getEndTime())); + rueslt.put("dailyBatches", melagRecord.getDailyBatches()); + rueslt.put("total", melagRecord.getTotal()); + } + if(CollectionUtils.isNotEmpty(stageDetailsList)) { + //rueslt.put("stageDetailsList", stageDetailsList); + JSONArray temperatureArr = new JSONArray(); + JSONArray pressureArr = new JSONArray(); + JSONArray timeArr = new JSONArray(); + for (Melag43BPlusStageDetails record : stageDetailsList) { + temperatureArr.add(record.getT1Temp()); + pressureArr.add(record.getP1Mbar()); + timeArr.add(record.getTime() == null ? "" : DateTools.getFormatDateStr(record.getTime(), DateTools.COMMON_DATE_HMS)); + } + rueslt.put("temperatureArr", temperatureArr); + rueslt.put("pressureArr", pressureArr); + rueslt.put("timeArr", timeArr); + } + }catch (Exception e) { + StrutsResponseUtils.output(false ,e.getMessage()); + e.printStackTrace(); + } + return rueslt; + } + + /** + * 查询灭菌记录关联的灭菌炉打印记录 + * @param sterilizationRecord + * @return + */ + private Melag43BPlusSterilizerRecord getMelagVacuklav43BPlusSterilizerRecordSterilizerRecord( + SterilizationRecord sterilizationRecord) { + + if(sterilizationRecord == null){ + return null; + } + Sterilizer sterilizer = sterilizationRecord.getSterilizer(); + if(sterilizer == null){ + return null; + } + DeviceInterface deviceInterface = sterilizer.getDeviceInterface(); + if(deviceInterface == null){ + return null; + } + Melag43BPlusSterilizerRecord melag43BPlusSterilizerRecord = (Melag43BPlusSterilizerRecord)objectDao.getBySql(Melag43BPlusSterilizerRecord.class.getSimpleName() + , " where po.sterilizationRecordId =" + + sterilizationRecord.getId()); + return melag43BPlusSterilizerRecord; + } + +} Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType16.jsp =================================================================== diff -u -r37850 -r37851 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType16.jsp (.../lowSterilizerLineChartSterilizationParaType16.jsp) (revision 37850) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType16.jsp (.../lowSterilizerLineChartSterilizationParaType16.jsp) (revision 37851) @@ -51,7 +51,7 @@ function initLoad(deviceBrand){ var option; jQuery.ajax({ - url :WWWROOT+"/disinfectSystem/sterilization/sterilizerRecordLineChartAction!creatMelagVacuklav43BPlusSterilizerRecordEChartData.do", + url :WWWROOT+"/disinfectSystem/sterilization/sterilizerRecordLineChartAction!createEChartData.do", type: 'post', dataType:'JSON', data:{ Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r37833 -r37851 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 37833) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 37851) @@ -111,7 +111,6 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.HighTempSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempSterilizerRecord; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Melag43BPlusSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.OneOfGetingeSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SenohStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SenohSterilizerRecord; @@ -9894,23 +9893,4 @@ return arr; } - @Override - public Melag43BPlusSterilizerRecord getMelagVacuklav43BPlusSterilizerRecordSterilizerRecord( - SterilizationRecord sterilizationRecord) { - if(sterilizationRecord == null){ - return null; - } - Sterilizer sterilizer = sterilizationRecord.getSterilizer(); - if(sterilizer == null){ - return null; - } - DeviceInterface deviceInterface = sterilizer.getDeviceInterface(); - if(deviceInterface == null){ - return null; - } - Melag43BPlusSterilizerRecord melag43BPlusSterilizerRecord = (Melag43BPlusSterilizerRecord)objectDao.getBySql(Melag43BPlusSterilizerRecord.class.getSimpleName() - , " where po.sterilizationRecordId =" - + sterilizationRecord.getId()); - return melag43BPlusSterilizerRecord; - } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r37833 -r37851 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 37833) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 37851) @@ -22,7 +22,6 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.HighTempSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempSterilizerRecord; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Melag43BPlusSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.OneOfGetingeSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; @@ -770,11 +769,4 @@ */ public JSONArray getSterilizationDetailsData(String sterilizationRecordIds); - /** - * 返回 美莱格 快速灭菌炉 43B+ 灭菌器”的灭菌参数GDSRMYY-596 - * @param sterilizationRecord - * @return - */ - public Melag43BPlusSterilizerRecord getMelagVacuklav43BPlusSterilizerRecordSterilizerRecord( - SterilizationRecord sterilizationRecord); }