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 |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 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 d6a5627..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">
@@ -249,4 +252,16 @@
 	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