Merge branch 'release/5.12.6' of 192.168.2.80:/srv/git/pre_api into release/5.12.6

cbkj_web_api/src/main/resources/application.properties

@@ -1,13 +1,13 @@
 server.port=88
 
 #\u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.primary.username = DgUfz0nYLCR7UJ66sgG1ag==
-spring.datasource.primary.password = OPXCNabmBpi/FKayjb2kubBySH5LiQln
-spring.datasource.primary.url=jdbc:mysql://47.111.67.16:3307/cbkj_web_api_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-
-#spring.datasource.primary.username = RVYQ+dq7Z9GrSl0fYA8/Pw==
-#spring.datasource.primary.password = WwkFHCZbwqYBWP/3a378oQ==
-#spring.datasource.primary.url=jdbc:mysql://192.168.2.172:3306/cbkj_web_api_xindu?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#spring.datasource.primary.username = DgUfz0nYLCR7UJ66sgG1ag==
+#spring.datasource.primary.password = OPXCNabmBpi/FKayjb2kubBySH5LiQln
+#spring.datasource.primary.url=jdbc:mysql://47.111.67.16:3307/cbkj_web_api_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#
+spring.datasource.primary.username = RVYQ+dq7Z9GrSl0fYA8/Pw==
+spring.datasource.primary.password = WwkFHCZbwqYBWP/3a378oQ==
+spring.datasource.primary.url=jdbc:mysql://192.168.2.172:3306/cbkj_web_api_xindu?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
 
 ## redis\u914D\u7F6E
 spring.redis.host = 47.114.47.147

cbkj_web_api/src/main/resources/mappers/statistics/PrescriptionStatisticsMapper.xml

@@ -28,10 +28,10 @@
         <result column="PRE_MAT_TYPE" jdbcType="VARCHAR" property="preMatType"/>
         <result column="STORE_NAME" jdbcType="VARCHAR" property="storeName"/>
         <result column="REC_TRE_TYPE" jdbcType="VARCHAR" property="recTreType"/>
-        <result column="preDescription" jdbcType="VARCHAR" property="preDescription"/>
-        <result column="preNum" jdbcType="INTEGER" property="preNum"/>
-        <result column="matTolMoney" jdbcType="DECIMAL" property="matTolMoney"/>
-        <result column="preTolMoney" jdbcType="DECIMAL" property="preTolMoney"/>
+        <result column="PRE_DESCRIPTION" jdbcType="VARCHAR" property="preDescription"/>
+        <result column="PRE_NUM" jdbcType="INTEGER" property="preNum"/>
+        <result column="MAT_TOL_MONEY" jdbcType="DECIMAL" property="matTolMoney"/>
+        <result column="PRE_TOL_MONEY" jdbcType="DECIMAL" property="preTolMoney"/>
         <result column="mats" jdbcType="VARCHAR" property="mats"/>
     </resultMap>
 
@@ -79,7 +79,9 @@
             when '3' then '方剂搜索'
             when '4' then '协定方'
             when '5' then '专家经验共享'
+            when '6' then '我的验案'
             when '7' then '名家验案'
+            when '8' then '历史病历'
             when '9' then '国医大师'
             when '10' then '配方'
             when '11' then '传承经方'
@@ -94,7 +96,10 @@
 <!--        p.PRE_MAT_TYPE,-->
         (select DISPLAY_NAME from t_display d where d.STORE_ID = p.STORE_ID limit 1) STORE_NAME,
         case r.REC_TRE_TYPE when '1' then '门诊' when '2' then '住院' end REC_TRE_TYPE,
-        p.PRE_DESCRIPTION,
+        CASE p.PRE_TYPE
+            WHEN '1' THEN CONCAT(p.PRE_DESCRIPTION, '，', PRE_FREQUENCY, '，每次', PRE_N_ML, 'ml')
+            WHEN '2' THEN CONCAT(p.PRE_SMOKE_TYPE, '，', PRE_FREQUENCY, '，每袋', PRE_N_ML, 'ml')
+        END PRE_DESCRIPTION,
         p.PRE_NUM,
         p.MAT_TOL_MONEY,
         p.PRE_TOL_MONEY,
@@ -110,7 +115,9 @@
         left join t_prescription_item i on i.PRE_ID = p.PRE_ID
         <include refid="detailedWhere"/>
         GROUP BY p.PRE_ID
-        limit #{offset}, #{limit}
+        <if test="limit != null">
+            limit #{offset}, #{limit}
+        </if>
     </select>
 
     <sql id="detailedWhere">