diff --git a/postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx b/postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx new file mode 100644 index 00000000..96e2fb96 Binary files /dev/null and b/postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx differ 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 4424712d..2c3d4451 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 @@ -153,4 +153,9 @@ public class Constants { * 机构信息导入标识 */ public static final String AGENCY = "agency"; + + /** + * 科室信息导入标识 + */ + public static final String DEPARTMENT = "department"; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java index 481530ca..49971ea5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java @@ -1,6 +1,7 @@ package com.xinelu.manage.controller.department; import com.xinelu.common.annotation.Log; +import com.xinelu.common.constant.Constants; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; @@ -9,13 +10,19 @@ import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.department.Department; import com.xinelu.manage.dto.department.DepartmentDTO; import com.xinelu.manage.service.department.IDepartmentService; +<<<<<<< HEAD import com.xinelu.manage.vo.department.DepartmentVO; +======= +import org.apache.commons.lang3.StringUtils; +>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Objects; /** * 科室信息Controller @@ -131,4 +138,29 @@ public class DepartmentController extends BaseController { List list = departmentService.selectDepartmentListMessageNum(departmentDto); return AjaxResult.success(list); } + + /** + * 导入科室信息 + * + * @param file 模板文件 + * @return 导入结果 + * @throws Exception 异常信息 + */ + @PreAuthorize("@ss.hasPermi('system:agency:importStationInfo')") + @Log(title = "导入科室信息", businessType = BusinessType.IMPORT) + @PostMapping("/insertDepartmentList") + public AjaxResult insertDepartmentList(MultipartFile file) throws Exception { + //判断excel里面是否有数据/文件格式 + if (Objects.isNull(file) || StringUtils.isBlank(file.getOriginalFilename())) { + return AjaxResult.error("请选择需要导入的文件！"); + } + // 获取文件名 + String orgName = file.getOriginalFilename(); + if (!orgName.endsWith(Constants.XLSX) && !orgName.endsWith(Constants.XLS)) { + return AjaxResult.error("导入文件格式不正确，请导入xlsx或xls格式的文件！"); + } + ExcelUtil util = new ExcelUtil<>(Department.class); + List list = util.importExcel(file.getInputStream()); + return departmentService.insertDepartmentList(list); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java index f1e504f4..513d1c6a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java @@ -64,7 +64,7 @@ public class DepartmentDiseaseTypeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:departmentDisease:add')") @Log(title = "科室病种信息", businessType = BusinessType.INSERT) - @PostMapping("/add") + @PostMapping public AjaxResult add(@RequestBody DepartmentDiseaseType departmentDiseaseType) { return toAjax(departmentDiseaseTypeService.insertDepartmentDiseaseType(departmentDiseaseType)); } @@ -74,7 +74,7 @@ public class DepartmentDiseaseTypeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:departmentDisease:edit')") @Log(title = "科室病种信息", businessType = BusinessType.UPDATE) - @PutMapping("/edit") + @PutMapping public AjaxResult edit(@RequestBody DepartmentDiseaseType departmentDiseaseType) { return toAjax(departmentDiseaseTypeService.updateDepartmentDiseaseType(departmentDiseaseType)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/importdownload/ImportDownloadController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/importdownload/ImportDownloadController.java index f5790d87..49471a17 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/importdownload/ImportDownloadController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/importdownload/ImportDownloadController.java @@ -41,6 +41,9 @@ public class ImportDownloadController { if (fileType.equals(Constants.AGENCY)) { file = ResourceUtils.getFile("classpath:template/机构信息导入表.xlsx"); } + if (fileType.equals(Constants.DEPARTMENT)) { + file = ResourceUtils.getFile("classpath:template/科室信息导入表.xlsx"); + } if (Objects.isNull(file)) { throw new ServiceException("下载导入模板文件失败，请联系管理员！"); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/normdepartmentcompare/NormDepartmentCompareController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/normdepartmentcompare/NormDepartmentCompareController.java new file mode 100644 index 00000000..bbf2c96d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/normdepartmentcompare/NormDepartmentCompareController.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.controller.normdepartmentcompare; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.normdepartmentcompare.NormDepartmentCompare; +import com.xinelu.manage.service.normdepartmentcompare.INormDepartmentCompareService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 标准科室对照信息Controller + * + * @author xinelu + * @date 2024-02-28 + */ +@RestController +@RequestMapping("/system/compare") +public class NormDepartmentCompareController extends BaseController { + @Resource + private INormDepartmentCompareService normDepartmentCompareService; + + /** + * 查询标准科室对照信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:compare:list')") + @GetMapping("/list") + public TableDataInfo list(NormDepartmentCompare normDepartmentCompare) { + startPage(); + List list = normDepartmentCompareService.selectNormDepartmentCompareList(normDepartmentCompare); + return getDataTable(list); + } + + /** + * 导出标准科室对照信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:compare:export')") + @Log(title = "标准科室对照信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, NormDepartmentCompare normDepartmentCompare) { + List list = normDepartmentCompareService.selectNormDepartmentCompareList(normDepartmentCompare); + ExcelUtil util = new ExcelUtil(NormDepartmentCompare.class); + util.exportExcel(response, list, "标准科室对照信息数据"); + } + + /** + * 获取标准科室对照信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:compare:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(normDepartmentCompareService.selectNormDepartmentCompareById(id)); + } + + /** + * 新增标准科室对照信息 + */ + @PreAuthorize("@ss.hasPermi('system:compare:add')") + @Log(title = "标准科室对照信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody NormDepartmentCompare normDepartmentCompare) { + return toAjax(normDepartmentCompareService.insertNormDepartmentCompare(normDepartmentCompare)); + } + + /** + * 修改标准科室对照信息 + */ + @PreAuthorize("@ss.hasPermi('system:compare:edit')") + @Log(title = "标准科室对照信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody NormDepartmentCompare normDepartmentCompare) { + return toAjax(normDepartmentCompareService.updateNormDepartmentCompare(normDepartmentCompare)); + } + + /** + * 删除标准科室对照信息 + */ + @PreAuthorize("@ss.hasPermi('system:compare:remove')") + @Log(title = "标准科室对照信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(normDepartmentCompareService.deleteNormDepartmentCompareByIds(ids)); + } +} 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 93349be5..cf21cff6 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 @@ -99,8 +99,8 @@ public class Department extends BaseEntity { /** * 节点类型，科室：DEPARTMENT，病区：WARD， */ - @ApiModelProperty(value = "节点类型，科室：DEPARTMENT，病区：WARD，") - @Excel(name = "节点类型，科室：DEPARTMENT，病区：WARD，") + @ApiModelProperty(value = "节点类型，科室：DEPARTMENT，病区：WARD") + @Excel(name = "节点类型，科室：DEPARTMENT，病区：WARD") private String nodeType; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/normdepartmentcompare/NormDepartmentCompare.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/normdepartmentcompare/NormDepartmentCompare.java new file mode 100644 index 00000000..81e1f22e --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/normdepartmentcompare/NormDepartmentCompare.java @@ -0,0 +1,92 @@ +package com.xinelu.manage.domain.normdepartmentcompare; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 标准科室对照信息对象 norm_department_compare + * + * @author xinelu + * @date 2024-02-28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "标准科室对照信息对象", description = "norm_department_compare") +public class NormDepartmentCompare extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 所属科室id + */ + @ApiModelProperty(value = "所属科室id") + @Excel(name = "所属科室id") + private Long departmentId; + + /** + * 所属科室名称 + */ + @ApiModelProperty(value = "所属科室名称") + @Excel(name = "所属科室名称") + private String departmentName; + + /** + * 标准对照名称 + */ + @ApiModelProperty(value = "标准对照名称") + @Excel(name = "标准对照名称") + private String normCompareName; + + /** + * 标准对照编码 + */ + @ApiModelProperty(value = "标准对照编码") + @Excel(name = "标准对照编码") + private String normCompareCode; + + /** + * 标准对照排序 + */ + @ApiModelProperty(value = "标准对照排序") + @Excel(name = "标准对照排序") + private Integer normCompareSort; + + /** + * 标准对照概述 + */ + @ApiModelProperty(value = "标准对照概述") + @Excel(name = "标准对照概述") + private String normCompareRemark; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("departmentId", getDepartmentId()) + .append("departmentName", getDepartmentName()) + .append("normCompareName", getNormCompareName()) + .append("normCompareCode", getNormCompareCode()) + .append("normCompareSort", getNormCompareSort()) + .append("normCompareRemark", getNormCompareRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java index c7fcdba5..4f4356de 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java @@ -1,8 +1,13 @@ package com.xinelu.manage.mapper.department; import com.xinelu.manage.domain.department.Department; +<<<<<<< HEAD import com.xinelu.manage.dto.department.DepartmentDTO; import com.xinelu.manage.vo.department.DepartmentVO; +======= +import com.xinelu.manage.dto.DepartmentDto; +import org.apache.ibatis.annotations.Param; +>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba import java.util.List; @@ -86,6 +91,7 @@ public interface DepartmentMapper { */ List selectDepartmentListWechatTemplateNum(DepartmentDTO departmentDto); +<<<<<<< HEAD /** * 查询科室信息列表及包含短信库数量 * @@ -93,4 +99,22 @@ public interface DepartmentMapper { * @return */ List selectDepartmentListMessageNum(DepartmentDTO departmentDto); +======= + + /** + * 查询所有的机构信息 + * + * @param departmentNames 机构信息集合 + * @return 列表集合信息 + */ + List getAllDepartmentInfo(@Param("departmentNames") List departmentNames); + + /** + * 科室信息导入 + * + * @param departmentList 机构信息 + * @return int + **/ + int insertDepartmentList(List departmentList); +>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/normdepartmentcompare/NormDepartmentCompareMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/normdepartmentcompare/NormDepartmentCompareMapper.java new file mode 100644 index 00000000..0f6060b2 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/normdepartmentcompare/NormDepartmentCompareMapper.java @@ -0,0 +1,62 @@ +package com.xinelu.manage.mapper.normdepartmentcompare; + +import com.xinelu.manage.domain.normdepartmentcompare.NormDepartmentCompare; + +import java.util.List; + + +/** + * 标准科室对照信息Mapper接口 + * + * @author xinelu + * @date 2024-02-28 + */ +public interface NormDepartmentCompareMapper { + /** + * 查询标准科室对照信息 + * + * @param id 标准科室对照信息主键 + * @return 标准科室对照信息 + */ + NormDepartmentCompare selectNormDepartmentCompareById(Long id); + + /** + * 查询标准科室对照信息列表 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 标准科室对照信息集合 + */ + List selectNormDepartmentCompareList(NormDepartmentCompare normDepartmentCompare); + + /** + * 新增标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + int insertNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare); + + /** + * 修改标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + int updateNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare); + + /** + * 删除标准科室对照信息 + * + * @param id 标准科室对照信息主键 + * @return 结果 + */ + int deleteNormDepartmentCompareById(Long id); + + /** + * 批量删除标准科室对照信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteNormDepartmentCompareByIds(Long[] ids); +} 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 180cb455..e1f9e9f2 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 @@ -165,9 +165,9 @@ public class AgencyServiceImpl implements IAgencyService { } List agencyNames = importDataList.stream().filter(item -> StringUtils.isNotBlank(item.getAgencyName())).map(Agency::getAgencyName).distinct().collect(Collectors.toList()); //根据名称查询护理站基本信息 - List allNurseStationInfo = agencyMapper.getAllAgencyInfo(agencyNames); + List allAgencyInfo = agencyMapper.getAllAgencyInfo(agencyNames); //做差集，去除数据库中已经存在的护理站信息 - List subtractList = new ArrayList<>(CollectionUtils.subtract(importDataList, allNurseStationInfo)); + List subtractList = new ArrayList<>(CollectionUtils.subtract(importDataList, allAgencyInfo)); if (CollectionUtils.isEmpty(subtractList)) { return AjaxResult.success(); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java index b7d96ddd..282c53cb 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.department; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.department.Department; import com.xinelu.manage.dto.department.DepartmentDTO; import com.xinelu.manage.vo.department.DepartmentVO; @@ -84,6 +85,7 @@ public interface IDepartmentService { * @param departmentDto * @return */ +<<<<<<< HEAD List selectDepartmentListWechatTemplateNum(DepartmentDTO departmentDto); /** @@ -93,4 +95,15 @@ public interface IDepartmentService { * @return */ List selectDepartmentListMessageNum(DepartmentDTO departmentDto); +======= + List selectDepartmentListWechatTemplateNum(DepartmentDto departmentDto); + + /** + * 科室信息导入 + * + * @param departmentList 科室信息 + * @return int + **/ + AjaxResult insertDepartmentList(List departmentList); +>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba } 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 2b5c3189..f518651f 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,15 +1,31 @@ package com.xinelu.manage.service.department.impl; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.StringUtils; +import com.xinelu.common.utils.bean.BeanUtils; +import com.xinelu.common.utils.regex.RegexUtil; import com.xinelu.manage.domain.department.Department; import com.xinelu.manage.dto.department.DepartmentDTO; import com.xinelu.manage.mapper.department.DepartmentMapper; import com.xinelu.manage.service.department.IDepartmentService; +<<<<<<< HEAD import com.xinelu.manage.vo.department.DepartmentVO; +======= +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.BooleanUtils; +>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** @@ -22,6 +38,8 @@ import java.util.List; public class DepartmentServiceImpl implements IDepartmentService { @Resource private DepartmentMapper departmentMapper; + @Resource + private RegexUtil regexUtil; /** * 查询科室信息 @@ -94,7 +112,7 @@ public class DepartmentServiceImpl implements IDepartmentService { /** * 查询科室信息列表及包含话术数量 * - * @param department + * @param departmentDto * @return */ @Override @@ -125,6 +143,7 @@ public class DepartmentServiceImpl implements IDepartmentService { } /** +<<<<<<< HEAD * 查询科室信息列表及包含短信库数量 * * @param departmentDto @@ -135,4 +154,50 @@ public class DepartmentServiceImpl implements IDepartmentService { return departmentMapper.selectDepartmentListMessageNum(departmentDto); } +======= + * 科室信息导入 + * + * @param departmentList 科室信息 + * @return 导入结果 + **/ + @Transactional(rollbackFor = Exception.class) + @Override + public AjaxResult insertDepartmentList(List departmentList) { + //判断添加的数据是否为空 + if (CollectionUtils.isEmpty(departmentList)) { + return AjaxResult.error("请添加科室导入信息！"); + } + //根据护理站名称做去除处理 + List importDataList = departmentList.stream().filter(item -> StringUtils.isNotBlank(item.getDepartmentName())).distinct().collect(Collectors.toList()); + //校验联系电话格式是否正确 + Department department = importDataList.stream().filter(item -> StringUtils.isNotBlank(item.getDepartmentPhone())).filter(item -> BooleanUtils.isFalse(regexUtil.regexPhone(item.getDepartmentPhone()))).findFirst().orElse(new Department()); + if (StringUtils.isNotBlank(department.getDepartmentPhone())) { + return AjaxResult.error("当前科室电话：" + department.getDepartmentPhone() + " 格式不正确，请重新录入！"); + } + List departmentName = importDataList.stream().filter(item -> StringUtils.isNotBlank(item.getDepartmentName())).map(Department::getDepartmentName).distinct().collect(Collectors.toList()); + //根据名称查询护理站基本信息 + List allDepartment = departmentMapper.getAllDepartmentInfo(departmentName); + //做差集，去除数据库中已经存在的护理站信息 + List subtractList = new ArrayList<>(CollectionUtils.subtract(importDataList, allDepartment)); + if (CollectionUtils.isEmpty(subtractList)) { + return AjaxResult.success(); + } + List saveDepartmentList = new ArrayList<>(); + for (Department item : subtractList) { + if (Objects.isNull(item.getParentDepartmentId())) { + item.setParentDepartmentId(0L); + } + item.setCreateBy(SecurityUtils.getUsername()); + item.setCreateTime(new Date()); + Department newDepartment = new Department(); + BeanUtils.copyProperties(item, newDepartment); + saveDepartmentList.add(newDepartment); + } + int insertCount = departmentMapper.insertDepartmentList(saveDepartmentList); + if (insertCount <= 0) { + throw new ServiceException("导入科室信息失败，请联系管理员！"); + } + return AjaxResult.success(); + } +>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/INormDepartmentCompareService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/INormDepartmentCompareService.java new file mode 100644 index 00000000..007c1fd8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/INormDepartmentCompareService.java @@ -0,0 +1,62 @@ +package com.xinelu.manage.service.normdepartmentcompare; + +import com.xinelu.manage.domain.normdepartmentcompare.NormDepartmentCompare; + +import java.util.List; + + +/** + * 标准科室对照信息Service接口 + * + * @author xinelu + * @date 2024-02-28 + */ +public interface INormDepartmentCompareService { + /** + * 查询标准科室对照信息 + * + * @param id 标准科室对照信息主键 + * @return 标准科室对照信息 + */ + NormDepartmentCompare selectNormDepartmentCompareById(Long id); + + /** + * 查询标准科室对照信息列表 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 标准科室对照信息集合 + */ + List selectNormDepartmentCompareList(NormDepartmentCompare normDepartmentCompare); + + /** + * 新增标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + int insertNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare); + + /** + * 修改标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + int updateNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare); + + /** + * 批量删除标准科室对照信息 + * + * @param ids 需要删除的标准科室对照信息主键集合 + * @return 结果 + */ + int deleteNormDepartmentCompareByIds(Long[] ids); + + /** + * 删除标准科室对照信息信息 + * + * @param id 标准科室对照信息主键 + * @return 结果 + */ + int deleteNormDepartmentCompareById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/impl/NormDepartmentCompareServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/impl/NormDepartmentCompareServiceImpl.java new file mode 100644 index 00000000..98d2d7a8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/impl/NormDepartmentCompareServiceImpl.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.service.normdepartmentcompare.impl; + +import com.xinelu.common.utils.DateUtils; +import com.xinelu.manage.domain.normdepartmentcompare.NormDepartmentCompare; +import com.xinelu.manage.mapper.normdepartmentcompare.NormDepartmentCompareMapper; +import com.xinelu.manage.service.normdepartmentcompare.INormDepartmentCompareService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 标准科室对照信息Service业务层处理 + * + * @author xinelu + * @date 2024-02-28 + */ +@Service +public class NormDepartmentCompareServiceImpl implements INormDepartmentCompareService { + @Resource + private NormDepartmentCompareMapper normDepartmentCompareMapper; + + /** + * 查询标准科室对照信息 + * + * @param id 标准科室对照信息主键 + * @return 标准科室对照信息 + */ + @Override + public NormDepartmentCompare selectNormDepartmentCompareById(Long id) { + return normDepartmentCompareMapper.selectNormDepartmentCompareById(id); + } + + /** + * 查询标准科室对照信息列表 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 标准科室对照信息 + */ + @Override + public List selectNormDepartmentCompareList(NormDepartmentCompare normDepartmentCompare) { + return normDepartmentCompareMapper.selectNormDepartmentCompareList(normDepartmentCompare); + } + + /** + * 新增标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + @Override + public int insertNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare) { + normDepartmentCompare.setCreateTime(DateUtils.getNowDate()); + return normDepartmentCompareMapper.insertNormDepartmentCompare(normDepartmentCompare); + } + + /** + * 修改标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + @Override + public int updateNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare) { + normDepartmentCompare.setUpdateTime(DateUtils.getNowDate()); + return normDepartmentCompareMapper.updateNormDepartmentCompare(normDepartmentCompare); + } + + /** + * 批量删除标准科室对照信息 + * + * @param ids 需要删除的标准科室对照信息主键 + * @return 结果 + */ + @Override + public int deleteNormDepartmentCompareByIds(Long[] ids) { + return normDepartmentCompareMapper.deleteNormDepartmentCompareByIds(ids); + } + + /** + * 删除标准科室对照信息信息 + * + * @param id 标准科室对照信息主键 + * @return 结果 + */ + @Override + public int deleteNormDepartmentCompareById(Long id) { + return normDepartmentCompareMapper.deleteNormDepartmentCompareById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java index 84c659ae..6c40c4b3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java @@ -53,6 +53,17 @@ public class SysAreaVO implements Serializable { */ private String streetCode; + + /** + * 社区名称 + */ + private String communityName; + + /** + * 社区区域编码 + */ + private String communityCode; + /** * 街道区域编码 */ diff --git a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml index cf14464d..7568865a 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml @@ -250,6 +250,39 @@ d.department_code + + insert into department @@ -355,6 +388,59 @@ + + insert into department( + parent_department_id, + agency_id, + agency_name, + department_name, + department_code, + department_type, + department_abbreviation, + department_person_id, + department_person_name, + node_type, + provide_service_category, + subdivision_category_id, + subdivision_category_name, + norm_department_compare_id, + norm_department_compare_name, + prepare_beds_count, + department_phone, + department_mail, + establish_date, + revoke_date, + create_by, + create_time + ) values + + ( + #{Department.parentDepartmentId}, + #{Department.agencyId}, + #{Department.agencyName}, + #{Department.departmentName}, + #{Department.departmentCode}, + #{Department.departmentType}, + #{Department.departmentAbbreviation}, + #{Department.departmentPersonId}, + #{Department.departmentPersonName}, + #{Department.nodeType}, + #{Department.provideServiceCategory}, + #{Department.subdivisionCategoryId}, + #{Department.subdivisionCategoryName}, + #{Department.normDepartmentCompareId}, + #{Department.normDepartmentCompareName}, + #{Department.prepareBedsCount}, + #{Department.departmentPhone}, + #{Department.departmentMail}, + #{Department.establishDate}, + #{Department.revokeDate}, + #{Department.createBy}, + #{Department.createTime} + ) + + + update department diff --git a/postdischarge-manage/src/main/resources/mapper/manage/normdepartmentcompare/NormDepartmentCompareMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/normdepartmentcompare/NormDepartmentCompareMapper.xml new file mode 100644 index 00000000..353aa678 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/normdepartmentcompare/NormDepartmentCompareMapper.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + select id, department_id, department_name, norm_compare_name, norm_compare_code, norm_compare_sort, norm_compare_remark, create_by, create_time, update_by, update_time from norm_department_compare + + + + + + + + insert into norm_department_compare + + department_id, + + department_name, + + norm_compare_name, + + norm_compare_code, + + norm_compare_sort, + + norm_compare_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{departmentId}, + + #{departmentName}, + + #{normCompareName}, + + #{normCompareCode}, + + #{normCompareSort}, + + #{normCompareRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update norm_department_compare + + department_id = + #{departmentId}, + + department_name = + #{departmentName}, + + norm_compare_name = + #{normCompareName}, + + norm_compare_code = + #{normCompareCode}, + + norm_compare_sort = + #{normCompareSort}, + + norm_compare_remark = + #{normCompareRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from norm_department_compare where id = #{id} + + + + delete from norm_department_compare where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml index 2511fb4a..08ad85e8 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml @@ -60,36 +60,25 @@