feat:家庭医生初始化

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/aspect/LogAspect.java

@@ -16,6 +16,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * @program chenmt-rides
@@ -57,9 +58,10 @@ public class LogAspect {
         /**
          * 记录下请求内容
          */
-
-        log.info("请求开始===方法描述:{},\n请求方法:{},\n请求地址:{},\n请求ip:{},\n请求类型:{},\n请求参数:{}", operation.value(), joinPoint.getSignature().getName(), request.getRequestURL().toString(),
-                request.getRemoteAddr(), request.getMethod(), JSON.toJSONString(Arrays.toString(joinPoint.getArgs())));
+        if (Objects.nonNull(operation)){
+            log.info("请求开始===方法描述:{},\n请求方法:{},\n请求地址:{},\n请求ip:{},\n请求类型:{},\n请求参数:{}", operation.value(), joinPoint.getSignature().getName(), request.getRequestURL().toString(),
+                    request.getRemoteAddr(), request.getMethod(), JSON.toJSONString(Arrays.toString(joinPoint.getArgs())));
+        }
     }
 
     @AfterReturning(returning = "ret", pointcut = "LogAspect()")

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/entity/PatientSignEntity.java

@@ -80,4 +80,7 @@ public class PatientSignEntity {
 
     @ApiModelProperty("签名结束时间")
     private Date signEndTime;
+
+    @ApiModelProperty("签约关联id")
+    private String signId;
 }

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

@@ -106,7 +106,7 @@ public class PatientServiceImpl implements PatientService {
             psWrapper.setEntity(patientSign);
             List<PatientSignEntity> patientSignEntities = patientSignMapper.selectList(psWrapper);
             if (!patientSignEntities.isEmpty()) {
-                return BaseResponse.error("已经有进行中的签约的医生，不能在进行签约！！！");
+                return BaseResponse.error("已经有进行中的签约的医生，不能再进行签约！！！");
             }
         } else {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
@@ -181,6 +181,9 @@ public class PatientServiceImpl implements PatientService {
         patientSignEntity.setStatus(StatusEnum.IN_CONSULTATION.getValue());
         patientSignEntity.setPackageOrderId(reqVo.getPackageOrderId());
         patientSignEntity.setSignEndTime(signEndTime);
+        if (Objects.nonNull(reqVo.getSignSeqId())){
+            patientSignEntity.setSignId(reqVo.getSignSeqId());
+        }
 
         patientSignMapper.insert(patientSignEntity);