Merge branch 'sd' of dd.tall.wiki:ccsens_wiki/ccsenscloud into sd

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));
         //每笔数据

ht/src/main/resources/application.yml

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

ht/src/main/resources/mapper_dao/HtPatientReportDao.xml

@@ -170,7 +170,7 @@
             AND report.type = 2
             AND s.type IN ( 0, 2 )
         </if>
-        <if test="patientName != null">
+        <if test="patientName != null and patientName != ''">
             and p.name = #{patientName}
         </if>
         <if test="patientSex != null">