diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 5bac785a..569f6b37 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -20,7 +20,7 @@ eureka: service-url: # 指定eureka server通信地址,注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ - defaultZone: http://admin:admin@192.168.31.13:7010/eureka/ + defaultZone: http://admin:admin@192.168.4.113:7010/eureka/ instance: # 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server prefer-ip-address: true 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