|
@ -87,6 +87,7 @@ public class PatientReportService implements IPatientReportService { |
|
|
htPatientReport.setId(snowflake.nextId()); |
|
|
htPatientReport.setId(snowflake.nextId()); |
|
|
// htPatientReport.setDoctorId(doctors.get(0).getId());
|
|
|
// htPatientReport.setDoctorId(doctors.get(0).getId());
|
|
|
htPatientReport.setPatientId(generate.getPatientId()); |
|
|
htPatientReport.setPatientId(generate.getPatientId()); |
|
|
|
|
|
htPatientReport.setSerialNumber(generate.getSerialNumber()); |
|
|
// htPatientReport.setPatientIdcard(htPatient.getIdcard());
|
|
|
// htPatientReport.setPatientIdcard(htPatient.getIdcard());
|
|
|
// htPatientReport.setPatientAge(StrUtil.isEmpty(htPatient.getIdcard()) ? null : (byte)IdcardUtil.getAgeByIdCard(htPatient.getIdcard()));
|
|
|
// htPatientReport.setPatientAge(StrUtil.isEmpty(htPatient.getIdcard()) ? null : (byte)IdcardUtil.getAgeByIdCard(htPatient.getIdcard()));
|
|
|
htPatientReport.setEvaluationCode(Constant.Ht.Report.PARENT_CODE); |
|
|
htPatientReport.setEvaluationCode(Constant.Ht.Report.PARENT_CODE); |
|
@ -99,6 +100,7 @@ public class PatientReportService implements IPatientReportService { |
|
|
log.info("生成病友报告单:{}", generate); |
|
|
log.info("生成病友报告单:{}", generate); |
|
|
PatientReportVo.Generate generateVo = new PatientReportVo.Generate(); |
|
|
PatientReportVo.Generate generateVo = new PatientReportVo.Generate(); |
|
|
generateVo.setId(htPatientReport.getId()); |
|
|
generateVo.setId(htPatientReport.getId()); |
|
|
|
|
|
generateVo.setName(htPatientReport.getName()); |
|
|
return JsonResponse.newInstance().ok(generateVo); |
|
|
return JsonResponse.newInstance().ok(generateVo); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -607,5 +609,31 @@ public class PatientReportService implements IPatientReportService { |
|
|
return list; |
|
|
return list; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public PatientReportVo.CompleteSimple checkPatientComplete(PatientReportDto.Patient param, Long userId) { |
|
|
|
|
|
PatientReportVo.CompleteSimple simple = htPatientReportDao.checkPatientComplete(param, userId); |
|
|
|
|
|
log.info("检查患者未完成的报告单:{}", simple); |
|
|
|
|
|
if (simple != null) { |
|
|
|
|
|
simple.setHasUnfinished(Constant.Ht.UNCLOSED_REPORT); |
|
|
|
|
|
return simple; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
PatientReportDto.Generate generate = new PatientReportDto.Generate(); |
|
|
|
|
|
generate.setPatientId(param.getPatientId()); |
|
|
|
|
|
generate.setSerialNumber(param.getSerialNumber()); |
|
|
|
|
|
JsonResponse<PatientReportVo.Generate> result = generatePatientReport(generate, userId); |
|
|
|
|
|
if (result.getCode() != CodeEnum.SUCCESS.getCode().intValue()) { |
|
|
|
|
|
throw new BaseException(result.getCode(), result.getMsg()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
simple = new PatientReportVo.CompleteSimple(); |
|
|
|
|
|
PatientReportVo.Generate data = result.getData(); |
|
|
|
|
|
simple.setId(data.getId()); |
|
|
|
|
|
simple.setName(data.getName()); |
|
|
|
|
|
simple.setPatientId(param.getPatientId()); |
|
|
|
|
|
simple.setSerialNumber(param.getSerialNumber()); |
|
|
|
|
|
return simple; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|