From 7f839b4126b9e2b0429eca8c84eb42357e37d015 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 19 Apr 2024 17:17:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/template/科室信息导入表.xlsx    | Bin 11120 -> 11021 bytes
 .../com/xinelu/common/constant/Constants.java |  15 ++++++++++-----
 .../manage/domain/department/Department.java  |   2 --
 .../agency/impl/AgencyServiceImpl.java        |   5 +++++
 .../impl/DepartmentServiceImpl.java           |   5 +++++
 .../impl/InfoCategoryServiceImpl.java         |   2 +-
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx b/postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx
index 96e2fb969277ac16f72d63cc76923b3254d3bc20..5a0c7c8f607808f6cb53b2cc86b07e5dd6c2ba12 100644
GIT binary patch
delta 5301
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

delta 5452
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
O*Wau}D1A)NrT+s!Wi*Tc

diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
index e7d20390..e118190c 100644
--- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
+++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
@@ -194,6 +194,16 @@ public class Constants {
      */
     public static final String TASK_STATUS_CODE = "TSC";
 
+    /**
+     * 任务状态编码
+     */
+    public static final String AGENCY_CODE = "AYC";
+
+    /**
+     * 任务状态编码
+     */
+    public static final String DEPARTMENT_CODE = "DTC";
+
     /**
      * 门诊患者
      */
@@ -323,9 +333,4 @@ public class Constants {
      * 资讯编码前缀
      */
     public static final String INFO_CODE = "IC";
-
-    /**
-     * 科室编码前缀
-     */
-    public static final String DEPARTMENT_CODE = "HDC";
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java
index 4e2d3884..8879a9f1 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java
@@ -165,7 +165,6 @@ public class Department extends BaseEntity {
      */
     @ApiModelProperty(value = "成立日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate establishDate;
 
     /**
@@ -173,7 +172,6 @@ public class Department extends BaseEntity {
      */
     @ApiModelProperty(value = "撤销日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate revokeDate;
 
     @Override
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
index 443309c3..b63f026f 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
@@ -1,10 +1,12 @@
 package com.xinelu.manage.service.agency.impl;
 
+import com.xinelu.common.constant.Constants;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.enums.NodeTypeEnum;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
+import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
 import com.xinelu.common.utils.regex.RegexUtil;
 import com.xinelu.manage.domain.agency.Agency;
 import com.xinelu.manage.domain.department.Department;
@@ -48,6 +50,8 @@ public class AgencyServiceImpl implements IAgencyService {
     private SysAreaMapper sysAreaMapper;
     @Resource
     private DepartmentMapper departmentMapper;
+    @Resource
+    private GenerateSystemCodeUtil generateSystemCodeUtil;
 
 
     /**
@@ -114,6 +118,7 @@ public class AgencyServiceImpl implements IAgencyService {
         }
         agency.setCreateTime(LocalDateTime.now());
         agency.setCreateBy(SecurityUtils.getUsername());
+        agency.setAgencyCode(Constants.AGENCY_CODE + generateSystemCodeUtil.generateSystemCode(Constants.AGENCY_CODE));
         return AjaxResult.success(agencyMapper.insertAgency(agency));
     }
 
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
index da78de81..946f1ea0 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
@@ -1,11 +1,13 @@
 package com.xinelu.manage.service.department.impl;
 
+import com.xinelu.common.constant.Constants;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.core.domain.entity.SysUser;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.StringUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
+import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
 import com.xinelu.common.utils.regex.RegexUtil;
 import com.xinelu.manage.domain.department.Department;
 import com.xinelu.manage.dto.department.DepartmentDTO;
@@ -41,6 +43,8 @@ public class DepartmentServiceImpl implements IDepartmentService {
     private RegexUtil regexUtil;
     @Resource
     private SysUserMapper sysUserMapper;
+    @Resource
+    private GenerateSystemCodeUtil generateSystemCodeUtil;
 
     /**
      * 查询科室信息
@@ -108,6 +112,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
         }
         department.setCreateTime(LocalDateTime.now());
         department.setCreateBy(SecurityUtils.getUsername());
+        department.setDepartmentCode(Constants.DEPARTMENT_CODE + generateSystemCodeUtil.generateSystemCode(Constants.DEPARTMENT_CODE));
         return departmentMapper.insertDepartment(department);
     }
 
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/infocategory/impl/InfoCategoryServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/infocategory/impl/InfoCategoryServiceImpl.java
index 27fad338..4504c16c 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/infocategory/impl/InfoCategoryServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/infocategory/impl/InfoCategoryServiceImpl.java
@@ -89,7 +89,7 @@ public class InfoCategoryServiceImpl implements IInfoCategoryService {
             infocategory.setCreateTime(LocalDateTime.now());//设置添加时间
             infocategory.setInfoCategoryCreator(SecurityUtils.getUsername());//设置当前的用户
             infocategory.setInfoCategoryType(infocategory.getInfoCategoryName());//类型 无用  直接赋值和名称相同
-            infocategory.setInfoCategoryCode(Constants.INFO_CATEGORY_CODE + generateSystemCodeUtil.generateSystemCode(Constants.DEPARTMENT_CODE));
+            infocategory.setInfoCategoryCode(Constants.INFO_CATEGORY_CODE + generateSystemCodeUtil.generateSystemCode(Constants.INFO_CATEGORY_CODE));
         }
         int insertCount = infoCategoryMapper.insertInfoCategoryList(infoCategoryDTO.getInfoCategoryList());
         if (insertCount < 0) {