Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/ProjectDto.java

@@ -19,5 +19,7 @@ public class ProjectDto {
         @NotNull(message = "请选择要复制得项目")
         @ApiModelProperty("项目id")
         private Long projectId;
+        @ApiModelProperty("新项目名字")
+        private String projectName;
     }
 }

tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@@ -1516,7 +1516,11 @@ public class ProjectService implements IProjectService {
         BeanUtil.copyProperties(oldProject,newProject);
         newProject.setId(snowflake.nextId());
         newProject.setCreatorId(userId);
-        newProject.setName(oldProject.getName()+"-副本");
+        if (StrUtil.isNotBlank(param.getProjectName())){
+            newProject.setName(param.getProjectName());
+        }else{
+            newProject.setName(oldProject.getName()+"-副本");
+        }
         newProject.setTemplate((byte)0);
         newProject.setBeginTime(currentTime);
         newProject.setEndTime(currentTime+timeDifference);

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common
 

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Pattern;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -26,6 +27,7 @@ public class CreateCaseDto {
         private int patientAge;
         @ApiModelProperty("患者身份证号")
         private String patientIdCard;
+        @Pattern(regexp="^[1]([3-9])[0-9]{9}$",message="请输入正确的手机号")
         @ApiModelProperty("患者手机号")
         private String patientPhone;
         @ApiModelProperty("患者病案号")

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@@ -1,6 +1,7 @@
 package com.ccsens.wisdomcar.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.util.CodeEnum;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.exception.BaseException;
@@ -176,9 +177,15 @@ public class WisdomCarService implements IWisdomCarService {
 
 
         }
-
+        //新项目名字
+        String newProjectName = "";
+        newProjectName = patient.getMedicalRecordNum()+"-"+Constant.PROJECT_NAME;
+        if (StrUtil.isNotBlank(param.getPatientName())){
+            newProjectName +="-"+param.getPatientName();
+        }
         ProjectDto.CopyProject copyProject = new ProjectDto.CopyProject();
         copyProject.setProjectId(Constant.TEMPLATE_PROJECT);
+        copyProject.setProjectName(newProjectName);
         log.info("调用tall内的复制项目:{}",copyProject);
         QueryDto<ProjectDto.CopyProject> dto = new QueryDto<>();
         dto.setParam(copyProject);

wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java

@@ -53,6 +53,10 @@ public class Constant {
      * 智慧平车,模板项目id
      */
     public static final Long TEMPLATE_PROJECT = 1399649478197252096L;
+    /**
+     * 项目名字
+     */
+    public static final String PROJECT_NAME = "卒中急救流程";
 
     /**
      * 角色名称:患者家属