From 9ad56fee29a6333ea900f9539c439c7889f1d202 Mon Sep 17 00:00:00 2001
From: "Lihong@123456" <1090591095@qq.com>
Date: Mon, 14 Dec 2020 19:14:34 +0800
Subject: [PATCH] 1

---
 .../com/ccsens/wisdomcar/service/StatisticsService.java     | 5 ++++-
 wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml   | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
index 3f9478cb..f34d3892 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
@@ -63,7 +63,10 @@ public class StatisticsService implements IStatisticsService{
         //当前数据
         List<StatisticsVo.PointTime> pointTimeCurrent = statisticsDao.getPointTimeCurrent(param.getId());
         for (int i = 0; i <7; i++) {
-            pointTimeCurrent1.add(pointTimeCurrent.get(i));
+            if (i<6){
+                pointTimeCurrent.get(i).setTime(pointTimeCurrent.get(i+1).getTime()/1000-pointTimeCurrent.get(i).getTime()/1000);
+            }
+
         }
         //医院数据
         List<StatisticsVo.PointTime> pointTimeHospital = statisticsDao.getPointTimeHospital(param.getId());
diff --git a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml
index 983035b5..2f5f6de1 100644
--- a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml
+++ b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml
@@ -35,7 +35,7 @@ FROM
 
 
 	<select id="getPointTimeCurrent" parameterType="java.util.Map" resultType="com.ccsens.wisdomcar.bean.vo.StatisticsVo$PointTime">
-		select tfar.begin_time, tfar.type
+		select tfar.begin_time, tfar.type as name
 		from
 		t_first_aid_record tfar ,(select id from t_first_aid tfa  where tfa.hospital_id=0 and tfa.rec_status=0 ORDER BY tfa.begin_time) t
 		where  tfar.rec_status=0  and t.id = tfar.first_aid_id
@@ -44,7 +44,7 @@ FROM
 	<select id="getPointTimeHospital" parameterType="java.util.Map" resultType="com.ccsens.wisdomcar.bean.vo.StatisticsVo$PointTime">
 		select
 		ts.`name`,
-		MIN(tfas.duration) as time
+		MIN(tfas.duration)/1000 as time
 		from
 		t_first_aid_standard tfas left JOIN t_step ts on tfas.step_id = ts.id
 		where tfas.hospital_id=0 and tfas.type=1  and tfas.rec_status = 0 and ts.rec_status=0
@@ -54,7 +54,7 @@ FROM
 	<select id="getPointTimeInternation" parameterType="java.util.Map" resultType="com.ccsens.wisdomcar.bean.vo.StatisticsVo$PointTime">
 		select
 		ts.`name`,
-		MIN(tfas.duration) as time
+		MIN(tfas.duration)/1000 as time
 		from
 		t_first_aid_standard tfas left JOIN t_step ts on tfas.step_id = ts.id
 		where tfas.hospital_id=0 and tfas.type=0 and tfas.rec_status = 0 and ts.rec_status=0