在“统计管理—互联网医院/App商城订单统计”功能中，新增了部门、订单来源和商品等筛选条件。

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -2264,6 +2264,7 @@ public class Task {
         // 3. 批量查询所有需要的公司用户
         Set<Long> companyUserIds = contacts.stream()
                 .map(QwExternalContact::getCompanyUserId)
+                .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
         List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyUserIds(companyUserIds);
         Map<Long, CompanyUser> companyUserMap = companyUsers.stream()

fs-service/src/main/java/com/fs/his/dto/FsStoreOrderAmountScrmStatsQueryDto.java

@@ -22,4 +22,19 @@ public class FsStoreOrderAmountScrmStatsQueryDto {
      * 订单结束时间
      * */
     private String endTime;
+
+    /**
+     * 部门id
+     * */
+    private Long deptId;
+
+    /**
+     * 小程序字典值
+     * */
+    private Long source;
+
+    /**
+     * 商品名称(套餐包名称)
+     * */
+    private String packageName;
 }

fs-service/src/main/java/com/fs/his/dto/FsStoreOrderAmountStatsQueryDto.java

@@ -22,4 +22,19 @@ public class FsStoreOrderAmountStatsQueryDto {
      * 订单结束时间
      * */
     private String endTime;
+
+    /**
+     * 部门id
+     * */
+    private Long deptId;
+
+    /**
+     * 小程序字典值
+     * */
+    private Long source;
+
+    /**
+     * 商品名称(套餐包名称)
+     * */
+    private String packageName;
 }

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -2317,6 +2317,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="companyUserId != null and companyUserId !=''">
             AND company_user_id = #{companyUserId}
         </if>
+        <if test="source != null and source !=''">
+            AND source = #{source}
+        </if>
+        <if test="deptId != null and deptId !=''">
+            AND dept_id = #{deptId}
+        </if>
+        <if test="packageName != null and packageName !=''">
+            AND package_name like concat('%', #{packageName}, '%')
+        </if>
     </select>
 
     <select id="selectScheduleStatisticsVOList" resultType="com.fs.his.vo.FsStoreOrderScheduleStatisticsVO">

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1058,6 +1058,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="companyUserId != null and companyUserId !=''">
             AND company_user_id = #{companyUserId}
         </if>
+        <if test="deptId != null and deptId !=''">
+            AND dept_id = #{deptId}
+        </if>
+        <if test="packageName != null and packageName !=''">
+            AND item_json like concat('%', #{packageName}, '%')
+        </if>
     </select>