修改诊疗档案评估报告导出名称为姓名+ID

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

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<PmsPatient> pmsPatients = pmsPatientMapper.selectByExample(pmsPatientExample);
         if (CollectionUtil.isNotEmpty(pmsPatients)) {
             PmsPatient pmsPatient = BeanUtil.copyProperties(dto, PmsPatient.class);

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<PmsPatient> 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());
+            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 {