Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r30733 -r30747 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 30733) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 30747) @@ -56,11 +56,9 @@ import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; -import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils; import com.forgon.disinfectsystem.common.CssdUtils; -import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO; import com.forgon.disinfectsystem.entity.basedatamanager.bioreader.Bioreader; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; @@ -73,13 +71,11 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationInterruptRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecordPic; -import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.vo.SterilizationRecordPrintTousseItem; import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; -import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; import com.forgon.exception.SterilingModeNotTheSameException; import com.forgon.exception.SystemException; import com.forgon.exception.UnScanSterilizationMonitoringPackageException; @@ -97,7 +93,6 @@ import com.forgon.tools.json.JSONUtil; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; -import com.forgon.tools.util.ConfigUtils; import com.forgon.tools.util.FileUtils; import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.SqlUtils; @@ -162,13 +157,6 @@ private SterilisationManager sterilisationManager; - private WashAndDisinfectRecordManager washAndDisinfectRecordManager; - - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { - this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; - } - public File[] getUploadFiles() { return uploadFiles; } @@ -2418,41 +2406,4 @@ StrutsResponseUtils.output(true, message); } - /** - * 提示上传设备物理参数图片(SZYK-27) - */ - public void promptUploadDeviceParameterPicture(){ - try { - JSONArray message = new JSONArray(); - List allVo = new ArrayList(); - List vo1 = sterilizationRecordManager.promptUploadDeviceParameterPicture(); - List vo2 = washAndDisinfectRecordManager.promptUploadDeviceParameterPicture(); - if(vo1 != null){ - allVo.addAll(vo1); - } - if(vo2 != null){ - allVo.addAll(vo2); - } - allVo.sort(new Comparator() { - @Override - public int compare(SystemWarningVo o1, SystemWarningVo o2) { - if (o1.getEndDate() == null && o2.getEndDate() != null) { - return -1; - } - if (o1.getEndDate() != null && o2.getEndDate() == null) { - return 1; - } - return o2.getEndDate().compareTo(o1.getEndDate()); - } - }); - for(int i=0;i<20 && i warningTypeList); + + /** + * 提示上传设备物理参数图片(SZYK-27) + */ + public JSONArray promptUploadDeviceParameterPicture(); } Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java =================================================================== diff -u -r30191 -r30747 --- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 30191) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 30747) @@ -5,11 +5,13 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections4.CollectionUtils; @@ -44,8 +46,10 @@ import com.forgon.disinfectsystem.entity.recall.RecallRecord; import com.forgon.disinfectsystem.entity.recall.RecallRecordItem; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO; +import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; import com.forgon.disinfectsystem.jasperreports.service.dataindex.DataIndex; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; +import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; import com.forgon.keyvalue.service.KeyValueManager; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; @@ -100,7 +104,14 @@ private KeyValueManager keyValueManager; private SterilizationRecordManager sterilizationRecordManager; + + private WashAndDisinfectRecordManager washAndDisinfectRecordManager; + public void setWashAndDisinfectRecordManager( + WashAndDisinfectRecordManager washAndDisinfectRecordManager) { + this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; + } + public void setSterilizationRecordManager( SterilizationRecordManager sterilizationRecordManager) { this.sterilizationRecordManager = sterilizationRecordManager; @@ -916,4 +927,36 @@ } return list; } + + + @Override + public JSONArray promptUploadDeviceParameterPicture() { + JSONArray message = new JSONArray(); + List allVo = new ArrayList(); + List vo1 = sterilizationRecordManager.promptUploadDeviceParameterPicture(); + List vo2 = washAndDisinfectRecordManager.promptUploadDeviceParameterPicture(); + if(vo1 != null){ + allVo.addAll(vo1); + } + if(vo2 != null){ + allVo.addAll(vo2); + } + allVo.sort(new Comparator() { + @Override + public int compare(SystemWarningVo o1, SystemWarningVo o2) { + if (o1.getEndDate() == null && o2.getEndDate() != null) { + return -1; + } + if (o1.getEndDate() != null && o2.getEndDate() == null) { + return 1; + } + return o2.getEndDate().compareTo(o1.getEndDate()); + } + }); + for(int i=0;i<20 && i allVo = new ArrayList(); + List vo1 = sterilizationRecordManager.promptUploadDeviceParameterPicture(); + List vo2 = washAndDisinfectRecordManager.promptUploadDeviceParameterPicture(); + if(vo1 != null){ + allVo.addAll(vo1); + } + if(vo2 != null){ + allVo.addAll(vo2); + } + allVo.sort(new Comparator() { + @Override + public int compare(SystemWarningVo o1, SystemWarningVo o2) { + if (o1.getEndDate() == null && o2.getEndDate() != null) { + return -1; + } + if (o1.getEndDate() != null && o2.getEndDate() == null) { + return 1; + } + return o2.getEndDate().compareTo(o1.getEndDate()); + } + }); + for(int i=0;i<20 && i