。。

src/main/java/com/chinaitop/depot/business/mapper/BusinessDrugStandingBookMapper.xml

@@ -541,7 +541,7 @@
   </select>
 
   <select id="queryCountByType" resultType="java.util.Map">
-    SELECT
+    <!-- SELECT
       SUM(
           CASE
           WHEN type = 1 THEN
@@ -556,6 +556,22 @@
     GROUP BY
       drug_kind
     ORDER BY
+      drug_kind -->
+      
+      SUM(
+          CASE
+          WHEN type = 1 THEN
+              cast(storage_count as DECIMAL )
+          END
+      ) storage_count,
+     SUM(cast(delivery_count as DECIMAL)) delivery_count,
+      drug_kind
+     FROM
+      business_drug_standing_book
+    where org_id = #{orgId}
+    GROUP BY
+      drug_kind
+    ORDER BY
       drug_kind
   </select>