From e0e188d61c7bb7976c121c52a5ef42a51c75636f Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Fri, 4 Jun 2021 10:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=8D=E5=88=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/cloudutil/bean/tall/dto/ProjectDto.java   | 2 ++
 .../java/com/ccsens/tall/service/ProjectService.java     | 6 +++++-
 .../com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java     | 2 ++
 .../com/ccsens/wisdomcar/service/WisdomCarService.java   | 9 ++++++++-
 .../main/java/com/ccsens/wisdomcar/util/Constant.java    | 4 ++++
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/ProjectDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/ProjectDto.java
index 916aaef0..ff2f73b7 100644
--- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/ProjectDto.java
+++ b/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;
     }
 }
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java
index 3cf9ddd4..af2a77f0 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java
+++ b/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);
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java
index 9c393104..c7cd5ed9 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java
+++ b/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("患者病案号")
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java
index 21fb4d9b..d790b1cb 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java
+++ b/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);
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java
index 695d3a06..40f6ba46 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java
+++ b/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 = "卒种急救流程";
 
     /**
      * 角色名称:患者家属