From 8f85c4f28f27ef343b3771b1b481be85964b2f97 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 14 Dec 2020 14:17:02 +0800 Subject: [PATCH 1/4] 1 --- .../mapper_dao/CompeteProjectConfigDao.xml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 3fbc2fe2..b8ad1517 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -108,30 +108,30 @@ LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id WHERE - - tcpro.id = #{projectId} - - - and tcg.id = #{groupId} - - - and tcc.id = #{companyId} - - - and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%') - - - and tcp.id_card = #{idCard} - - and tcpro.type=0 - and tcpro.`level` =2 - and tcpro.team=1 - and tcpro.rec_status = 0 - and tctm.rec_status = 0 - and tcp.rec_status = 0 - and tcc.rec_status = 0 - and tcg.rec_status = 0 - and tct.rec_status = 0 + + tcpro.id = #{projectId} + + + and tcg.id = #{groupId} + + + and tcc.id = #{companyId} + + + and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%') + + + and tcp.id_card = #{idCard} + + and tcpro.type=0 + and tcpro.`level` =2 + and tcpro.team=1 + and tcpro.rec_status = 0 + and tctm.rec_status = 0 + and tcp.rec_status = 0 + and tcc.rec_status = 0 + and tcg.rec_status = 0 + and tct.rec_status = 0 UNION SELECT From c3831ae2ab337e5c4c57679255ea4d4ef32abafe Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 14 Dec 2020 17:36:00 +0800 Subject: [PATCH 2/4] 1 --- .../com/ccsens/wisdomcar/bean/dto/StatisticsDto.java | 1 + .../com/ccsens/wisdomcar/bean/vo/StatisticsVo.java | 11 +++++++++++ .../ccsens/wisdomcar/service/IStatisticsService.java | 7 +++++++ .../ccsens/wisdomcar/service/StatisticsService.java | 8 ++++++++ 4 files changed, 27 insertions(+) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java index 027782bc..2845fa81 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java @@ -17,4 +17,5 @@ public class StatisticsDto { private Long id; } + } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java index 23a7aa4f..24f239e1 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java @@ -17,4 +17,15 @@ public class StatisticsVo { @ApiModelProperty("医院id") private Long id; } + + + + @Data + @ApiModel("各个结点时长") + public static class PointTime{ + @ApiModelProperty("节点名") + private String name; + @ApiModelProperty("节点耗时") + private Long time; + } } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java index b2125283..85655c99 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java @@ -3,6 +3,8 @@ package com.ccsens.wisdomcar.service; import com.ccsens.wisdomcar.bean.dto.StatisticsDto; import com.ccsens.wisdomcar.bean.vo.StatisticsVo; +import java.util.List; + public interface IStatisticsService { /** * 查看FAST ED结果 @@ -10,4 +12,9 @@ public interface IStatisticsService { * @return */ StatisticsVo.FastEdResult getResult(StatisticsDto.Hospital param); + + /** + * 急救时长分析(各个节点) + */ + List getPointTime(StatisticsDto.Hospital param); } 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 7a6d47cf..65121ba6 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java @@ -7,6 +7,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Slf4j @Service @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) @@ -15,4 +17,10 @@ public class StatisticsService implements IStatisticsService{ public StatisticsVo.FastEdResult getResult(StatisticsDto.Hospital param) { return null; } + + @Override + public List getPointTime(StatisticsDto.Hospital param) { + // + return null; + } } From 1668120e7db17f66d01c846781c456dfa2d3dcaf Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 14 Dec 2020 18:43:10 +0800 Subject: [PATCH 3/4] 1 --- .../java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java | 2 +- wisdomcar/src/main/resources/application.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java index 28bbeec3..db790d82 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java @@ -9,7 +9,7 @@ import java.util.List; public interface StatisticsDao extends FirstAidMapper { - public List selResult(@Param("param")StatisticsDto.UseNum param); + List getPointTimeCurrent(@Param("id") Long id); diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index ac92adb9..a47f2a7b 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev From 54af78414f37bf0b993a80ab890df7f6d58efbfb Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 14 Dec 2020 18:51:55 +0800 Subject: [PATCH 4/4] 1 --- wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml index 4617fe36..983035b5 100644 --- a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml @@ -44,7 +44,7 @@ FROM select ts.`name`, - MIN(tfas.duration) + MIN(tfas.duration) 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