diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java index 537ce538..35427a57 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java @@ -45,9 +45,9 @@ public interface IPatientInformationService { /** * 添加病人信息 * - * @param patientInfoDto 病人信息 + * @param patientBaseInfoDto 病人信息 */ - R addPatient(PatientBaseInfoDto patientInfoDto); + R addPatient(PatientBaseInfoDto patientBaseInfoDto); /** * 更新患者手机号 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java index 1a4f8e5a..7b60f299 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java @@ -254,31 +254,32 @@ public class PatientInformationServiceImpl implements IPatientInformationService /** * 添加病人信息 * - * @param patientInfoDto 病人信息 + * @param patientBaseInfoDto 病人信息 */ @Override - public R addPatient(PatientBaseInfoDto patientInfoDto) { + public R addPatient(PatientBaseInfoDto patientBaseInfoDto) { +// log.debug("添加病人信息,patientInfoDto:{}", patientBaseInfoDto); // 如果患者没有输入身份证号则根据年龄自动生成 - String idCard = patientInfoDto.getIdCard(); + String idCard = patientBaseInfoDto.getIdCard(); if (idCard == null || CommonConstants.Common.AREA_CODE.equals(idCard.substring(0, 6))) { - if (patientInfoDto.getAge() != null) { - idCard = IdCardUtil.generateIdByAge(patientInfoDto.getAge()); - patientInfoDto.setIdCard(idCard); + if (patientBaseInfoDto.getAge() != null) { + idCard = IdCardUtil.generateIdByAge(patientBaseInfoDto.getAge()); + patientBaseInfoDto.setIdCard(idCard); } } // 身份证号是否存在 List idCardList - = patientService.list(new LambdaQueryWrapper().eq(Patient::getIdCard, patientInfoDto.getIdCard())); + = patientService.list(new LambdaQueryWrapper().eq(Patient::getIdCard, patientBaseInfoDto.getIdCard())); if (!idCardList.isEmpty()) { - throw new ServiceException("身份证号:" + patientInfoDto.getIdCard() + "已经存在"); + throw new ServiceException("身份证号:" + patientBaseInfoDto.getIdCard() + "已经存在"); } // 处理患者信息 - Patient patient = this.handlePatientInfo(patientInfoDto); + Patient patient = this.handlePatientInfo(patientBaseInfoDto); // 新增患者身份子表信息 - if (patientInfoDto.getPatientIdInfoList() != null) { - List patientIdInfoList = patientInfoDto.getPatientIdInfoList(); + if (patientBaseInfoDto.getPatientIdInfoList() != null) { + List patientIdInfoList = patientBaseInfoDto.getPatientIdInfoList(); PatientIdentifier patientIdentifier; for (PatientIdInfoDto patientIdInfoDto : patientIdInfoList) { patientIdentifier = new PatientIdentifier(); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java index 7bf15450..ef9110a6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java @@ -38,11 +38,12 @@ public class PatientInformationController { /** * 添加病人信息 * - * @param patientInfoDto 病人信息 + * @param patientBaseInfoDto 病人信息 */ @PostMapping("/patient-information") - public R addPatient(@RequestBody PatientBaseInfoDto patientInfoDto) { - return patientInformationService.addPatient(patientInfoDto); + public R addPatient(@RequestBody PatientBaseInfoDto patientBaseInfoDto) { +// log.debug("添加病人信息,patientInfoDto:{}", patientBaseInfoDto); + return patientInformationService.addPatient(patientBaseInfoDto); } /** diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue index 5d5b33b5..1ef037d7 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue @@ -1201,6 +1201,7 @@ function submitForm() { form.value.patientIdInfoList = [ { typeCode: form.value.typeCode, + identifierNo: form.value.identifierNo, }, ]; if (form.value.idCard) { @@ -1235,6 +1236,8 @@ function submitForm() { emits('submit', 'update'); }); } else { + // console.log('患者就诊卡号:', form.value.identifierNo) + // console.log('患者就诊信息:', form.value.patientIdInfoList) // 新增患者 addPatient(form.value).then((response) => { proxy.$modal.msgSuccess('新增成功'); diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue index ca30e994..12a3bf73 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue @@ -2,7 +2,7 @@