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