feat:家庭医生初始化

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

@@ -48,7 +48,7 @@ public interface PatientSignService {
 
     List<PatientSignEntity> selectList(PatientSignEntity patientSignEntity);
 
-    PatientSignEntity getOneByPhone(String phone);
+    List<PatientSignEntity> getListByPhone(String phone);
 
     int updateById(PatientSignEntity patientSignEntity);
 

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

@@ -318,14 +318,14 @@ public class PatientSignServiceImpl implements PatientSignService {
     }
 
     @Override
-    public PatientSignEntity getOneByPhone(String phone) {
+    public List<PatientSignEntity> getListByPhone(String phone) {
         QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
         PatientSignEntity patientSign = new PatientSignEntity();
         patientSign.setPatientPhone(phone);
         psWrapper.setEntity(patientSign);
         psWrapper.orderByDesc("createTime");
-        psWrapper.last("limit 1");
-        PatientSignEntity pse = patientSignMapper.selectOne(psWrapper);
+//        psWrapper.last("limit 1");
+        List<PatientSignEntity> pse = patientSignMapper.selectList(psWrapper);
         return pse;
     }
 

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/task/SignedTask.java

@@ -8,6 +8,7 @@ import com.ebaiyihui.family.doctor.common.dto.SendImMsgDTO;
 import com.ebaiyihui.family.doctor.server.common.constants.CommonConstants;
 import com.ebaiyihui.family.doctor.server.common.constants.ImConstants;
 import com.ebaiyihui.family.doctor.server.common.enums.MsgTempTypeEnum;
+import com.ebaiyihui.family.doctor.server.common.enums.SignStatus;
 import com.ebaiyihui.family.doctor.server.common.enums.StatusEnum;
 import com.ebaiyihui.family.doctor.server.entity.MobileBenefitPackageEntity;
 import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
@@ -186,7 +187,7 @@ public class SignedTask {
         }
     }
 
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 56 1 * * ?")
     public void orderInvalidation() {
         log.info("开始进行权益信息处理...");
         List<MobileBenefitPackageEntity> mobileBenefitPackageEntities = mobileBenefitPackageMapper.queryMaxOneList();
@@ -196,30 +197,36 @@ public class SignedTask {
                 for (MobileBenefitPackageEntity mbp : mobileBenefitPackageEntities) {
                     Date curTime = new Date();
                     Date endTime = DateUtils.parseDate(mbp.getBenefitsEndTime(), DateUtils.FULL_FORMAT);
-                    PatientSignEntity patientSignEntity = patientSignSevice.getOneByPhone(mbp.getPhone());
+                    List<PatientSignEntity> patientSignEntities = patientSignSevice.getListByPhone(mbp.getPhone());
                     mbp.setVersion(1);
-                    if (endTime.after(curTime)) {
-                        patientSignEntity.setPackageOrderId(mbp.getActivateOrderId());
-                        patientSignEntity.setSignEndTime(endTime);
-                    } else {
-                        patientSignEntity.setStatus(StatusEnum.FINISH_APPLY.getValue());
-                        MobileBenefitPackageEntity entity = mobileBenefitPackageMapper.queryByPhone(patientSignEntity.getPatientPhone(),
-                                patientSignEntity.getPackageOrderId(), "1");
-                        if (!ObjectUtils.isEmpty(entity)) {
-                            // 推送第三方权益使用
-                            NotifyConsultDataDTO notifyConsultDataDTO = new NotifyConsultDataDTO();
-                            notifyConsultDataDTO.setActivateOrderId(patientSignEntity.getPackageOrderId());
-                            notifyConsultDataDTO.setConsultOrderNo(patientSignEntity.getAdmId());
-                            notifyConsultDataDTO.setStatus(String.valueOf(StatusEnum.FINISH_APPLY.getValue()));
-                            notifyConsultDataDTO.setProductId(entity.getProductId());
-                            notifyConsultDataDTO.setPatientId(entity.getUserId());
-                            notifyConsultDataDTO.setExpertName(patientSignEntity.getDoctorName());
-                            notifyConsultDataDTO.setOrderDate(DateUtils.dateToFullString(patientSignEntity.getCreateTime()));
-                            notifyConsultDataDTO.setSupplierCode(CommonConstants.SUPPLIER_CODE_JTYS);
-                            thirdOrderPushUtil.syncBenefitUsedOrder(notifyConsultDataDTO, null);
+                    for (PatientSignEntity patientSignEntity : patientSignEntities) {
+                        if (endTime.after(curTime)) {
+                            patientSignEntity.setPackageOrderId(mbp.getActivateOrderId());
+                            patientSignEntity.setSignEndTime(endTime);
+                        } else {
+                            if (SignStatus.SIGNED.getValue().equals(patientSignEntity.getSignStatus())
+                                    && StatusEnum.IN_CONSULTATION.getValue().equals(patientSignEntity.getStatus())) {
+                                patientSignEntity.setStatus(StatusEnum.FINISH_APPLY.getValue());
+                                MobileBenefitPackageEntity entity = mobileBenefitPackageMapper.queryByPhone(patientSignEntity.getPatientPhone(),
+                                        patientSignEntity.getPackageOrderId(), "1");
+                                if (!ObjectUtils.isEmpty(entity)) {
+                                    // 推送第三方权益使用
+                                    NotifyConsultDataDTO notifyConsultDataDTO = new NotifyConsultDataDTO();
+                                    notifyConsultDataDTO.setActivateOrderId(patientSignEntity.getPackageOrderId());
+                                    notifyConsultDataDTO.setConsultOrderNo(patientSignEntity.getAdmId());
+                                    notifyConsultDataDTO.setStatus(String.valueOf(StatusEnum.FINISH_APPLY.getValue()));
+                                    notifyConsultDataDTO.setProductId(entity.getProductId());
+                                    notifyConsultDataDTO.setPatientId(entity.getUserId());
+                                    notifyConsultDataDTO.setExpertName(patientSignEntity.getDoctorName());
+                                    notifyConsultDataDTO.setOrderDate(DateUtils.dateToFullString(patientSignEntity.getCreateTime()));
+                                    notifyConsultDataDTO.setSupplierCode(CommonConstants.SUPPLIER_CODE_JTYS);
+                                    thirdOrderPushUtil.syncBenefitUsedOrder(notifyConsultDataDTO, null);
+                                }
+                            }
+
                         }
+                        patientSignSevice.updateById(patientSignEntity);
                     }
-                    patientSignSevice.updateById(patientSignEntity);
                     mobileBenefitPackageMapper.updateVersion(mbp);
                 }
             }