lenovodn 2 роки тому
батько
коміт
a0787a2cfc

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

@@ -31,6 +31,8 @@ public class AuditMidDetailListResponse implements Serializable {
     @Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
     private String projectName;
+    @ApiModelProperty(value = "医生级别")
+    private String doctorLevel;
 
     @ApiModelProperty(value = "项目编码")
     private String proejctCode;

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

@@ -28,6 +28,7 @@ import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.PrescriptionOrder;
 import org.jeecg.modules.medical.service.*;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
+import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
@@ -78,6 +79,8 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
     private IPrescriptionOrderService prescriptionOrderService;
     @Autowired
     private ExportUtilHelperService exportUtilHelperService;
+    @Autowired
+    private ISysDictService sysDictService;
 
     @Value("${jeecg.path.upload}")
     protected String upLoadPath;
@@ -275,7 +278,8 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         midAuditDoctorInfo.setDoctorId(detailInfo.getDoctorId());
         midAuditDoctorInfo.setDoctorName(detailInfo.getDoctorName());
         midAuditDoctorInfo.setFeedbackResult(detailInfo.getFeedbackResult());
-        midAuditDoctorInfo.setDoctorLevel(detailInfo.getFeedbackResult());
+        midAuditDoctorInfo.setDoctorLevel(sysDictService.queryDictTextByKey("doctor_level",detailInfo.getDoctorLevel()));
+
         result.setDoctorInfo(midAuditDoctorInfo);
         // 构建诊断信息
         List<DiagnosticInfoResponse> diagnosticInfoList = midIncidentAuditService.loadDiagnosticInfo(detailInfo.getMidIncidentAuditId());
@@ -412,7 +416,8 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         midAuditDoctorInfo.setDoctorId(detailInfo.getDoctorId());
         midAuditDoctorInfo.setDoctorName(detailInfo.getDoctorName());
         midAuditDoctorInfo.setFeedbackResult(patientInformationResponse.getFeedbackResult());
-        midAuditDoctorInfo.setDoctorLevel(detailInfo.getDoctorLevel());
+        midAuditDoctorInfo.setDoctorLevel(sysDictService.queryDictTextByKey("doctor_level",detailInfo.getDoctorLevel()));
+
         result.setDoctorInfo(midAuditDoctorInfo);