diff --git a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java index 3989cb16..4d4bb298 100644 --- a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java +++ b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java @@ -666,11 +666,11 @@ public class QuestionService implements IQuestionService { //超出占比 parameter.setBeyondProportion(htPatientCanvas.getBeyondProportion()); //画图总时长 - parameter.setTotalDuration(endTime); + parameter.setTotalDuration(endTime + parameter.getStartDuration()); //总笔画数 parameter.setLineNums(canvasPoints.size()); //共几分钟 - double d = (double) endTime / 1000 / 60; + double d = (double) (parameter.getTotalDuration()) / 1000 / 60; //每分钟几笔 parameter.setAveTimes((int) Math.round(canvasPoints.size() / d)); //每笔数据 diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml index d082c0ea..5c2cd5c4 100644 --- a/ht/src/main/resources/application.yml +++ b/ht/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml b/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml index 7512ff02..6a0a210c 100644 --- a/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml +++ b/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml @@ -170,7 +170,7 @@ AND report.type = 2 AND s.type IN ( 0, 2 ) - + and p.name = #{patientName}