字典

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -41,6 +42,7 @@ public class AuditInfoResponse implements Serializable {
     private String gender;
 
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 
     @ApiModelProperty(value = "住院号/门诊号/就诊流水号")

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.medical.common.bo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -45,6 +46,7 @@ public class ReportAfterQueryDetailResponseBO implements Serializable {
     @ApiModelProperty(value = "异常多收")
     private BigDecimal errorRelativelyFewAmt;
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 
     @Excel(name = "医保项目编码", width = 15)

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.medical.common.bo.after.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 
 import java.io.Serializable;
 
@@ -16,6 +17,7 @@ public class AfterDeptDetailRequest implements Serializable {
     @ApiModelProperty(value = "医保项目编码/名称")
     private String medicalProjectSearch;
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private String treatmentType;
 
     @ApiModelProperty(value = "医保规则编码")

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

@@ -48,5 +48,6 @@ public class AuditAdvanceWarningAuditDetailResponse {
     private String medicalInsRuleInfoName;
 
     @ApiModelProperty(value = "规则管理级别")
+    @Dict(dicCode = "violation_level")
     private String reminderLevel;
 }

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.medical.common.bo.mid;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -45,12 +46,14 @@ public class AuditMidDetailListResponse implements Serializable {
     private String medicalInsRuleInfoName;
 
     @ApiModelProperty(value = "规则管理级别")
+    @Dict(dicCode = "violation_level")
     private String reminderLevel;
 
     @ApiModelProperty(value = "患者姓名")
     private String patientName;
 
     @ApiModelProperty(value = "就诊类型")
+    @Dict(dicCode = "treatment_type")
     private String treatmentType;
 
 //    @ApiModelProperty(value = "是否医保")

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.medical.common.bo.mid;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -29,6 +30,7 @@ public class ViolationInfo implements Serializable {
     private String description;
 
     @ApiModelProperty(value = "就诊类型")
+    @Dict(dicCode = "treatment_type")
     private String treatmentType;
 
     @ApiModelProperty(value = "异常金额")

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.medical.common.bo.mid.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 
 import java.io.Serializable;
 
@@ -17,6 +18,7 @@ public class AuditMidDetailListRequest implements Serializable {
     @ApiModelProperty(value = "项目编码/名称搜索")
     private String projectSearch;
     @ApiModelProperty(value = "就诊类型")
+    @Dict(dicCode = "treatment_type")
     private String treatmentType;
 //    @ApiModelProperty(value = "违反规则编码")
 //    private String feedbackCode;
@@ -29,6 +31,7 @@ public class AuditMidDetailListRequest implements Serializable {
     @ApiModelProperty(value = "违反规则名称")
     private String medicalInsRuleInfoName;
     @ApiModelProperty(value = "违反规则级别")
+    @Dict(dicCode = "violation_level")
     private String reminderLevel;
 
     @ApiModelProperty(value = "医保项目编码")

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.medical.common.bo.mid.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.medical.common.bo.before.PatientInformationResponse;
 import org.jeecg.modules.medical.common.bo.before.PrescriptionDetail;
 
@@ -25,6 +26,7 @@ public class MidAuditDetailResponse implements Serializable {
     @ApiModelProperty(value = "异常标题(规则处理结果)")
     private String description;
     @ApiModelProperty(value = "规则管理级别")
+    @Dict(dicCode = "violation_level")
     private String violationLevel;
     @ApiModelProperty(value = "违反规则编码")
     private String medicalInsRuleInfoCode;

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

@@ -300,13 +300,13 @@ public class ViolationAnalysisController {
     @ApiOperation(value="违规分析-事后违规项目统计-列表", notes="违规分析-事后违规项目统计")
     @GetMapping(value = "/after/project/list")
     public Result<IPage<MidAuditViolateProjectStatisticsResponse>> afterViolateProjectStatisticsList(String projectCode, //项目类别
-                                                                                                     String medicalProjectSearch, //项目编码、名称
+                                                                                                     String projectSearch, //项目编码、名称
                                                                                                      String startTime,
                                                                                                      String endTime,
                                                                                                      @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                                                      @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
         IPage<AuditAdvanceWarningAuditDetailResponse> page = new Page<>(pageNo, pageSize);
-        IPage<MidAuditViolateProjectStatisticsResponse> result2 = violationAnalysisService.afterViolateProjectStatisticsList(page, projectCode, medicalProjectSearch, startTime, endTime);
+        IPage<MidAuditViolateProjectStatisticsResponse> result2 = violationAnalysisService.afterViolateProjectStatisticsList(page, projectCode, projectSearch, startTime, endTime);
         return Result.OK(result2);
     }
 

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

@@ -40,6 +40,7 @@ public class AdvanceWarningAudit implements Serializable {
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)

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

@@ -59,10 +59,12 @@ public class AdvanceWarningAuditDetail implements Serializable {
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**警示级别*/
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
+    @Dict(dicCode = "violation_level")
     private java.lang.String reminderLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)

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

@@ -55,10 +55,12 @@ public class AdvanceWarningDataDetail implements Serializable {
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**警示级别*/
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
+    @Dict(dicCode = "violation_level")
     private java.lang.String reminderLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)

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

@@ -39,6 +39,7 @@ public class AfterwardsAudit implements Serializable {
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
@@ -166,8 +167,12 @@ public class AfterwardsAudit implements Serializable {
     private BigDecimal errorRelativelyFewAmt;
 
     @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     private String startTime;
     @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     private String endTime;
 
     @TableField(exist = false)

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

@@ -63,10 +63,12 @@ public class AfterwardsAuditDetail implements Serializable {
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**警示级别*/
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
+    @Dict(dicCode = "violation_level")
     private java.lang.String reminderLevel;
     /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
     @Excel(name = "违规等级", width = 15)

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

@@ -55,6 +55,7 @@ public class Audit implements Serializable {
 	/**警示级别*/
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
+    @Dict(dicCode = "violation_level")
     private java.lang.String reminderLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)

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

@@ -51,10 +51,12 @@ public class AuditDetail implements Serializable {
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**警示级别*/
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
+    @Dict(dicCode = "violation_level")
     private java.lang.String reminderLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)

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

@@ -42,6 +42,7 @@ public class MidIncidentAudit implements Serializable {
 
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;1：住院 2：门诊", width = 15)
+    @Dict(dicCode = "treatment_type")
     @ApiModelProperty(value = "就诊类别;1：住院 2：门诊")
     private java.lang.String treatmentType;
 

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

@@ -57,10 +57,12 @@ public class MidIncidentAuditDetail implements Serializable {
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;1：住院 2：门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;1：住院 2：门诊；3:住院/门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**警示级别*/
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
+    @Dict(dicCode = "violation_level")
     private java.lang.String reminderLevel;
     /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
     @Excel(name = "违规等级", width = 15)

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

@@ -43,6 +43,7 @@ public class Operation implements Serializable {
 	/**就诊类型;1 住院 、2 门诊*/
 	@Excel(name = "就诊类型;1 住院 、2 门诊", width = 15)
     @ApiModelProperty(value = "就诊类型;1 住院 、2 门诊")
+    @Dict(dicCode = "treatment_type")
     private java.lang.String treatmentType;
 	/**手术编号;手术编号，外部系统唯一主键*/
 	@Excel(name = "手术编号;手术编号，外部系统唯一主键", width = 15)

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

@@ -23,35 +23,48 @@
 
     <select id="afterViolateProjectStatisticsList"
             resultType="org.jeecg.modules.medical.common.bo.mid.response.MidAuditViolateProjectStatisticsResponse">
+
+
         SELECT
-            id
-            ,project_type
-            ,medical_project_name
-             ,medical_project_code
-             ,(select IFNULL(count(amount), 0) from afterwards_audit_detail WHERE medical_project_code = m.medical_project_code ) as violationTotal  -- 违规总数
-             ,sum(amount) as errorAmountTotal -- 异常金额总和
-        FROM afterwards_audit_detail as m
+        m.id,
+        m.project_type,
+        m.medical_project_name,
+        m.medical_project_code,
+        IFNULL(count(d.amount), 0) as violationTotal,
+        sum(d.amount) as errorAmountTotal
+        FROM
+        afterwards_audit_detail AS m
+        LEFT JOIN (
+        SELECT medical_project_code, count(amount) as amount
+        FROM afterwards_audit_detail
+        GROUP BY medical_project_code
+        ) AS d ON m.medical_project_code = d.medical_project_code
         <where>
+                      1=1
             <if test="medicalProjectSearch != null and medicalProjectSearch != '' ">
                 AND(
-                medical_project_code LIKE concat(concat('%',#{medicalProjectSearch}),'%')
+                m.medical_project_code LIKE concat(concat('%',#{medicalProjectSearch}),'%')
                 or
-                medical_project_name LIKE concat(concat('%',#{medicalProjectSearch}),'%')
+                m.medical_project_name LIKE concat(concat('%',#{medicalProjectSearch}),'%')
                 )
             </if>
 
             <if test="projectCode != null and projectCode != '' ">
-                AND project_code = #{projectCode}
+                AND m.project_code = #{projectCode}
             </if>
             <if test="startTime != null and startTime != ''">
-                and <![CDATA[ create_time >= #{startTime} ]]>
+                and <![CDATA[ m.create_time >= #{startTime} ]]>
             </if>
             <if test="endTime != null and endTime != ''">
-                and <![CDATA[ create_time <= #{endTime} ]]>
+                and <![CDATA[ m.create_time <= #{endTime} ]]>
             </if>
         </where>
 
-        GROUP BY medical_project_code
-        ORDER BY violationTotal DESC
+        GROUP BY m.medical_project_code
+        ORDER BY violationTotal DESC;
+
+
+
+
     </select>
 </mapper>

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

@@ -170,33 +170,34 @@
     <select id="loadViolationDetail"
             resultType="org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse">
         SELECT
-            id,
-            proejct_code,
-            proejct_name
-            ,patient_id,
-            patient_name,
-            treatment_type,
-            medical_dept_name
-            ,medical_dept_code
-            ,doctor_name
-            ,doctor_id,
-            create_time,
-            amount
-            ,(SELECT feedback_code from mid_incident_audit WHERE id = mid_incident_audit_id) as feedback_code
-            ,(SELECT feedback_result from mid_incident_audit WHERE id = mid_incident_audit_id) as feedback_result
-            ,description
-            ,reminder_level
-            ,medical_ins_rule_info_code
-            ,medical_ins_rule_info_name
-        ,medical_ins_rule_info_name
-            ,medical_insurance_mark
-            ,price
-            ,medical_number
-            ,mid_incident_audit_id
+        mid.id,
+        mid.proejct_code,
+        mid.proejct_name,
+        mid.patient_id,
+        mid.patient_name,
+        mid.treatment_type,
+        mid.medical_dept_name,
+        mid.medical_dept_code,
+        mid.doctor_name,
+        mid.doctor_id,
+        mid.create_time,
+        mid.amount,
+        mia.feedback_code,
+        mia.feedback_result,
+        mid.description,
+        mid.reminder_level,
+        mid.medical_ins_rule_info_code,
+        mid.medical_ins_rule_info_name,
+        mid.medical_insurance_mark,
+        mid.price,
+        mid.medical_number,
+        mid.mid_incident_audit_id
         FROM
-            mid_incident_audit_detail
+        mid_incident_audit_detail AS mid
+        LEFT JOIN mid_incident_audit AS mia ON mid.mid_incident_audit_id = mia.id
+
         <where>
-            AND id = #{detailId,jdbcType=VARCHAR}
+            AND mid.id = #{detailId,jdbcType=VARCHAR}
         </where>
 
     </select>