显示第一次签收记录

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) {

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<backIdArr.length;i++){
                             $("#faultTable"+backIdArr[i]).bootstrapTable("refresh", {pageNumber: 1});