ccsens_wiki
/
carbasics
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

修改统计小数位

master
ma 4 years ago
parent
2cd6499cee
commit
1189660fb3
4 changed files with 137 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      src/main/resources/application-pre.yml
  2. 4
      src/main/resources/application.yml
  3. 33
      src/main/resources/druid-pre.yml
  4. 96
      src/main/resources/mapper_dao/DataStatisticsDao.xml

54
src/main/resources/application-pre.yml
View File

@ -0,0 +1,54 @@
server:
port: 7240
servlet:
context-path: /v4.0
spring:
application:
name: carbasics
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
host: 127.0.0.1
password: 111111
port: 5672
username: admin
redis:
database: 0
host: 127.0.0.1
jedis:
pool:
max-active: 200
max-idle: 10
max-wait: -1ms
min-idle: 0
password: ''
port: 6379
timeout: 1000ms
swagger:
enable: true
mybatisCache:
database: 1
host: 127.0.0.1
jedis:
pool:
max-active: 200
max-idle: 10
max-wait: -1
min-idle: 0
password: ''
port: 6379
timeout: 1000
eureka:
instance:
ip-address: 127.0.0.1
file:
path: /home/cloud/carbasics/uploads/
domain: https://test.tall.wiki/gateway/carbasics/v4.0
imgDomain: https://test.tall.wiki/gateway/carbasics/v4.0/uploads/
wisdom:
weight: 10000
time: 600000
question:
template: /home/cloud/carbasics/uploads/template/暴风眼问卷导出表格模板.xlsx
pdftemplate: /home/cloud/carbasics/uploads/template/卒中绿色通道时间节点控制表form版备用.pdf

4
src/main/resources/application.yml
View File

@ -1,4 +1,4 @@
spring:
profiles:
active: test
include: common, util-test
active: prod
include: common, util-prod

33
src/main/resources/druid-pre.yml
View File

@ -0,0 +1,33 @@
spring:
datasource:
druid:
connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
driverClassName: com.mysql.cj.jdbc.Driver
dynamicUrl: jdbc:mysql://localhost:3306/${schema}
filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
filterName: druidFilter
filterProfileEnable: true
filterUrlPattern: /*
filters: stat,wall
initialSize: 5
maxActive: 20
maxPoolPreparedStatementPerConnectionSize: 20
maxWait: 60000
minEvictableIdleTimeMillis: 300000
minIdle: 5
password:
poolPreparedStatements: true
servletLogSlowSql: true
servletLoginPassword: 111111
servletLoginUsername: druid
servletName: druidServlet
servletResetEnable: true
servletUrlMapping: /druid/*
testOnBorrow: false
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://127.0.0.1/carbasics?useUnicode=true&characterEncoding=UTF-8
username: root
validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL

96
src/main/resources/mapper_dao/DataStatisticsDao.xml
View File

@ -4,9 +4,9 @@
<select id="statisticsJmrs" resultType="com.ccsens.carbasics.bean.vo.StatisticsVo$JmrsUpResult">
SELECT
round(allActual.`value` * 100 / allAis.`value`,2) AS jmrsl,
round(allTwoActual.`value` * 100 / allTwoAis.`value`,2) AS twoJmrsl,
round(allThreeActual.`value` * 100 / allThreeAis.`value`,2) AS threeJmrsl
round(allActual.`value` * 100 / allAis.`value`,1) AS jmrsl,
round(allTwoActual.`value` * 100 / allTwoAis.`value`,1) AS twoJmrsl,
round(allThreeActual.`value` * 100 / allThreeAis.`value`,1) AS threeJmrsl
FROM
(SELECT
SUM( actual.answer ) AS `value`
@ -223,8 +223,8 @@
<select id="dntTotalStatistics" resultType="com.ccsens.carbasics.bean.vo.StatisticsVo$DntTotalStatistics">
SELECT
round((answer45.value40+answer60.value60)*100/(answer45.value40+answer60.value60+answer61.value61),2) AS dntLess60,
round(answer45.value40*100/(answer45.value40+answer60.value60+answer61.value61),2) AS dntLess45
round((answer45.value40+answer60.value60)*100/(answer45.value40+answer60.value60+answer61.value61),1) AS dntLess60,
round(answer45.value40*100/(answer45.value40+answer60.value60+answer61.value61),1) AS dntLess45
FROM
(
SELECT
@ -271,8 +271,8 @@
a.area_name AS cityName,
</if>
answer45.level AS `level`,
round((answer45.value40+answer60.value60)*100/(answer45.value40+answer60.value60+answer61.value61),2) AS dntLess60,
round(answer45.value40*100/(answer45.value40+answer60.value60+answer61.value61),2) AS dntLess45
round((answer45.value40+answer60.value60)*100/(answer45.value40+answer60.value60+answer61.value61),1) AS dntLess60,
round(answer45.value40*100/(answer45.value40+answer60.value60+answer61.value61),1) AS dntLess45
FROM
(
SELECT
@ -389,10 +389,10 @@
a.id AS areaId,
a.area_name AS name,
answer45.level,
round((answer45.value40+answer60.value60)*100/(answer45.value40+answer60.value60+answer61.value61),2) AS dntLess60,
round(answer45.value40*100/(answer45.value40+answer60.value60+answer61.value61),2) AS dntLess45,
round((answer45all.value40+answer60all.value60)*100/(answer45all.value40+answer60all.value60+answer61all.value61),2) AS dntLess60All,
round(answer45all.value40*100/(answer45all.value40+answer60all.value60+answer61all.value61),2) AS dntLess45All
round((answer45.value40+answer60.value60)*100/(answer45.value40+answer60.value60+answer61.value61),1) AS dntLess60,
round(answer45.value40*100/(answer45.value40+answer60.value60+answer61.value61),1) AS dntLess45,
round((answer45all.value40+answer60all.value60)*100/(answer45all.value40+answer60all.value60+answer61all.value61),1) AS dntLess60All,
round(answer45all.value40*100/(answer45all.value40+answer60all.value60+answer61all.value61),1) AS dntLess45All
FROM
(
@ -561,8 +561,8 @@
SELECT
answer45.hospital AS name,
answer45.`level`,
IFNULL(round((answer45.value40+answer60.value60)*100/(answer45.value40+answer60.value60+answer61.value61),2),0.00) AS dntLess60All,
IFNULL(round(answer45.value40*100/(answer45.value40+answer60.value60+answer61.value61),2),0.00) AS dntLess45All,
IFNULL(round((answer45.value40+answer60.value60)*100/(answer45.value40+answer60.value60+answer61.value61),1),0.0) AS dntLess60All,
IFNULL(round(answer45.value40*100/(answer45.value40+answer60.value60+answer61.value61),1),0.0) AS dntLess45All,
answer45.VALUE40 AS dntLess45H,
answer60.value60 AS dntLess60H,
answer61.value61 AS dnt61H
@ -685,7 +685,7 @@
<select id="sichTotal" resultType="com.ccsens.carbasics.bean.vo.StatisticsVo$SichTotal">
SELECT
round(answer1.sich*100/answer2.actual,2) AS sichTotal
round(answer1.sich*100/answer2.actual,1) AS sichTotal
FROM
(
SELECT
@ -719,7 +719,7 @@
a.area_name AS cityName,
</if>
answer1.level,
round(answer1.sich*100/answer2.actual,2) AS sichFsl
round(answer1.sich*100/answer2.actual,1) AS sichFsl
FROM
(
SELECT
@ -805,7 +805,7 @@
(SELECT
a.id AS areaId,
a.area_name,
round(answer1.sich*100/answer2.actual,2) AS lncx
round(answer1.sich*100/answer2.actual,1) AS lncx
FROM
(
SELECT
@ -928,7 +928,7 @@
<select id="sichDataForHospital" resultType="com.ccsens.carbasics.bean.vo.StatisticsVo$SichData">
SELECT
answer1.`name` AS name,
IFNULL(round(answer1.sich*100/answer2.actual,2),0.00) AS sichFsl,
IFNULL(round(answer1.sich*100/answer2.actual,1),0.0) AS sichFsl,
answer1.sich AS sICHNnt
FROM
(
@ -1010,9 +1010,9 @@
answer1.qjxgnzlzs,
answer2.sjxgnzlzrs AS fqjxgnzlzs,
(answer1.qjxgnzlzs+answer2.sjxgnzlzrs) AS xgnzlzs,
round(answer2.sjxgnzlzrs*100/answer3.rshfhxgnzlzzzrs,2) AS qjxgnzll,
round(answer2.sjxgnzlzrs*100/answer4.fhxgnzlzzzrs,2) AS fqjxgnzll,
round((answer1.qjxgnzlzs+answer2.sjxgnzlzrs)*100/(answer3.rshfhxgnzlzzzrs+answer4.fhxgnzlzzzrs),2) AS zxgnzll
round(answer2.sjxgnzlzrs*100/answer3.rshfhxgnzlzzzrs,1) AS qjxgnzll,
round(answer2.sjxgnzlzrs*100/answer4.fhxgnzlzzzrs,1) AS fqjxgnzll,
round((answer1.qjxgnzlzs+answer2.sjxgnzlzrs)*100/(answer3.rshfhxgnzlzzzrs+answer4.fhxgnzlzzzrs),1) AS zxgnzll
FROM
(
SELECT
@ -1094,7 +1094,7 @@
a.area_name AS name,
answer1.qjxgnzlzs,
answer2.fqjxgnzlzs,
IFNULL(round((answer1.qjxgnzlzs+answer2.fqjxgnzlzs)*100/(answer3.rshfhxgnzlzzzrs+answer4.fhxgnzlzzzrs),2),0.00)
IFNULL(round((answer1.qjxgnzlzs+answer2.fqjxgnzlzs)*100/(answer3.rshfhxgnzlzzzrs+answer4.fhxgnzlzzzrs),1),0.00)
AS zxgnzll
FROM
(
@ -1244,7 +1244,7 @@
SELECT
a.id,
a.area_name,
IFNULL(round((SUM(answer1.answer)+SUM(answer2.answer))*100/(SUM(answer3.answer)+SUM(answer4.answer)),2),0.00) AS zxgnzllCity
IFNULL(round((SUM(answer1.answer)+SUM(answer2.answer))*100/(SUM(answer3.answer)+SUM(answer4.answer)),1),0.0) AS zxgnzllCity
FROM
t_qcp_questionnaire_record AS answer1
LEFT JOIN t_qcp_questionnaire_detail AS qd ON answer1.questionnaire_detail_id = qd.id
@ -1283,7 +1283,7 @@
hospital.answer AS `name`,
answer1.answer AS qjxgnzlzs,
answer2.answer AS fqjxgnzlzs,
IFNULL(round((answer1.answer+answer2.answer)*100/(answer3.answer+answer4.answer),2),0.00) AS zxgnzll
IFNULL(round((answer1.answer+answer2.answer)*100/(answer3.answer+answer4.answer),1),0.0) AS zxgnzll
FROM
t_qcp_questionnaire_record AS answer1
LEFT JOIN t_qcp_questionnaire_detail AS qd ON answer1.questionnaire_detail_id = qd.id
@ -1331,7 +1331,7 @@
a.area_name AS `cityName`,
</if>
LEFT(level.answer,1) AS level,
round((SUM(answer1.answer)+SUM(answer2.answer))*100/(SUM(answer3.answer)+SUM(answer4.answer)),2) AS zxgnzll
round((SUM(answer1.answer)+SUM(answer2.answer))*100/(SUM(answer3.answer)+SUM(answer4.answer)),1) AS zxgnzll
FROM
t_qcp_questionnaire_record AS answer1
LEFT JOIN t_qcp_questionnaire_detail AS qd ON answer1.questionnaire_detail_id = qd.id
@ -1377,8 +1377,8 @@
SELECT
SUM(dpt59.answer)+SUM(dpt89.answer) AS dpt89,
SUM(dpt59.answer) AS dpt59,
round((SUM(dpt59.answer)+SUM(dpt89.answer))*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),2) AS dpt89Ratio,
round(SUM(dpt59.answer)*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),2) AS dpt59Ratio
round((SUM(dpt59.answer)+SUM(dpt89.answer))*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),1) AS dpt89Ratio,
round(SUM(dpt59.answer)*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),1) AS dpt59Ratio
FROM
t_qcp_questionnaire_record AS dpt59
LEFT JOIN t_qcp_questionnaire_detail AS d ON dpt59.questionnaire_detail_id = d.id
@ -1403,8 +1403,8 @@
a.area_name AS cityName,
</if>
LEFT(level.answer,1) AS level,
round((SUM(dpt59.answer)+SUM(dpt89.answer))*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),2) AS dpt89Ratio,
round(SUM(dpt59.answer)*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),2) AS dpt59Ratio
round((SUM(dpt59.answer)+SUM(dpt89.answer))*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),1) AS dpt89Ratio,
round(SUM(dpt59.answer)*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),1) AS dpt59Ratio
FROM
t_qcp_questionnaire_record AS dpt59
LEFT JOIN t_qcp_questionnaire_detail AS d ON dpt59.questionnaire_detail_id = d.id
@ -1439,14 +1439,14 @@
a1.area_name AS `name`,
a1.dpt59RatioCity,
a1.dpt89RatioCity,
IFNULL(a2.dpt89Ratio,0.00) AS dpt89Ratio,
IFNULL(a2.dpt59Ratio,0.00) AS dpt59Ratio
IFNULL(a2.dpt89Ratio,0.0) AS dpt89Ratio,
IFNULL(a2.dpt59Ratio,0.0) AS dpt59Ratio
FROM
(SELECT
a.id,
a.area_name,
IFNULL(round((SUM(dpt59.answer)+SUM(dpt89.answer))*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),2),0.00) AS dpt89RatioCity,
IFNULL(round(SUM(dpt59.answer)*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),2),0.00) AS dpt59RatioCity
IFNULL(round((SUM(dpt59.answer)+SUM(dpt89.answer))*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),1),0.0) AS dpt89RatioCity,
IFNULL(round(SUM(dpt59.answer)*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),1),0.0) AS dpt59RatioCity
FROM
t_qcp_questionnaire_record AS dpt59
LEFT JOIN t_qcp_questionnaire_detail AS d ON dpt59.questionnaire_detail_id = d.id
@ -1476,8 +1476,8 @@
a.id,
a.area_name,
LEFT(level.answer,1) AS level,
IFNULL(round((SUM(dpt59.answer)+SUM(dpt89.answer))*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),2),0.00) AS dpt89Ratio,
IFNULL(round(SUM(dpt59.answer)*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),2),0.00) AS dpt59Ratio
IFNULL(round((SUM(dpt59.answer)+SUM(dpt89.answer))*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),1),0.0) AS dpt89Ratio,
IFNULL(round(SUM(dpt59.answer)*100/(SUM(dpt59.answer)+SUM(dpt89.answer)+SUM(dpt91.answer)),1),0.0) AS dpt59Ratio
FROM
t_qcp_questionnaire_record AS dpt59
LEFT JOIN t_qcp_questionnaire_detail AS d ON dpt59.questionnaire_detail_id = d.id
@ -1516,8 +1516,8 @@
SELECT
hospital.answer AS `name`,
LEFT(level.answer,1) AS level,
IFNULL(round((dpt59.answer+dpt89.answer)*100/(dpt59.answer+dpt89.answer+dpt91.answer),2),0.00) AS dpt89Ratio,
IFNULL(round(dpt59.answer*100/(dpt59.answer+dpt89.answer+dpt91.answer),2),0.00) AS dpt59Ratio,
IFNULL(round((dpt59.answer+dpt89.answer)*100/(dpt59.answer+dpt89.answer+dpt91.answer),1),0.0) AS dpt89Ratio,
IFNULL(round(dpt59.answer*100/(dpt59.answer+dpt89.answer+dpt91.answer),1),0.0) AS dpt59Ratio,
dpt59.answer AS dpt59Number,
dpt89.answer AS dpt89Number,
dpt91.answer AS dpt91Number
@ -1561,8 +1561,8 @@
SELECT
SUM(prt29.answer)+SUM(prt59.answer) AS prt59,
SUM(prt29.answer) AS prt29,
CONVERT((SUM(prt29.answer)+SUM(prt59.answer))*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),DECIMAL(15,2)) AS prt59Ratio,
CONVERT(SUM(prt29.answer)*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),DECIMAL(15,2)) AS prt29Ratio
CONVERT((SUM(prt29.answer)+SUM(prt59.answer))*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),DECIMAL(15,1)) AS prt59Ratio,
CONVERT(SUM(prt29.answer)*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),DECIMAL(15,1)) AS prt29Ratio
FROM
t_qcp_questionnaire_record AS prt29
LEFT JOIN t_qcp_questionnaire_detail AS d ON prt29.questionnaire_detail_id = d.id
@ -1587,8 +1587,8 @@
a.area_name AS cityName,
</if>
LEFT(level.answer,1) AS level,
IFNULL(TRUNCATE((SUM(prt29.answer)+SUM(prt59.answer))*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),2),0.00) AS prt59Ratio,
IFNULL(TRUNCATE(SUM(prt29.answer)*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),2),0.00) AS prt29Ratio
IFNULL(TRUNCATE((SUM(prt29.answer)+SUM(prt59.answer))*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),1),0.0) AS prt59Ratio,
IFNULL(TRUNCATE(SUM(prt29.answer)*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),1),0.0) AS prt29Ratio
FROM
t_qcp_questionnaire_record AS prt29
LEFT JOIN t_qcp_questionnaire_detail AS d ON prt29.questionnaire_detail_id = d.id
@ -1624,14 +1624,14 @@
a1.area_name AS `name`,
a1.prt29RatioCity,
a1.prt59RatioCity,
IFNULL(a2.prt59Ratio,0.00) AS prt59Ratio,
IFNULL(a2.prt29Ratio,0.00) AS prt29Ratio
IFNULL(a2.prt59Ratio,0.0) AS prt59Ratio,
IFNULL(a2.prt29Ratio,0.0) AS prt29Ratio
FROM
(SELECT
a.id,
a.area_name,
IFNULL(round((SUM(prt29.answer)+SUM(prt59.answer))*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),2),0.00) AS prt59RatioCity,
IFNULL(round(SUM(prt29.answer)*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),2),0.00) AS prt29RatioCity
IFNULL(round((SUM(prt29.answer)+SUM(prt59.answer))*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),1),0.0) AS prt59RatioCity,
IFNULL(round(SUM(prt29.answer)*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),1),0.0) AS prt29RatioCity
FROM
t_qcp_questionnaire_record AS prt29
LEFT JOIN t_qcp_questionnaire_detail AS d ON prt29.questionnaire_detail_id = d.id
@ -1661,8 +1661,8 @@
a.id,
a.area_name,
LEFT(level.answer,1) AS level,
IFNULL(round((SUM(prt29.answer)+SUM(prt59.answer))*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),2),0.00) AS prt59Ratio,
IFNULL(round(SUM(prt29.answer)*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),2),0.00) AS prt29Ratio
IFNULL(round((SUM(prt29.answer)+SUM(prt59.answer))*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),1),0.0) AS prt59Ratio,
IFNULL(round(SUM(prt29.answer)*100/(SUM(prt29.answer)+SUM(prt59.answer)+SUM(prt61.answer)),1),0.0) AS prt29Ratio
FROM
t_qcp_questionnaire_record AS prt29
LEFT JOIN t_qcp_questionnaire_detail AS d ON prt29.questionnaire_detail_id = d.id
@ -1701,8 +1701,8 @@
SELECT
hospital.answer AS `name`,
LEFT(level.answer,1) AS level,
IFNULL(round((prt29.answer+prt59.answer)*100/(prt29.answer+prt59.answer+prt61.answer),2),0.00) AS prt59Ratio,
IFNULL(round(prt29.answer*100/(prt29.answer+prt59.answer+prt61.answer),2),0.00) AS prt29Ratio,
IFNULL(round((prt29.answer+prt59.answer)*100/(prt29.answer+prt59.answer+prt61.answer),1),0.0) AS prt59Ratio,
IFNULL(round(prt29.answer*100/(prt29.answer+prt59.answer+prt61.answer),1),0.0) AS prt29Ratio,
prt29.answer AS prt29Number,
prt59.answer AS prt59Number,
prt61.answer AS prt61Number

Write Preview
Loading…
Cancel
Save