Merge branch 'test'

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

@@ -180,7 +180,7 @@ public class ImChatTemplateImpl implements ImChatTemplate {
                                 }
                             } else if (i == 1) {
                                 Map<String, Object> imageMap = new HashMap<>();
-                                if (reportDetailVo.getReportType().equals(1)) {
+//                                if (reportDetailVo.getReportType().equals(1)) {
                                     imageMap.put("UserAction", CommonConstants.USER_ACTION);
                                     imageMap.put("applicationCode", IMInformConstants.IM_SYSTEM_BUSINESS_CODE);
                                     imageMap.put("appointmentId", sendImMsgDTO.getAdmId());
@@ -197,7 +197,7 @@ public class ImChatTemplateImpl implements ImChatTemplate {
                                     imageMap.put("toApplicationCode", IMInformConstants.IM_SYSTEM_BUSINESS_CODE);
 
                                     msgType = "TIMCustomElem";
-                                }
+//                                }
                                 content = JSONObject.toJSONString(imageMap);
                             } else if (i == 2) {
                                 if (Objects.nonNull(reportDetailVo)) {

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

@@ -78,6 +78,7 @@ public class PatientServiceImpl implements PatientService {
     public BaseResponse<String> signedDoctor(SignedDoctorDTO reqVo) {
 
         MobileBenefitPackageEntity entity = mobileBenefitPackageMapper.queryByPhone(reqVo.getPhone(), reqVo.getPackageOrderId(), null);
+        log.info("entity={}", entity);
         if (ObjectUtils.isEmpty(entity)) {
             return BaseResponse.error("没有查询到有关权益");
         }
@@ -119,15 +120,16 @@ 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();
-//                log.info("");
-//                if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
-//                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
-//                }
+                }
+                PatientSignEntity patientSignEntity = patientSignEntities.get(0);
+                Date signCreateTime = oldPatientSignEntity.getCreateTime();
+                log.info("signCreateTime={}, signStartTime={}, signEndTime={}", signCreateTime, signStartTime, signEndTime);
+                if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
+                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
+                }
+                oldPatientSignEntity = patientSignEntity;
             }
         } else {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();

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

@@ -55,9 +55,11 @@ public class SignedTask {
 
     @Scheduled(cron = "0 0 10 * * ?")
     public void healthRecordWhetherUpdate() {
+        log.info("开始进行健康查询处理...");
         PatientSignEntity patientSignEntity = new PatientSignEntity();
         patientSignEntity.setStatus(StatusEnum.IN_CONSULTATION.getValue());
         List<PatientSignEntity> patientSignEntities = patientSignSevice.selectList(patientSignEntity);
+        log.info("查询健康patientSignEntities={}", patientSignEntities);
         if (!patientSignEntities.isEmpty()) {
             for (PatientSignEntity ps : patientSignEntities) {
                 HealthInfoDTO healthInfoDTO = new HealthInfoDTO();
@@ -135,7 +137,9 @@ public class SignedTask {
 
     @Scheduled(cron = "0 0 20 * * ?")
     public void holidayPush() {
+        log.info("开始进行节假日消息处理...");
         List<PatientSignEntity> patientSignEntities = patientSignSevice.selectList(new PatientSignEntity());
+        log.info("查询节假日消息patientSignEntities={}", patientSignEntities);
         try {
             if (!patientSignEntities.isEmpty()) {
                 for (PatientSignEntity ps : patientSignEntities) {
@@ -184,7 +188,9 @@ public class SignedTask {
 
     @Scheduled(cron = "0 0 1 * * ?")
     public void orderInvalidation() {
+        log.info("开始进行权益信息处理...");
         List<MobileBenefitPackageEntity> mobileBenefitPackageEntities = mobileBenefitPackageMapper.queryMaxOneList();
+        log.info("查询需要处理的权限mobileBenefitPackageEntities={}", mobileBenefitPackageEntities);
         try {
             if (!mobileBenefitPackageEntities.isEmpty()) {
                 for (MobileBenefitPackageEntity mbp : mobileBenefitPackageEntities) {

family-doctor-server/src/main/resources/mapper/MobileBenefitPackageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ebaiyihui.family.doctor.server.mapper.MobileBenefitPackageMapper">
     <sql id="base_columns">
-        x_id,productId,phone,userId,orderId,timeLimit,used,activateOrderId
+        x_id,productId,phone,userId,orderId,timeLimit,used,activateOrderId,benefitsStartTime,benefitsEndTime
     </sql>
     <insert id="insert">
         INSERT INTO mobile_benefit_package (