bug修复

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

@@ -53,9 +53,9 @@ public class MidAuditDetailResponse implements Serializable {
     @ApiModelProperty(value = "类型")
     @Dict(dicCode = "PROJECT_USE_TYPE")
     private String projectType;
-    @ApiModelProperty(value = "类型")
+    @ApiModelProperty(value = "项目编码")
     private String projectCode;
-    @ApiModelProperty(value = "类型")
+    @ApiModelProperty(value = "项目名称")
     private String projectName;
 
     @Excel(name = "违规总数", width = 15)
@@ -66,9 +66,14 @@ public class MidAuditDetailResponse implements Serializable {
     @ApiModelProperty(value = "异常金额总和")
     private BigDecimal errorAmountTotal;
     private Double amount;
+    @ApiModelProperty(value = "数量")
+    private Integer quantity;
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+    private String medicalProjectCode;
+    private String medicalProjectName;
     @ApiModelProperty(value = "药量情况")
     private List<PrescriptionDetail> prescriptionDetail;
 
 
-
 }

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

@@ -196,7 +196,7 @@
         FROM
             medical_date m
                 LEFT JOIN
-            advance_warning_audit a ON CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) = DATE_FORMAT(a.create_time, '%Y-%m-%d')
+            advance_warning_audit_detail 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(#{startTime}, '%Y-%m-%d')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d')
         GROUP BY

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

@@ -409,7 +409,7 @@
         FROM
             medical_date m
                 LEFT JOIN
-            afterwards_audit a ON CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) = DATE_FORMAT(a.create_time, '%Y-%m-%d')
+            afterwards_audit_detail 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')
         GROUP BY

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

@@ -283,7 +283,7 @@
         FROM
             medical_date m
                 LEFT JOIN
-            mid_incident_audit a ON CONCAT(YEAR(CURRENT_DATE), '-', m.mmdd) = DATE_FORMAT(a.create_time, '%Y-%m-%d')
+            mid_incident_audit_detail 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(#{startTime}, '%Y-%m-%d')  AND DATE_FORMAT(#{endTime}, '%Y-%m-%d')
         GROUP BY

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

@@ -394,8 +394,12 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
         result.setProjectName(detailInfo.getProejctName());
         result.setProjectCode(detailInfo.getProejctCode());
+        result.setMedicalProjectCode(detailInfo.getMedicalProjectCode());
+        result.setMedicalProjectName(detailInfo.getMedicalProjectName());
         result.setCreateTime(detailInfo.getCreateTime());
         result.setAmount(detailInfo.getAmount());
+        result.setPrice(detailInfo.getPrice());
+        result.setQuantity(detailInfo.getQuantity());
         // 构建违规项目/药品明细
         ViolationsProjectMedicinesDetail v = new ViolationsProjectMedicinesDetail();
         v.setMedicalProjectCode(detailInfo.getMedicalInsRuleInfoCode());