From 5c575390dbba9daf1df7c72bc5aaf274a18b9c4c Mon Sep 17 00:00:00 2001 From: hujl Date: Tue, 21 Dec 2021 10:35:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ipml/Emr_Fault_DetailServiceImpl.java | 27 ++++++++++++++++--- .../WEB-INF/views/faultDir/faultList.jsp | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java index c420fd2c..5502b4ad 100644 --- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java @@ -19,6 +19,7 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.google.common.base.Function; import com.google.common.collect.Maps; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -363,8 +364,17 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { try { if (compare(emr_fault_vo.getCreateTime(), followList.get(i).getHandleTime())) { emr_fault_vo.setBackNum(followList.get(i).getRemark()); - emr_fault_vo.setStartDateTo(followList.get(i-1).getHandleTime()); - emr_fault_vo.setEndDateTo(followList.get(i).getHandleTime()); + if(i!=0) { + emr_fault_vo.setStartDateTo(followList.get(i - 1).getHandleTime()); + if (StringUtils.isNotBlank(followList.get(i).getHandleTime())) { + emr_fault_vo.setEndDateTo(followList.get(i).getHandleTime()); + } else { + emr_fault_vo.setEndDateTo(followList.get(i - 1).getHandleTime()); + } + }else{ + emr_fault_vo.setStartDateTo(followList.get(i).getHandleTime()); + emr_fault_vo.setEndDateTo(followList.get(i).getHandleTime()); + } break; } } catch (ParseException e) { @@ -427,8 +437,17 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { try { if (compare(emr_fault_vo.getCreateTime(), followList.get(i).getHandleTime())) { emr_fault_vo.setBackNum(followList.get(i).getRemark()); - emr_fault_vo.setStartDateTo(followList.get(i-1).getHandleTime()); - emr_fault_vo.setEndDateTo(followList.get(i).getHandleTime()); + if(i!=0) { + emr_fault_vo.setStartDateTo(followList.get(i - 1).getHandleTime()); + if (StringUtils.isNotBlank(followList.get(i).getHandleTime())) { + emr_fault_vo.setEndDateTo(followList.get(i).getHandleTime()); + } else { + emr_fault_vo.setEndDateTo(followList.get(i - 1).getHandleTime()); + } + }else{ + emr_fault_vo.setStartDateTo(followList.get(i).getHandleTime()); + emr_fault_vo.setEndDateTo(followList.get(i).getHandleTime()); + } break; } } catch (ParseException e) { diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index c269ca60..0d2edf06 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -1001,7 +1001,7 @@ }else{ var faultFlag=getFlagFaultTableFun(); if(faultFlag==1) { - $("#backTable").bootstrapTable("refresh", {pageNumber: 1}); + // $("#backTable").bootstrapTable("refresh", {pageNumber: 1}); if(backIdArr.length>0){ for(var i=0;i