From f0c2d7252b960e5224de90d554b0f5a8d2ee50bb Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 28 Aug 2020 11:13:40 +0800
Subject: [PATCH] 1.增加最后一次扣费后,将诊断id写入redis 2.注册的时候,职称转换后超过50位长度自动截断
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index e6fa3d0..62b425d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -168,7 +168,10 @@
product_order_detail DE
LEFT JOIN product_order PRO ON DE.order_id = PRO.id
<include refid="whereforall"/>
- order by DE.pro_endtime asc,DE.id asc
+ order by
+ DE.pro_endtime ASC,
+ DE.pro_begintime ASC,
+ DE.id asc
</select>
<select id="getEnabledCount" resultType="int" parameterType="long">
@@ -193,7 +196,7 @@
</if>
<if test="datatype==1">
-- 套餐总量
- SELECT count(*) FROM product_order WHERE is_del=0 and enabled=1
+ SELECT count(*) FROM sys_product WHERE is_del=0 and enabled=1
</if>
<if test="datatype==2">
-- 未处理用户反馈
@@ -206,7 +209,7 @@
</select>
<select id="productOrderChart" resultType="com.kidgrow.oprationcenter.vo.OrderChartVo">
- <if test="p.units==1">
+ <if test="p.datatype==1">
-- 按年统计
SELECT COUNT(t.id) ccount,t.units FROM
(select id,DATE_FORMAT(contract_time,'%Y/%m') units,contract_time from product_order
@@ -214,7 +217,7 @@
) AS t
GROUP BY t.units
</if>
- <if test="p.units==2">
+ <if test="p.datatype==2">
-- 按月统计
SELECT COUNT(t.id) ccount,t.units FROM
(select id,DATE_FORMAT(contract_time,'%Y') units,contract_time from product_order
@@ -246,7 +249,19 @@
pro_id,
pro_name
ORDER BY
- procount DESC
+ ccount DESC
LIMIT 10
</select>
+ <select id="departmentProductDetail" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
+ SELECT
+ *
+FROM
+ product_order_detail
+WHERE
+ order_id IN ( SELECT id FROM product_order WHERE hospital_id = #{hospitalId} AND department_id = #{departmentId} AND is_del = 0 AND enabled = 1 )
+ AND is_del = 0
+ AND enabled = 1
+ORDER BY
+ create_time DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0