Merge branch 'test'

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientServiceImpl.java

@@ -105,6 +105,7 @@ public class PatientServiceImpl implements PatientService {
         String deptName = reqVo.getDeptName();
 
         PatientSignEntity oldPatientSignEntity = new PatientSignEntity();
+        PatientSignEntity tempOldPatientSignEntity = new PatientSignEntity();
         // 改签或者排班医生获取签约的id
         if (!SignStatus.SIGNED.getValue().equals(reqVo.getSignStatus())) {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
@@ -113,7 +114,6 @@ public class PatientServiceImpl implements PatientService {
             psWrapper.setEntity(patientSign);
             oldPatientSignEntity = patientSignMapper.selectOne(psWrapper);
             Date signCreateTime = oldPatientSignEntity.getCreateTime();
-            PatientSignEntity tempOldPatientSignEntity = new PatientSignEntity();
             BeanUtils.copyProperties(oldPatientSignEntity, tempOldPatientSignEntity);
             log.info("tempOldPatientSignEntity={}", tempOldPatientSignEntity);
             log.info("入参查询oldPatientSignEntity={}", oldPatientSignEntity);
@@ -258,7 +258,7 @@ public class PatientServiceImpl implements PatientService {
                 // 推送第三方权益使用
                 NotifyConsultDataDTO notifyConsultDataDTO2 = new NotifyConsultDataDTO();
                 notifyConsultDataDTO2.setActivateOrderId(reqVo.getPackageOrderId());
-                notifyConsultDataDTO2.setConsultOrderNo(oldPatientSignEntity.getAdmId());
+                notifyConsultDataDTO2.setConsultOrderNo(tempOldPatientSignEntity.getAdmId());
                 notifyConsultDataDTO2.setStatus(String.valueOf(StatusEnum.FINISH_APPLY.getValue()));
                 notifyConsultDataDTO2.setProductId(entity.getProductId());
                 notifyConsultDataDTO2.setPatientId(entity.getUserId());