统计信息

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/AfterStatisticsController.java

@@ -64,12 +64,15 @@ public class AfterStatisticsController extends JeecgController<AfterStatistics,
 	@ApiOperation(value="after_statistics-分页列表查询", notes="after_statistics-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<AfterStatistics>> queryPageList(AfterStatistics afterStatistics,
+														String startTime,
+														String endTime,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<AfterStatistics> queryWrapper = QueryGenerator.initQueryWrapper(afterStatistics, req.getParameterMap());
 		Page<AfterStatistics> page = new Page<AfterStatistics>(pageNo, pageSize);
-		IPage<AfterStatistics> pageList = afterStatisticsService.page(page, queryWrapper);
+		IPage<AfterStatistics> pageList = afterStatisticsService.queryAfterStatistics(page, startTime,endTime);
+
 		return Result.OK(pageList);
 	}
 	

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AfterStatistics.java

@@ -72,13 +72,14 @@ public class AfterStatistics implements Serializable {
     @Excel(name = "患者姓名", width = 15)
     @ApiModelProperty(value = "患者姓名")
     private String patientName;
-	/**收费项目等级*/
-	@Excel(name = "收费项目等级", width = 15)
-    @ApiModelProperty(value = "收费项目等级")
-    private java.lang.String changeClass;
+//	/**收费项目等级*/
+//	@Excel(name = "收费项目等级", width = 15)
+//    @ApiModelProperty(value = "收费项目等级")
+//    private java.lang.String changeClass;
     /**医疗收费项目类别*/
     @Excel(name = "医疗收费项目类别", width = 15)
     @ApiModelProperty(value = "医疗收费项目类别")
+    @Dict(dicCode = "categories_items")
     private String categoriesItems;
 	/**占比统计*/
 	@Excel(name = "占比统计", width = 15)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/AfterStatisticsMapper.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.medical.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.medical.entity.AfterStatistics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,4 +18,6 @@ import org.jeecg.modules.medical.vo.StaticResponse;
 public interface AfterStatisticsMapper extends BaseMapper<AfterStatistics> {
 
     List<StaticResponse> statisticsMidRule(String startTime, String endTime);
+
+    IPage<AfterStatistics> queryAfterStatistics(Page<AfterStatistics> page, String startTime, String endTime);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterStatisticsMapper.xml

@@ -10,4 +10,20 @@
         GROUP BY medical_ins_rule_info_code
         ORDER BY num DESC limit 5
     </select>
+    <select id="queryAfterStatistics" resultType="org.jeecg.modules.medical.entity.AfterStatistics">
+
+        select a.id,a.medical_ins_rule_info_code,a.medical_ins_rule_info_name,a.doctor_id,
+               a.doctor_name,a.categories_items,a.proportion_statistics,a.statistics_date,
+               sd.depart_name as medicalDeptName,sd.medical_dept_code from after_statistics
+                   a LEFT JOIN sys_user s on a.doctor_id=s.doctor_id LEFT JOIN sys_user_depart d on s.id=d.user_id left join sys_depart sd on d.dep_id=sd.id
+        <where> 1=1
+
+            <if test="startTime != null and startTime != ''">
+                and <![CDATA[ a.statistics_date >=    DATE_FORMAT(#{startTime}, '%Y-%m-%d 00:00:00')]]>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and <![CDATA[ a.statistics_date <=  DATE_FORMAT(#{endTime}, '%Y-%m-%d 23:59:59') ]]>
+            </if>
+        </where>
+    </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IAfterStatisticsService.java

@@ -1,5 +1,8 @@
 package org.jeecg.modules.medical.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.medical.common.bo.before.MedicalHistoryRecord;
 import org.jeecg.modules.medical.entity.AfterStatistics;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.medical.vo.StaticResponse;
@@ -15,4 +18,7 @@ import java.util.List;
 public interface IAfterStatisticsService extends IService<AfterStatistics> {
 
     List<StaticResponse> statisticsMidRule(String startTime, String endTime);
+
+    IPage<AfterStatistics> queryAfterStatistics(Page<AfterStatistics> page, String startTime, String endTime);
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterStatisticsServiceImpl.java

@@ -1,7 +1,10 @@
 package org.jeecg.modules.medical.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.medical.entity.AfterStatistics;
 import org.jeecg.modules.medical.mapper.AfterStatisticsMapper;
+import org.jeecg.modules.medical.service.IAdvanceWarningAuditDetailService;
 import org.jeecg.modules.medical.service.IAfterStatisticsService;
 import org.jeecg.modules.medical.vo.StaticResponse;
 import org.springframework.stereotype.Service;
@@ -23,4 +26,9 @@ public class AfterStatisticsServiceImpl extends ServiceImpl<AfterStatisticsMappe
     public List<StaticResponse> statisticsMidRule(String startTime, String endTime) {
         return baseMapper.statisticsMidRule(startTime, endTime);
     }
+
+    @Override
+    public IPage<AfterStatistics> queryAfterStatistics(Page<AfterStatistics> page, String startTime, String endTime) {
+        return baseMapper.queryAfterStatistics(page,startTime, endTime);
+    }
 }