|
@@ -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();
|