Merge remote-tracking branch 'origin/master'

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

@@ -45,6 +45,10 @@ public class MidAuditDetailResponse implements Serializable {
     private List<DiagnosticInfoResponse> diagnosticInfoList;
     @ApiModelProperty(value = "类型")
     private String projectType;
+    @ApiModelProperty(value = "类型")
+    private String projectCode;
+    @ApiModelProperty(value = "类型")
+    private String projectName;
     @ApiModelProperty(value = "违规总数")
     private Integer violationTotal;
 

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

@@ -6,16 +6,16 @@
             resultType="org.jeecg.modules.medical.common.bo.before.PatientInformationResponse">
         SELECT
             ad.patient_id AS patientId, -- 患者编码
-            p.patient_name AS patientName, -- 患者姓名
-            p.gender AS gender, -- 性别
+            ad.patient_name AS patientName, -- 患者姓名
+            ad.patient_gender AS gender, -- 性别
             p.birthday AS birthday, -- 生日
-            "" AS age, -- 年龄
+            patient_age AS age, -- 年龄
             "" AS medicalInsurance, -- 是否医保(从主表查询）
             ad.visit_time AS visitDate, -- 就诊日期
             "" AS visitSerialNumber, -- 就诊流水号（从主表查询）
             ad.medical_dept_name AS medicalDeptName, -- 科室名称
             ad.medical_dept_code AS medicalDeptCode -- 科室编码
-            ,ad.treatment_type as treatmentType -- 就诊类型
+                ,ad.treatment_type as treatmentType -- 就诊类型
         FROM mid_incident_audit as ad
                  LEFT JOIN his_patient as p on ad.patient_id = p.patient_no
         WHERE ad.id = #{id,jdbcType=INTEGER}

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

@@ -203,7 +203,10 @@
         mid.medical_project_name,
         mid.price,
         mid.medical_number,
-        mid.mid_incident_audit_id
+        mid.mid_incident_audit_id,
+        mid.proejct_code as project_code,
+        mid.proejct_name as project_name
+
         FROM
         mid_incident_audit_detail AS mid
         LEFT JOIN mid_incident_audit AS mia ON mid.mid_incident_audit_id = mia.id

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

@@ -164,6 +164,8 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         result.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
         result.setMedicalInsRuleInfoName(detailInfo.getMedicalInsRuleInfoName());
         result.setCreateTime(detailInfo.getCreateTime());
+        result.setProjectCode(detailInfo.getProjectCode());
+        result.setProjectName(detailInfo.getProjectName());
         // 构建违规项目/药品明细
         ViolationsProjectMedicinesDetail v = new ViolationsProjectMedicinesDetail();
         v.setMedicalProjectCode(detailInfo.getMedicalProjectCode());