bug修复

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/ReportAfterQueryResponseBO.java

@@ -26,7 +26,7 @@ public class ReportAfterQueryResponseBO implements Serializable {
     @ApiModelProperty(value = "科室编码")
     private String medicalDeptCode;
 
-    @Excel(name = "科室医生总数", width = 15)
+//    @Excel(name = "科室医生总数", width = 15)
     @ApiModelProperty(value = "科室医生总数")
     private Integer deptDoctorTotal;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/mid/response/MidAuditDoctorInfo.java

@@ -33,4 +33,6 @@ public class MidAuditDoctorInfo {
 
     @ApiModelProperty(value = "医生处理意见")
     private String feedbackResult;
+
+    private String doctorLevel;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/mid/response/MidDeptAuditDetailResponse.java

@@ -24,7 +24,7 @@ public class MidDeptAuditDetailResponse implements Serializable {
     @ApiModelProperty(value = "科室编码")
     private java.lang.String medicalDeptCode;
 
-    @Excel(name = "科室医生总数", width = 15)
+//    @Excel(name = "科室医生总数", width = 15)
     @ApiModelProperty(value = "科室医生总数")
     private Integer deptDoctorTotal;
 

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

@@ -23,9 +23,11 @@ import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.entity.MedicalDoctorAppealRecord;
 import org.jeecg.modules.medical.entity.PrescriptionOrder;
 import org.jeecg.modules.medical.service.IAfterwardsAuditService;
+import org.jeecg.modules.medical.service.IPrescriptionOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -51,6 +53,8 @@ import java.util.List;
 public class AfterwardsAuditController extends JeecgController<AfterwardsAudit, IAfterwardsAuditService> {
 	@Autowired
 	private IAfterwardsAuditService afterwardsAuditService;
+	@Autowired
+	private IPrescriptionOrderService prescriptionOrderService;
 
 	 @ApiOperation(value="获取-审核列表", notes="审核列表")
 	 @GetMapping(value = "/audit/list")
@@ -88,9 +92,20 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 
 	 @ApiOperation(value = "审核端-医嘱信息")
 	 @GetMapping(value = "/audit/medicalorder/info")
-	 public Result<List<PrescriptionOrder>> loadMedicalOrderInfoResponseInfo(HttpServletRequest request, @RequestParam(value = "id") Integer id) {
-		 List<PrescriptionOrder> result = afterwardsAuditService.loadMedicalOrderInfo(id);
-		 return Result.OK(result);
+	 public Result<IPage<PrescriptionOrder>> loadMedicalOrderInfoResponseInfo(HttpServletRequest request, @RequestParam(value = "id") Integer id, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																			  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 String prescriptionNumber = "";
+		 AfterwardsAudit byId1 = afterwardsAuditService.getById(id);
+		 if (byId1 != null) {
+			 prescriptionNumber = byId1.getOutpatientNumber();
+		 }
+
+		 PrescriptionOrder prescriptionOrder =new PrescriptionOrder();
+		 prescriptionOrder.setInpOutpatientNumber(prescriptionNumber);
+		 QueryWrapper<PrescriptionOrder> queryWrapper = QueryGenerator.initQueryWrapper(prescriptionOrder, request.getParameterMap());
+		 Page<PrescriptionOrder> page = new Page<PrescriptionOrder>(pageNo, pageSize);
+		 IPage<PrescriptionOrder> pageList = prescriptionOrderService.page(page, queryWrapper);
+		 return Result.OK("获取成功", pageList);
 	 }
 
 	@ApiOperation(value = "审核端-医院结算明细")
@@ -177,6 +192,10 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 		if (ObjectUtils.nullSafeEquals(param.getCheckState(), AfterwardsAuditStatusEnum.process.getStatus())) {
 			queryWrapper.eq("review_results", "issue_review");
 		}
+		if (oConvertUtils.isNotEmpty(param.getCheckState())){
+			queryWrapper.eq("check_state", param.getCheckState());
+		}
+
 		if (oConvertUtils.isNotEmpty(param.getAdmissionNumber())) {
 			queryWrapper.eq("outpatient_number", "issue_review");
 		}

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

@@ -3,8 +3,10 @@ package org.jeecg.modules.medical.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,12 +23,9 @@ import org.jeecg.modules.medical.common.bo.mid.response.MidAuditDetailResponse;
 import org.jeecg.modules.medical.common.bo.mid.response.MidAuditViolateProjectStatisticsResponse;
 import org.jeecg.modules.medical.common.bo.mid.response.MidDeptAuditDetailResponse;
 import org.jeecg.modules.medical.entity.PrescriptionOrder;
-import org.jeecg.modules.medical.service.IAdvanceWarningAuditService;
+import org.jeecg.modules.medical.service.*;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
-import org.jeecg.modules.medical.service.IAfterwardsAuditDetailService;
-import org.jeecg.modules.medical.service.IAfterwardsAuditService;
-import org.jeecg.modules.medical.service.IViolationAnalysisService;
 import org.jeecg.modules.medical.service.impl.ExportUtilHelperService;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +64,7 @@ public class ViolationAnalysisController {
     @Autowired
     private ExportUtilHelperService exportUtilHelperService;
     @Autowired
-    private IAdvanceWarningAuditService advanceWarningAuditService;
+    private IPrescriptionOrderService prescriptionOrderService;
     @Autowired
     private IAfterwardsAuditService afterwardsAuditService;
     @Autowired
@@ -411,18 +410,28 @@ public class ViolationAnalysisController {
 
     @ApiOperation(value = "违规分析-医嘱信息")
     @GetMapping(value = "/audit/medicalorder/info")
-    public Result<List<PrescriptionOrder>> loadMedicalOrderInfoResponseInfo(HttpServletRequest request, @RequestParam(value = "detialId", required = false) Integer detialId) {
-       /* LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (null == loginUser) {
-            log.error("当前用户未登录");
-            throw new JeecgBootException("用户未登录"); // "登录已过期，请重新登录"
+    public Result<IPage<PrescriptionOrder>> loadMedicalOrderInfoResponseInfo(HttpServletRequest request, @RequestParam(value = "detialId", required = false) Integer detialId,
+                                                                            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+
+        String prescriptionNumber = "";
+        AfterwardsAuditDetail byId1 = afterwardsAuditDetailService.getById(detialId);
+        if (byId1 != null) {
+            prescriptionNumber = byId1.getOutpatientNumber();
         }
-        if (detialId == null) {
-            return Result.OK(new ArrayList<>());
-        }*/
-        List<PrescriptionOrder> result = violationAnalysisService.loadPrescriptionOrderInfo(detialId);
 
-        return Result.OK(result);
+        PrescriptionOrder prescriptionOrder =new PrescriptionOrder();
+        prescriptionOrder.setInpOutpatientNumber(prescriptionNumber);
+        QueryWrapper<PrescriptionOrder> queryWrapper = QueryGenerator.initQueryWrapper(prescriptionOrder, request.getParameterMap());
+        Page<PrescriptionOrder> page = new Page<PrescriptionOrder>(pageNo, pageSize);
+        IPage<PrescriptionOrder> pageList = prescriptionOrderService.page(page, queryWrapper);
+        return Result.OK(pageList);
+
+
+
+
+
+//        return Result.OK(result);
     }
 
 
@@ -438,6 +447,7 @@ public class ViolationAnalysisController {
                     q1.eq("proejct_code", afterwardsAuditDetail.getSearchContent().trim()).or().eq("proejct_name", afterwardsAuditDetail.getSearchContent().trim())
             );
         }
+        queryWrapper.orderByDesc("create_time");
         Page<AfterwardsAuditDetail> page = new Page<AfterwardsAuditDetail>(pageNo, pageSize);
         IPage<AfterwardsAuditDetail> pageList = afterwardsAuditDetailService.page(page, queryWrapper);
         return Result.OK(pageList);

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

@@ -1,20 +1,30 @@
 package org.jeecg.modules.medical.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.medical.common.bo.DiagnosticInfoResponse;
 import org.jeecg.modules.medical.common.bo.InpatientSettlementDetailResponse;
 import org.jeecg.modules.medical.common.bo.InpatientSettlementMasterResponse;
 import org.jeecg.modules.medical.common.bo.MedicalInsuranceProjectDetailsResponse;
+import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.entity.PrescriptionOrder;
+import org.jeecg.modules.medical.entity.TreatmentItems;
+import org.jeecg.modules.medical.service.IAfterwardsAuditService;
+import org.jeecg.modules.medical.service.IPrescriptionOrderService;
 import org.jeecg.modules.medical.service.IViolationAnalysisService;
 import org.jeecg.modules.medical.service.IViolationAuditAfterService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -37,12 +47,32 @@ public class ViolationAuditAfterController {
 
     @Autowired
     private IViolationAuditAfterService violationAuditAfterService;
+    @Autowired
+    private IAfterwardsAuditService afterwardsAuditService;
+    @Autowired
+    private IPrescriptionOrderService prescriptionOrderService;
 
     @ApiOperation(value = "违规分析-医嘱信息")
     @GetMapping(value = "/audit/medicalorder/info")
-    public Result<List<PrescriptionOrder>> loadMedicalOrderInfoResponseInfo(HttpServletRequest request, @RequestParam(value = "id", required = false) Integer id) {
-        List<PrescriptionOrder> result = violationAuditAfterService.loadPrescriptionOrderInfo(id);
-        return Result.OK(result);
+    public Result<IPage<PrescriptionOrder>> loadMedicalOrderInfoResponseInfo(HttpServletRequest request,
+                                                                             @RequestParam(value = "id", required = false) Integer id,
+                                                                             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+
+        String prescriptionNumber = "";
+        AfterwardsAudit byId1 = afterwardsAuditService.getById(id);
+        if (byId1 != null) {
+            prescriptionNumber = byId1.getOutpatientNumber();
+        }
+        if (!StringUtils.hasText(prescriptionNumber)) {
+            throw new JeecgBootException("找不到主单记录");
+        }
+        PrescriptionOrder prescriptionOrder =new PrescriptionOrder();
+        prescriptionOrder.setInpOutpatientNumber(prescriptionNumber);
+        QueryWrapper<PrescriptionOrder> queryWrapper = QueryGenerator.initQueryWrapper(prescriptionOrder, request.getParameterMap());
+        Page<PrescriptionOrder> page = new Page<PrescriptionOrder>(pageNo, pageSize);
+        IPage<PrescriptionOrder> pageList = prescriptionOrderService.page(page, queryWrapper);
+        return Result.OK(pageList);
     }
 
     @ApiOperation(value = "违规分析-医院结算明细")

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

@@ -53,5 +53,6 @@ public interface AdvanceWarningAuditMapper extends BaseMapper<AdvanceWarningAudi
 
     List<PrescriptionDetail> listPrescriptionsByCasePatientId(@Param("patientId") String patientId, @Param("tableName") String tableName);
 
-    List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate);
-}
+    List<Integer> statisticsLine(String startTime, String endTime);
+
+ }

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

@@ -101,11 +101,12 @@ public interface AfterwardsAuditMapper extends BaseMapper<AfterwardsAudit> {
     BigDecimal statisticsAfterAuditTotal(@Param("ew") AfterDeptDetailRequest afterwardsAuditDetail);
 
 
-    List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate);
+    List<Integer> statisticsLine(String startTimeDate, String endTimeDate);
 
     List<StaticResponse> statisticsAfterRule(String startTime, String endTime);
 
     List<StaticResponse> statisticsDoctorViolate(String startTime, String endTime);
 
     List<StaticResponse> statisticsProject(String startTime, String endTime);
+    Double statisticsAmount(String startTime, String endTime);
 }

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

@@ -37,9 +37,9 @@ public interface MidIncidentAuditMapper extends BaseMapper<MidIncidentAudit> {
 
     List<DiagnosticInfoResponse> loadDiagnosticInfo(@Param("id") Integer id);
 
-    List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate);
+    List<Integer> statisticsLine(String startTime, String endTime);
 
-    List<StaticResponse> statisticsMidRule(String startTimeDate, String endTimeDate);
+    List<StaticResponse> statisticsMidRule(String startTime, String endTime);
 
     List<StaticResponse> statisticsDoctorViolate(String startTime, String endTime);
 }

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

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface OutpatientSettleBillMapper extends BaseMapper<OutpatientSettleBill> {
 
+    Integer statisticsVisit(String startTime, String endTime);
 }

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

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PrescriptionOrderMapper extends BaseMapper<PrescriptionOrder> {
 
+    Integer statisticsFormula(String startTime, String endTime);
 }

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

@@ -198,11 +198,12 @@
                 LEFT JOIN
             advance_warning_audit a ON CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) = DATE_FORMAT(a.create_time, '%Y-%m-%d')
         WHERE
-            CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) BETWEEN DATE_FORMAT(#{startTimeDate}, '%Y-%m-%d')  AND DATE_FORMAT(#{endTimeDate}, '%Y-%m-%d')
+            CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) BETWEEN DATE_FORMAT(#{startTime}, '%Y-%m-%d')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d')
         GROUP BY
             m.mmdd
         ORDER BY
             m.mmdd ASC;
     </select>
 
+
 </mapper>

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

@@ -421,5 +421,13 @@
         GROUP BY a.proejct_code
         ORDER BY num DESC limit 5
     </select>
+    <select id="statisticsAmount" resultType="java.lang.Double">
+
+        SELECT     sum(amount) amount
+
+        FROM afterwards_audit_detail as a
+        where a.create_time BETWEEN DATE_FORMAT(#{startTime}, '%Y-%m-%d 00:00:00')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d 23:59:59')
+
+    </select>
 
 </mapper>

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

@@ -12,5 +12,6 @@
             afterwards_audit_id = #{afterwardsAuditId,jdbcType=INTEGER}
           AND medical_dept_code = #{medicalDeptCode,jdbcType=VARCHAR}
           AND doctor_id = #{doctorId,jdbcType=VARCHAR}
+        and appeal_status!='agree_audit'
     </select>
 </mapper>

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

@@ -231,6 +231,7 @@
         mid.medical_dept_code,
         mid.doctor_name,
         mid.doctor_id,
+        mid.doctor_level,
         mid.create_time,
         mid.amount,
         mia.feedback_code,
@@ -284,7 +285,7 @@
                 LEFT JOIN
             mid_incident_audit a ON CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) = DATE_FORMAT(a.create_time, '%Y-%m-%d')
         WHERE
-            CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) BETWEEN DATE_FORMAT(#{startTimeDate}, '%Y-%m-%d')  AND DATE_FORMAT(#{endTimeDate}, '%Y-%m-%d')
+            CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) BETWEEN DATE_FORMAT(#{startTime}, '%Y-%m-%d')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d')
         GROUP BY
             m.mmdd
         ORDER BY
@@ -293,7 +294,7 @@
     <select id="statisticsMidRule" resultType="org.jeecg.modules.medical.vo.StaticResponse">
         SELECT  medical_project_name as name,IFNULL(count(m.medical_project_code), 0) as num,
                  from mid_incident_audit_detail m
-        where m.create_time BETWEEN DATE_FORMAT(#{startTimeDate}, '%Y-%m-%d 00:00:00')  AND DATE_FORMAT(#{endTimeDate}, '%Y-%m-%d 23:59:59')
+        where m.create_time BETWEEN DATE_FORMAT(#{startTime}, '%Y-%m-%d 00:00:00')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d 23:59:59')
         GROUP BY medical_project_code
         ORDER BY num DESC limit 5
     </select>
@@ -303,7 +304,7 @@
 
         SELECT  doctor_name as name,IFNULL(count(m.doctor_id), 0) as num
         from mid_incident_audit_detail m
-        where m.create_time BETWEEN DATE_FORMAT(#{startTimeDate}, '%Y-%m-%d 00:00:00')  AND DATE_FORMAT(#{endTimeDate}, '%Y-%m-%d 23:59:59')
+        where m.create_time BETWEEN DATE_FORMAT(#{startTime}, '%Y-%m-%d 00:00:00')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d 23:59:59')
 
         GROUP BY m.doctor_id
         ORDER BY num DESC limit 5

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

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.medical.mapper.OutpatientSettleBillMapper">
 
+    <select id="statisticsVisit" resultType="java.lang.Integer">
+        SELECT
+            COUNT(a.id) AS num
+        FROM
+            medical_date m
+                LEFT JOIN
+            outpatient_settle_bill a ON CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) = DATE_FORMAT(a.input_time, '%Y-%m-%d')
+        WHERE
+            CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) BETWEEN DATE_FORMAT(#{startTime}, '%Y-%m-%d')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        group by a.visit_no
+    </select>
 </mapper>

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

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.medical.mapper.PrescriptionOrderMapper">
 
+    <select id="statisticsFormula" resultType="java.lang.Integer">
+        SELECT
+            COUNT(a.id) AS num
+        FROM
+            medical_date m
+                LEFT JOIN
+            prescription_order a ON CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) = DATE_FORMAT(a.input_time, '%Y-%m-%d')
+        WHERE
+            CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) BETWEEN DATE_FORMAT(#{startTime}, '%Y-%m-%d')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+            group by a.order_number
+    </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/response/DashboardStatisticsBarResponse.java

@@ -16,6 +16,7 @@ import java.math.BigDecimal;
 public class DashboardStatisticsBarResponse implements Serializable {
 
     @ApiModelProperty(value = "当日刷卡数")
+    //改为门诊数
     private Integer swipesTotal;
     @ApiModelProperty(value = "当日提醒数")
     private Integer beforeReminderTotal;
@@ -24,7 +25,7 @@ public class DashboardStatisticsBarResponse implements Serializable {
     @ApiModelProperty(value = "事中审查数")
     private Integer middleReviewTotal;
     @ApiModelProperty(value = "违规金额")
-    private BigDecimal violationAmountTotal;
+    private Double violationAmountTotal;
     @ApiModelProperty(value = "事后监管数")
     private Integer afterSupervisoryTotal;
 }

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

@@ -57,5 +57,5 @@ public interface IAdvanceWarningAuditService extends IService<AdvanceWarningAudi
      */
     List<PrescriptionDetail> listPrescriptionsByCaseAndPatientId(String patientId, String treatmentType);
 
-    List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate);
+    List<Integer> statisticsLine(String startTimeDate, String endTimeDate);
 }

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

@@ -138,10 +138,11 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
     ModelAndView auditExportXls(HttpServletRequest req, AfterwardsAudit afterwardsAudit, Class<AfterwardsAuditExportResponse> clazz, String title) throws UnsupportedEncodingException;
 
 
-    List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate);
+    List<Integer> statisticsLine(String startTimeDate, String endTimeDate);
 
     List<StaticResponse> statisticsAfterRule(String startTime, String endTime);
     List<StaticResponse> statisticsDoctorViolate(String startTime, String endTime);
 
     List<StaticResponse> statisticsProject(String startTime, String endTime);
+    Double statisticsAmount(String startTime, String endTime);
 }

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

@@ -55,7 +55,7 @@ public interface IMidIncidentAuditService extends IService<MidIncidentAudit> {
      */
     List<DiagnosticInfoResponse> loadDiagnosticInfo(Integer midIncidentAuditId);
 
-    List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate);
+    List<Integer> statisticsLine(String startTimeDate, String endTimeDate);
     List<StaticResponse> statisticsMidRule(String startTimeDate, String endTimeDate);
 
     List<StaticResponse> statisticsDoctorViolate(String startTime, String endTime);

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

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IOutpatientSettleBillService extends IService<OutpatientSettleBill> {
 
+    Integer statisticsVisit(String startTime, String endTime);
 }

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

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IPrescriptionOrderService extends IService<PrescriptionOrder> {
 
+    Integer statisticsFormula(String startTime, String endTime);
 }

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

@@ -291,7 +291,9 @@ public class AdvanceWarningAuditServiceImpl extends ServiceImpl<AdvanceWarningAu
     }
 
     @Override
-    public List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate) {
+    public List<Integer> statisticsLine(String startTimeDate, String endTimeDate) {
         return baseMapper.statisticsLine(startTimeDate,endTimeDate);
     }
+
+
 }

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

@@ -353,7 +353,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
             throw new JeecgBootException("审查结果非下发复核状态，请检查！");
         }
 
-        Integer appealNumber = 1;
+        Integer appealNumber = 0;
         // 获取过往的申诉记录,取出最大次数
         MedicalDoctorAppealRecord historyAppealRecord = appealRecordService.loadMaxAppealNumber(audit.getId(), audit.getMedicalDeptCode(), audit.getDoctorId());
         if (historyAppealRecord != null && historyAppealRecord.getAppealNumber() != null && historyAppealRecord.getAppealNumber() > 0) {
@@ -662,7 +662,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     }
 
     @Override
-    public List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate) {
+    public List<Integer> statisticsLine(String startTimeDate, String endTimeDate) {
         return baseMapper.statisticsLine(startTimeDate,endTimeDate);
     }
 
@@ -680,4 +680,8 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     public List<StaticResponse> statisticsProject(String startTime, String endTime) {
         return baseMapper.statisticsProject(startTime,endTime);
     }
+    @Override
+    public Double statisticsAmount(String startTime, String endTime) {
+        return baseMapper.statisticsAmount(startTime,endTime);
+    }
 }

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

@@ -4,14 +4,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.aspectj.lang.annotation.Before;
 import org.jeecg.modules.medical.entity.AdvanceWarningAudit;
+import org.jeecg.modules.medical.entity.PrescriptionOrder;
 import org.jeecg.modules.medical.response.DashboardStatisticsBarResponse;
 import org.jeecg.modules.medical.response.DashboardStatisticsDetailedItem;
 import org.jeecg.modules.medical.response.DashboardStatisticsLineResponse;
 import org.jeecg.modules.medical.response.DashboardStatisticsViolateResponse;
-import org.jeecg.modules.medical.service.IAdvanceWarningAuditService;
-import org.jeecg.modules.medical.service.IAfterwardsAuditService;
-import org.jeecg.modules.medical.service.IHomePageService;
-import org.jeecg.modules.medical.service.IMidIncidentAuditService;
+import org.jeecg.modules.medical.service.*;
 import org.jeecg.modules.medical.vo.StaticResponse;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.utils.DateTimeUtil;
@@ -37,11 +35,15 @@ public class HomePageServiceImpl implements IHomePageService {
     private IMidIncidentAuditService midIncidentAuditService;
     @Autowired
     private IAfterwardsAuditService afterwardsAuditService;
+    @Autowired
+    private IOutpatientSettleBillService outpatientSettleBillService;
+    @Autowired
+    private IPrescriptionOrderService prescriptionOrderService;
 
     @Override
     public DashboardStatisticsBarResponse loadStatisticsBar(String startTime, String endTime) {
-        DashboardStatisticsBarResponse sourceData = getSourceData();
-
+        //只算当日 数量统计汇总
+        DashboardStatisticsBarResponse sourceData = getSourceData(startTime, endTime);
         DashboardStatisticsBarResponse result = new DashboardStatisticsBarResponse();
         result.setSwipesTotal(sourceData.getSwipesTotal());
         result.setBeforeReminderTotal(sourceData.getBeforeReminderTotal());
@@ -49,42 +51,27 @@ public class HomePageServiceImpl implements IHomePageService {
         result.setMiddleReviewTotal(sourceData.getMiddleReviewTotal());
         result.setViolationAmountTotal(sourceData.getViolationAmountTotal());
         result.setAfterSupervisoryTotal(sourceData.getAfterSupervisoryTotal());
-
-        Date startTimeDate = DateTimeUtil.parse(startTime, DateTimeUtil.FULL_STYLE);
-        Date endTimeDate = DateTimeUtil.parse(endTime, DateTimeUtil.FULL_STYLE);
-
-        long diffDay = DateTimeUtil.subDay(startTimeDate, endTimeDate);
-
-        if (diffDay > 0) {
-            for (int i = 0; i <= diffDay; i++) {
-                Date ss = DateTimeUtil.addDay(startTimeDate, (long) i);
-
-
-                result.setSwipesTotal(result.getSwipesTotal());
-
-                result.setBeforeReminderTotal(result.getBeforeReminderTotal());
-
-                result.setFormulaTotal(result.getFormulaTotal());
-
-                result.setMiddleReviewTotal(result.getMiddleReviewTotal());
-
-                result.setViolationAmountTotal(result.getViolationAmountTotal());
-
-                result.setAfterSupervisoryTotal(result.getAfterSupervisoryTotal());
-            }
-        }
-
+//        Date startTimeDate = DateTimeUtil.parse(startTime, DateTimeUtil.FULL_STYLE);
+//        Date endTimeDate = DateTimeUtil.parse(endTime, DateTimeUtil.FULL_STYLE);
+//        long diffDay = DateTimeUtil.subDay(startTimeDate, endTimeDate);
+        result.setSwipesTotal(result.getSwipesTotal());
+        result.setBeforeReminderTotal(result.getBeforeReminderTotal());
+        result.setFormulaTotal(result.getFormulaTotal());
+        result.setMiddleReviewTotal(result.getMiddleReviewTotal());
+        result.setViolationAmountTotal(result.getViolationAmountTotal());
+        result.setAfterSupervisoryTotal(result.getAfterSupervisoryTotal());
         return result;
     }
 
-    private static DashboardStatisticsBarResponse getSourceData() {
+    public DashboardStatisticsBarResponse getSourceData(String startTime, String endTime) {
         DashboardStatisticsBarResponse sourceData = new DashboardStatisticsBarResponse();
-        sourceData.setSwipesTotal(300);
-        sourceData.setBeforeReminderTotal(260);
-        sourceData.setFormulaTotal(280);
-        sourceData.setMiddleReviewTotal(100);
-        sourceData.setViolationAmountTotal(new BigDecimal("2880.05"));
-        sourceData.setAfterSupervisoryTotal(90);
+        //只算当日
+        sourceData.setSwipesTotal(outpatientSettleBillService.statisticsVisit(startTime, endTime));
+        sourceData.setBeforeReminderTotal(advanceWarningAuditService.statisticsLine(startTime, endTime).get(0).intValue());
+        sourceData.setFormulaTotal(prescriptionOrderService.statisticsFormula(startTime, endTime));
+        sourceData.setMiddleReviewTotal(midIncidentAuditService.statisticsLine(startTime, endTime).get(0).intValue());
+        sourceData.setViolationAmountTotal(afterwardsAuditService.statisticsAmount(startTime, endTime));
+        sourceData.setAfterSupervisoryTotal(afterwardsAuditService.statisticsLine(startTime, endTime).get(0).intValue());
         return sourceData;
     }
 
@@ -139,9 +126,9 @@ public class HomePageServiceImpl implements IHomePageService {
             xDateList.add(xDate);
         }
 
-        beforeReminderList = advanceWarningAuditService.statisticsLine(startTimeDate, endTimeDate);
-        middleReviewList = midIncidentAuditService.statisticsLine(startTimeDate, endTimeDate);
-        afterList = afterwardsAuditService.statisticsLine(startTimeDate, endTimeDate);
+        beforeReminderList = advanceWarningAuditService.statisticsLine(startTime, endTime);
+        middleReviewList = midIncidentAuditService.statisticsLine(startTime, endTime);
+        afterList = afterwardsAuditService.statisticsLine(startTime, endTime);
 
         JSONObject before = new JSONObject();
         before.put("title", "事前提醒");
@@ -185,13 +172,13 @@ public class HomePageServiceImpl implements IHomePageService {
         // 生成事前规则类型排名
         DashboardStatisticsDetailedItem beforeRulesTop = generateBeforeRuleTop(sourceData);
         // 生成事中规则类型排名
-        DashboardStatisticsDetailedItem middleRulesTop = generateMiddleRuleTop(startTime,endTime);
+        DashboardStatisticsDetailedItem middleRulesTop = generateMiddleRuleTop(startTime, endTime);
         // 生成事后规则类型排名
-        DashboardStatisticsDetailedItem afterRulesTop = generateAfterRuleTop(startTime,endTime);
+        DashboardStatisticsDetailedItem afterRulesTop = generateAfterRuleTop(startTime, endTime);
         // 生成事中医生违规数排名前五
-        DashboardStatisticsDetailedItem middleDoctorsViolateTop = generateMiddleDoctorsViolateTop(startTime,endTime);
+        DashboardStatisticsDetailedItem middleDoctorsViolateTop = generateMiddleDoctorsViolateTop(startTime, endTime);
         // 生成事后医生违规数排名前五
-        DashboardStatisticsDetailedItem afterDoctorsViolateTop = generateAfterDoctorsViolateTop(startTime,endTime);
+        DashboardStatisticsDetailedItem afterDoctorsViolateTop = generateAfterDoctorsViolateTop(startTime, endTime);
 
         result.setBeforeRulesTop(beforeRulesTop);
         result.setMiddleRulesTop(middleRulesTop);
@@ -205,11 +192,10 @@ public class HomePageServiceImpl implements IHomePageService {
     @Override
     public List<JSONObject> loadStatisticsPieChart(String startTime, String endTime) {
         List<JSONObject> result = new ArrayList<>();
-
-        List<StaticResponse>  hashMaps = afterwardsAuditService.statisticsProject(startTime, endTime);
-        hashMaps.forEach(it->{
+        List<StaticResponse> hashMaps = afterwardsAuditService.statisticsProject(startTime, endTime);
+        hashMaps.forEach(it -> {
             JSONObject item = new JSONObject();
-            item.put("title",it.getName());
+            item.put("title", it.getName());
             item.put("total", it.getNum());
             result.add(item);
         });
@@ -223,7 +209,7 @@ public class HomePageServiceImpl implements IHomePageService {
      * @param
      * @return
      */
-    private DashboardStatisticsDetailedItem generateAfterDoctorsViolateTop(String startTime,String endTime) {
+    private DashboardStatisticsDetailedItem generateAfterDoctorsViolateTop(String startTime, String endTime) {
         Integer afterSupervisoryTotal = 121;
         DashboardStatisticsDetailedItem afterDoctorsViolateTop = new DashboardStatisticsDetailedItem();
         afterDoctorsViolateTop.setTitle("事后医生违规数排名前五");
@@ -231,10 +217,10 @@ public class HomePageServiceImpl implements IHomePageService {
         ArrayList<JSONObject> rule = new ArrayList<>();
 
 
-        List<StaticResponse>  hashMaps = afterwardsAuditService.statisticsDoctorViolate(startTime, endTime);
-        hashMaps.forEach(it->{
+        List<StaticResponse> hashMaps = afterwardsAuditService.statisticsDoctorViolate(startTime, endTime);
+        hashMaps.forEach(it -> {
             JSONObject item = new JSONObject();
-            item.put("title",it.getName());
+            item.put("title", it.getName());
             item.put("total", it.getNum());
             rule.add(item);
         });
@@ -248,7 +234,7 @@ public class HomePageServiceImpl implements IHomePageService {
      * @param
      * @return
      */
-    private DashboardStatisticsDetailedItem generateMiddleDoctorsViolateTop(String startTime,String endTime) {
+    private DashboardStatisticsDetailedItem generateMiddleDoctorsViolateTop(String startTime, String endTime) {
         // 事中提醒总和
         Integer middleReviewTotal = 3456;
         DashboardStatisticsDetailedItem middleDoctorsViolateTop = new DashboardStatisticsDetailedItem();
@@ -256,10 +242,10 @@ public class HomePageServiceImpl implements IHomePageService {
         middleDoctorsViolateTop.setTotal(middleReviewTotal);
         ArrayList<JSONObject> rule = new ArrayList<>();
 
-        List<StaticResponse>  hashMaps = midIncidentAuditService.statisticsDoctorViolate(startTime, endTime);
-        hashMaps.forEach(it->{
+        List<StaticResponse> hashMaps = midIncidentAuditService.statisticsDoctorViolate(startTime, endTime);
+        hashMaps.forEach(it -> {
             JSONObject item = new JSONObject();
-            item.put("title",it.getName());
+            item.put("title", it.getName());
             item.put("total", it.getNum());
             rule.add(item);
         });
@@ -273,7 +259,7 @@ public class HomePageServiceImpl implements IHomePageService {
      * @param
      * @return
      */
-    private DashboardStatisticsDetailedItem generateAfterRuleTop(String startTime,String endTime) {
+    private DashboardStatisticsDetailedItem generateAfterRuleTop(String startTime, String endTime) {
         DashboardStatisticsDetailedItem afterRulesTop = new DashboardStatisticsDetailedItem();
         afterRulesTop.setTitle("事后规则类型排名");
         ArrayList<JSONObject> rule = new ArrayList<>();
@@ -281,10 +267,10 @@ public class HomePageServiceImpl implements IHomePageService {
         afterRulesTop.setTotal(afterSupervisoryTotal);
 
 
-        List<StaticResponse>  hashMaps = afterwardsAuditService.statisticsAfterRule(startTime, endTime);
-        hashMaps.forEach(it->{
+        List<StaticResponse> hashMaps = afterwardsAuditService.statisticsAfterRule(startTime, endTime);
+        hashMaps.forEach(it -> {
             JSONObject item = new JSONObject();
-            item.put("title",it.getName());
+            item.put("title", it.getName());
             item.put("total", it.getNum());
             rule.add(item);
         });
@@ -334,10 +320,10 @@ public class HomePageServiceImpl implements IHomePageService {
         ArrayList<JSONObject> rule = new ArrayList<>();
         Integer total = 345;
         middleRulesTop.setTotal(total);
-        List<StaticResponse>  hashMaps = midIncidentAuditService.statisticsMidRule(startTime, endTime);
-        hashMaps.forEach(it->{
+        List<StaticResponse> hashMaps = midIncidentAuditService.statisticsMidRule(startTime, endTime);
+        hashMaps.forEach(it -> {
             JSONObject item = new JSONObject();
-            item.put("title",it.getName());
+            item.put("title", it.getName());
             item.put("total", it.getNum());
             rule.add(item);
         });

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

@@ -63,7 +63,7 @@ public class MidIncidentAuditServiceImpl extends ServiceImpl<MidIncidentAuditMap
     }
 
     @Override
-    public List<Integer> statisticsLine(Date startTimeDate, Date endTimeDate) {
+    public List<Integer> statisticsLine(String startTimeDate, String endTimeDate) {
         return baseMapper.statisticsLine(startTimeDate,endTimeDate);
     }
 

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

@@ -16,4 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class OutpatientSettleBillServiceImpl extends ServiceImpl<OutpatientSettleBillMapper, OutpatientSettleBill> implements IOutpatientSettleBillService {
 
+    @Override
+    public Integer statisticsVisit(String startTime, String endTime) {
+        return baseMapper.statisticsVisit(startTime,endTime);
+    }
 }

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

@@ -16,4 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class PrescriptionOrderServiceImpl extends ServiceImpl<PrescriptionOrderMapper, PrescriptionOrder> implements IPrescriptionOrderService {
 
+    @Override
+    public Integer statisticsFormula(String startTime, String endTime) {
+        return baseMapper.statisticsFormula(startTime,endTime);
+    }
 }

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

@@ -275,6 +275,7 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         midAuditDoctorInfo.setDoctorId(detailInfo.getDoctorId());
         midAuditDoctorInfo.setDoctorName(detailInfo.getDoctorName());
         midAuditDoctorInfo.setFeedbackResult(detailInfo.getFeedbackResult());
+        midAuditDoctorInfo.setDoctorLevel(detailInfo.getFeedbackResult());
         result.setDoctorInfo(midAuditDoctorInfo);
         // 构建诊断信息
         List<DiagnosticInfoResponse> diagnosticInfoList = midIncidentAuditService.loadDiagnosticInfo(detailInfo.getMidIncidentAuditId());
@@ -411,6 +412,7 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         midAuditDoctorInfo.setDoctorId(detailInfo.getDoctorId());
         midAuditDoctorInfo.setDoctorName(detailInfo.getDoctorName());
         midAuditDoctorInfo.setFeedbackResult(patientInformationResponse.getFeedbackResult());
+        midAuditDoctorInfo.setDoctorLevel(detailInfo.getDoctorLevel());
         result.setDoctorInfo(midAuditDoctorInfo);
 
 

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://124.220.224.184:3306/medical?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://124.220.224.184:3306/medical_fy?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: G@7NYpxInsxLOn%l
           driver-class-name: com.mysql.cj.jdbc.Driver