Merge branch 'test'

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

@@ -25,6 +25,7 @@ import com.ebaiyihui.family.doctor.server.mapper.PatientMapper;
 import com.ebaiyihui.family.doctor.server.mapper.PatientSignMapper;
 import com.ebaiyihui.family.doctor.server.service.ImChatTemplate;
 import com.ebaiyihui.family.doctor.server.service.ImMsgTemplateService;
+import com.ebaiyihui.family.doctor.server.util.DateUtils;
 import com.ebaiyihui.family.doctor.server.util.JsonUtil;
 import com.ebaiyihui.family.doctor.server.util.ThirdOrderPushUtil;
 import com.ebaiyihui.framework.response.BaseResponse;
@@ -33,10 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -137,7 +135,15 @@ public class ImMsgTemplateServiceImpl implements ImMsgTemplateService {
                     infoListDTO.setDoctorId(String.valueOf(patientSignEntity.getDoctorId()));
                     infoListDTO.setMessageNum(String.valueOf(patientEntity.getUnReadCount()));
                     infoListDTO.setGroupId(imMessageDTO.getRoomNum());
-                    infoListDTO.setTimestamp(imMessageDTO.getMsgTime());
+                    String timestamp = "";
+                    try {
+                        Date timestampDate = DateUtils.parseDate(imMessageDTO.getMsgTime(), DateUtils.FULL_FORMAT);
+                        timestamp = String.valueOf(timestampDate.getTime());
+                    } catch (Exception e) {
+                        log.error("日志转换异常", e);
+                    }
+
+                    infoListDTO.setTimestamp(timestamp);
                     infoList.add(infoListDTO);
                     unReadMsgDTO.setInfoList(infoList);
                     thirdOrderPushUtil.syncUnReadMsgCount(unReadMsgDTO);

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

@@ -119,14 +119,15 @@ public class PatientServiceImpl implements PatientService {
             List<PatientSignEntity> patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
                     signStatus, status);
             if (!patientSignEntities.isEmpty()) {
-                if (!SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
+//                if (!SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
                     return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
-                }
-                PatientSignEntity patientSignEntity = patientSignEntities.get(0);
-                Date signCreateTime = patientSignEntity.getCreateTime();
-                if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
-                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
-                }
+//                }
+//                PatientSignEntity patientSignEntity = patientSignEntities.get(0);
+//                Date signCreateTime = patientSignEntity.getCreateTime();
+//                log.info("");
+//                if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
+//                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
+//                }
             }
         } else {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
@@ -364,4 +365,24 @@ public class PatientServiceImpl implements PatientService {
         List<PatientSignEntity> patientSignEntities = patientSignMapper.selectList(psWrapper);
         return patientSignEntities;
     }
+
+    public static void main(String[] args) {
+        Date curDate = new Date();
+        Date signEndTime = DateUtils.getAfterDay(curDate, CommonConstants.DAY);
+        Date signStartTime = new Date();
+        try {
+
+                signEndTime = DateUtils.parseDate("2024-04-19 23:59:59", DateUtils.FULL_FORMAT);
+                signStartTime = DateUtils.parseDate("2024-03-19 10:29:47", DateUtils.FULL_FORMAT);
+
+            Date signCreateTime = DateUtils.parseDate("2024-04-01 17:48:32", DateUtils.FULL_FORMAT);
+            if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
+                System.out.println("xxxxx");
+            }
+            System.out.println("wwwww");
+        } catch (Exception e) {
+
+        }
+
+    }
 }