Merge branch 'master' of dd.tall.wiki:ccsens_wiki/carbasics

src/main/resources/mapper_dao/FirstAidRecordDao.xml

@@ -424,7 +424,7 @@
     <select id="gdCountSpecifyAnswer" resultType="com.ccsens.carbasics.bean.vo.StatisticalVo$Item">
         SELECT
         city.id,
-        city.short_name AS shortName AS name,
+        city.short_name AS name,
         sum(t.total) AS value
         FROM
         (
@@ -468,7 +468,7 @@
         a.id = r1.first_aid_id
         AND a.id = r2.first_aid_id
         AND r1.question_code = #{param.questionCode}
-        AND r1.answer = #param.answer
+        AND r1.answer = #{param.answer}
         AND r2.question_code = #{param.accordCode}
         AND r2.answer + 0 &gt;= #{param.startTime}
         AND r2.answer + 0 &lt;= #{param.endTime}