Merge branch 'master' of dd.tall.wiki:ccsens_wiki/carbasics

src/main/java/com/ccsens/carbasics/service/FirstAidService.java

@@ -25,6 +25,7 @@ import com.ccsens.carbasics.util.DefaultCodeError;
 import com.ccsens.common.bean.dto.CProjectDto;
 import com.ccsens.common.bean.vo.CProjectVo;
 import com.ccsens.common.service.IProjectService;
+import com.ccsens.util.RedisUtil;
 import com.ccsens.util.exception.BaseException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -67,6 +68,8 @@ public class FirstAidService implements IFirstAidService{
     private FirstAidRecordMapper firstAidRecordMapper;
     @Resource
     private FirstAidRecordLogMapper firstAidRecordLogMapper;
+    @Resource
+    private RedisUtil redisUtil;
 
 
     @Override
@@ -387,10 +390,18 @@ public class FirstAidService implements IFirstAidService{
             copyProjectInfo.setId(firstAidInfo.getProjectId());
         }else {
             CProjectDto.CopyProject copyProject = new CProjectDto.CopyProject();
+            String newProjectName = "";
+            long incr = redisUtil.incr("hospital_" + firstAidInfo.getHospitalId().toString(), 1L);
             if (0 == param.getType()){
                 //TODO 设置项目id为神内模板 和 项目名字
+                newProjectName = incr+"-"+"急救(神内)-"+firstAidInfo.getName();
+                copyProject.setProjectName(newProjectName);
+                copyProject.setProjectId((Long) redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_SHENNEI));
             }else{
                 //TODO 设置项目id为神外模板 和 项目名字
+                newProjectName = incr+"-"+"急救(神外)-"+firstAidInfo.getName();
+                copyProject.setProjectName(newProjectName);
+                copyProject.setProjectId((Long) redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_SHENWAI));
             }
             log.info("加入急救-开始创建项目{}",copyProject);
             copyProjectInfo = projectService.copyProject(copyProject, userId);

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

@@ -164,9 +164,14 @@ public class Constant {
     }
 
     /**
-     * 创建病例:模板项目id
+     * 创建病例:模板项目id神内
      */
-    public static final String TEMPLATE_PROJECT_KEY = "template_project_key";
+    public static final String TEMPLATE_PROJECT_KEY_SHENNEI = "template_project_key_shennei";
+    /**
+     * 创建病例:模板项目id神外
+     */
+    public static final String TEMPLATE_PROJECT_KEY_SHENWAI = "template_project_key_shenwai";
+
 
     /**
      * 最大修改次数