Browse Source

fix: 事前找不到主单,医嘱字段缺失

Scott 1 year ago
parent
commit
dc58ee8994

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

@@ -45,6 +45,11 @@ public class AuditMidDetailListResponse implements Serializable {
     @ApiModelProperty(value = "医保规则名称")
     private String medicalInsRuleInfoName;
 
+    @ApiModelProperty(value = "医保项目编码(违规项目编码)")
+    private java.lang.String medicalProjectCode;
+    @ApiModelProperty(value = "医保项目名称(项目名称)")
+    private java.lang.String medicalProjectName;
+
     @ApiModelProperty(value = "规则管理级别")
     @Dict(dicCode = "violation_level")
     private String reminderLevel;

+ 7 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/mid/response/ViolationsProjectMedicinesDetail.java

@@ -21,6 +21,13 @@ public class ViolationsProjectMedicinesDetail implements Serializable {
     private java.lang.String medicalProjectCode;
     @ApiModelProperty(value = "医保项目名称(项目名称)")
     private java.lang.String medicalProjectName;
+
+    @ApiModelProperty(value = "医保规则编码")
+    private String medicalInsRuleInfoCode;
+
+    @ApiModelProperty(value = "医保规则名称")
+    private String medicalInsRuleInfoName;
+
     @ApiModelProperty(value = "医保标志;0=非医保,1=是医保")
     private java.lang.String medicalInsuranceMark; //医保标志
     @ApiModelProperty(value = "价格;单价,必须使用数值型,如”12.5”")

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

@@ -14,6 +14,8 @@
             medical_dept_name
             ,medical_ins_rule_info_code
             ,medical_ins_rule_info_name
+             ,medical_project_code
+             ,medical_project_code
             ,doctor_name,
             doctor_id,
             create_time,
@@ -197,6 +199,8 @@
         mid.medical_ins_rule_info_code,
         mid.medical_ins_rule_info_name,
         mid.medical_insurance_mark,
+        mid.medical_project_code,
+        mid.medical_project_name,
         mid.price,
         mid.medical_number,
         mid.mid_incident_audit_id

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/MidIncidentAuditDetailServiceImpl.java

@@ -93,7 +93,7 @@ public class MidIncidentAuditDetailServiceImpl extends ServiceImpl<MidIncidentAu
 
     private List<MidIncidentAuditDetail> loadDetailList(String id) {
         LambdaQueryWrapper<MidIncidentAuditDetail> queryWrapper = Wrappers.<MidIncidentAuditDetail>lambdaQuery()
-                .eq(MidIncidentAuditDetail::getMidIncidentAuditId, id);
+                .eq(MidIncidentAuditDetail::getMidIncidentAuditId, id).last("limit 20");
         return this.list(queryWrapper);
     }
 

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

@@ -166,8 +166,10 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         result.setCreateTime(detailInfo.getCreateTime());
         // 构建违规项目/药品明细
         ViolationsProjectMedicinesDetail v = new ViolationsProjectMedicinesDetail();
-        v.setMedicalProjectCode(detailInfo.getMedicalInsRuleInfoCode());
-        v.setMedicalProjectName(detailInfo.getMedicalInsRuleInfoName());
+        v.setMedicalProjectCode(detailInfo.getMedicalProjectCode());
+        v.setMedicalProjectName(detailInfo.getMedicalProjectName());
+        v.setMedicalInsRuleInfoCode(detailInfo.getMedicalInsRuleInfoCode());
+        v.setMedicalInsRuleInfoName(detailInfo.getMedicalInsRuleInfoName());
         v.setMedicalInsuranceMark(detailInfo.getMedicalInsuranceMark());
         v.setPrice(detailInfo.getPrice());
         v.setMedicalNumber(detailInfo.getMedicalNumber());
@@ -188,6 +190,11 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         // 构建患者信息
         PatientInformationResponse patientInformationResponse =
                 midIncidentAuditDetailService.loadPatientInfoById(detailInfo.getMidIncidentAuditId().toString(), midIncidentAuditService);
+        if (patientInformationResponse != null) {
+            if (!StringUtils.hasText( patientInformationResponse.getPatientName())) {
+                patientInformationResponse.setPatientName(detailInfo.getPatientName());
+            }
+        }
         result.setPatientInfo(patientInformationResponse);
         // 构建医生信息
         MidAuditDoctorInfo midAuditDoctorInfo = new MidAuditDoctorInfo();