From 7129afacd9f81192fbd5636fabb63cd4f0b1dc40 Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 8 Apr 2025 18:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=8A=E7=96=97=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E8=AF=84=E4=BC=B0=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=BA=E5=A7=93=E5=90=8D+ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/ExternalServiceImpl.java | 5 ++++- .../system/service/impl/PmsPatientServiceImpl.java | 7 ++++++- .../system/service/impl/PmsTreatmentServiceImpl.java | 10 ++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java index a88b0641..2e6478f1 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java @@ -182,7 +182,10 @@ public class ExternalServiceImpl implements ExternalService { public UplRtcfInfoVo.Result selectByMemberId(Long id, String membreId) { //查询诊疗档案 PmsTreatment pmsTreatment = pmsTreatmentMapper.selectByPrimaryKey(id); - if (pmsTreatment == null || pmsTreatment.getDelFlag() == 1 || StrUtil.isEmpty(pmsTreatment.getVisitNumber()) || pmsTreatment.getMemberId() == null) { + if (pmsTreatment == null) { + return new UplRtcfInfoVo.Result(); + } + if (StrUtil.isEmpty(pmsTreatment.getVisitNumber()) && pmsTreatment.getMemberId() == null) { return new UplRtcfInfoVo.Result(); } Long memberId = pmsTreatment.getMemberId(); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java index e765fdbe..c9494055 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java @@ -63,7 +63,12 @@ public class PmsPatientServiceImpl implements PmsPatientService { @Override public Long add(PmsPatientDto.PatientAdd dto) { PmsPatientExample pmsPatientExample = new PmsPatientExample(); - pmsPatientExample.createCriteria().andDelFlagEqualTo((byte)0).andIdCardEqualTo(dto.getIdCard()).andIdCardTypeEqualTo(dto.getIdCardType()); + PmsPatientExample.Criteria criteria = pmsPatientExample.createCriteria().andDelFlagEqualTo((byte) 0); + if (StrUtil.isNotEmpty(dto.getIdCard())) { + criteria.andIdCardEqualTo(dto.getIdCard()).andIdCardTypeEqualTo(dto.getIdCardType()); + }else { + criteria.andPhoneEqualTo(dto.getPhone()).andNameEqualTo(dto.getName()); + } List pmsPatients = pmsPatientMapper.selectByExample(pmsPatientExample); if (CollectionUtil.isNotEmpty(pmsPatients)) { PmsPatient pmsPatient = BeanUtil.copyProperties(dto, PmsPatient.class); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java index e01f6274..94e951ae 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java @@ -90,7 +90,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { PmsTreatment pmsTreatment = BeanUtil.copyProperties(dto, PmsTreatment.class); PmsPatientExample pmsPatientExample = new PmsPatientExample(); - pmsPatientExample.createCriteria().andDelFlagEqualTo((byte) 0).andIdCardEqualTo(dto.getIdCard()); + pmsPatientExample.createCriteria().andDelFlagEqualTo((byte) 0).andNameEqualTo(dto.getName()).andPhoneEqualTo(dto.getPhone()); List pmsPatients = pmsPatientMapper.selectByExample(pmsPatientExample); Long patientId = null; if (CollectionUtil.isEmpty(pmsPatients)) { @@ -139,8 +139,10 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { patientQueueRelation.setPinyinSimple(PinyinUtil.getFirstLetter(pmsTreatment.getName(), "")); patientQueueRelation.setCreateBy(SecurityUtils.getUsername()); patientQueueRelation.setTenantId(SecurityUtils.getTenantId()); - patientQueueRelation.setIdCard(dto.getIdCard()); - patientQueueRelation.setIdCardType(dto.getIdCardType().byteValue()); + if (StrUtil.isNotEmpty(dto.getIdCard())) { + patientQueueRelation.setIdCard(dto.getIdCard()); + patientQueueRelation.setIdCardType(dto.getIdCardType().byteValue()); + } patientQueueRelation.setPatientId(patientId); patientQueueRelation.setQueueId(null); patientQueueRelation.setCreateTime(new Date()); @@ -535,7 +537,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { //查询租户 DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(pmsTreatment.getTenantId()); - String pdfName = pmsTreatment.getName() + "_" + pmsTreatment.getVisitNumber(); + String pdfName = pmsTreatment.getName() + "_" + pmsTreatment.getId(); String wordPath = profilePath + File.separator + pdfName + ".docx"; String pdfPath = profilePath + File.separator + pdfName + ".pdf"; try {