病区去科室代码

common/src/main/java/com/lantone/common/dto/DeptListDTO.java

@@ -1,27 +0,0 @@
-package com.lantone.common.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import java.io.Serializable;
-
-/**
- * <p>
- * 科室表 实体类
- * </p>
- */
-@Data
-public class DeptListDTO implements Serializable {
-
-
-
-    /**
-     * 主键
-     */
-
-    private Long id;
-
-    /**
-     * 科室名称
-     */
-    @TableField("name")
-    private String name;
-}

common/src/main/java/com/lantone/common/dto/ViewRegionDTO.java

@@ -25,12 +25,6 @@ public class ViewRegionDTO implements Serializable {
     @ApiModelProperty(value = "病区id")
     private Long id;
 
-    @ApiModelProperty(value = "关联科室")
-    private String deptName;
-
-    @ApiModelProperty(value = "关联科室-集合展示")
-    private List<String> deptNameList = new ArrayList<>();
-
     @ApiModelProperty(value = "启用状态 0-否 1-是")
     private String status;
 

common/src/main/java/com/lantone/common/vo/GetDeptListVO.java

@@ -1,23 +0,0 @@
-package com.lantone.common.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author: cy
- * @time: 2021/8/2 18:38
- */
-@Getter
-@Setter
-public class GetDeptListVO {
-    @ApiModelProperty(value = "医院ID",hidden = true)
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "用户ID",hidden = true)
-    private Long userId;
-
-    @ApiModelProperty(value = "科室名称")
-    private String deptName;
-}

common/src/main/java/com/lantone/common/vo/SaveRegionVO.java

@@ -51,9 +51,6 @@ import java.util.List;
     @ApiModelProperty(value = "排序")
     private String orderNo;
 
-    @ApiModelProperty(value = "科室id集合")
-    private List<Long> deptIds;
-
     @ApiModelProperty(value = "备注")
     private String remark;
 

common/src/main/java/com/lantone/common/vo/UpdateRegionVO.java

@@ -49,9 +49,6 @@ import java.util.List;
     @ApiModelProperty(value = "排序")
     private String orderNo;
 
-    @ApiModelProperty(value = "科室id集合")
-    private List<Long> deptIds;
-
     @ApiModelProperty(value = "备注")
     private String remark;
 

dblayer-mbg/src/main/resources/mapper/RegionMapper.xml

@@ -10,26 +10,11 @@
         t1.order_no as orderNo,
         t1.station,
         t1.code,
-        t2.deptName,
         case t1.status
         when 1 then '启用'
         when 0 then '禁用'end as status,
         t1.gmt_create as gmtCreate
-        from sys_region t1 LEFT JOIN
-        (select a.hospital_id,a.region_id,GROUP_CONCAT(b.name)as deptName
-        from sys_region_dept a,sys_dept b
-        where
-        a.is_deleted = 'N'
-        and b.is_deleted = 'N'
-        and a.hospital_id = b.hospital_id
-        and a.dept_id = b.id
-        <if test="hospitalId != null and hospitalId != ''">
-            AND a.hospital_id = #{hospitalId}
-        </if>
-        GROUP BY a.region_id
-        )t2
-        on t1.hospital_id = t2.hospital_id
-        and t1.id = t2.region_id
+        from sys_region t1
         where
         t1.is_deleted = 'N'
         <if test='id != null and id != ""'>

security-center/src/main/java/com/lantone/security/aop/LogAspect.java

@@ -87,7 +87,7 @@ public class LogAspect {
         if (null != jsonResult) {
             ObjectMapper objectWriter = new ObjectMapper();
             try {
-                operationLog.setJsonResult(StringUtils.substring(objectWriter.writeValueAsString(jsonResult), 0, 250));
+                operationLog.setJsonResult(StringUtils.substring(objectWriter.writeValueAsString(jsonResult), 0, 150));
             } catch (JsonProcessingException e) {
                 e.printStackTrace();
             }
@@ -108,7 +108,7 @@ public class LogAspect {
         OperationLogDTO operationLog = multiplexing(joinPoint);
         BeanUtils.copyProperties(operationLog, abnormalLogDTO);
         abnormalLogDTO.setOperationAgent(HttpUtils.getHttpServletRequest().getHeader("User-Agent"));
-        abnormalLogDTO.setOperationErrorInfo(StringUtils.substring(e.toString(), 0, 250));
+        abnormalLogDTO.setOperationErrorInfo(StringUtils.substring(e.toString(), 0, 150));
         messageService.abnormalLogHandle(abnormalLogDTO);
     }
 
@@ -162,7 +162,7 @@ public class LogAspect {
             Object args = joinPoint.getArgs();
             if (null != args) {
                 String params = argsArrayToString(joinPoint.getArgs());
-                return StringUtils.substring(params, 0, 250);
+                return StringUtils.substring(params, 0, 150);
             }
         }
         return "";

security-center/src/main/java/com/lantone/security/facade/DictionaryManagementFacade.java

@@ -122,6 +122,7 @@ public class DictionaryManagementFacade {
                     .eq(DictionaryInfo::getIsDeleted, IsDeleteEnum.N.getKey())
                     .eq(DictionaryInfo::getName, saveDictionaryVO.getName())
                     .eq(DictionaryInfo::getVal, saveDictionaryVO.getVal())
+                    .eq(DictionaryInfo::getGroupType, saveDictionaryVO.getGroupType())
                     .count();
             if (count > 0) {
                 throw new ApiException("当前字典已重复添加");

security-center/src/main/java/com/lantone/security/facade/HospitalSetManagementFacade.java

@@ -110,9 +110,10 @@ public class HospitalSetManagementFacade {
         saveHospitalSetVO.setUserId(SysUserUtils.getCurrentPrincipleId());
         if (null == saveHospitalSetVO.getId()) {
             Integer count = hospitalSetFacade.lambdaQuery()
+                    .eq(HospitalSet::getHospitalId, saveHospitalSetVO.getHospitalId())
+                    .eq(HospitalSet::getCode, saveHospitalSetVO.getCode())
                     .eq(HospitalSet::getIsDeleted, IsDeleteEnum.N.getKey())
                     .eq(HospitalSet::getName, saveHospitalSetVO.getName())
-                    .eq(HospitalSet::getHospitalId, saveHospitalSetVO.getHospitalId())
                     .eq(HospitalSet::getVal, saveHospitalSetVO.getVal())
                     .count();
             if (count > 0) {

security-center/src/main/java/com/lantone/security/facade/RegionManagementFacade.java

@@ -1,37 +1,24 @@
 package com.lantone.security.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
-import com.lantone.common.dto.DeptListDTO;
 import com.lantone.common.dto.ViewRegionDTO;
 import com.lantone.common.exception.ApiException;
-import com.lantone.common.util.ListUtil;
-import com.lantone.common.util.StringUtil;
 import com.lantone.common.util.SysUserUtils;
 import com.lantone.common.vo.CheckSolveRegionVO;
-import com.lantone.common.vo.GetDeptListVO;
 import com.lantone.common.vo.SaveRegionVO;
 import com.lantone.common.vo.GetRegionVO;
 import com.lantone.common.vo.UpdateRegionVO;
-import com.lantone.dblayermbg.entity.Dept;
 import com.lantone.dblayermbg.entity.Region;
 import com.lantone.dblayermbg.entity.RegionDept;
-import com.lantone.dblayermbg.facade.DeptFacade;
 import com.lantone.dblayermbg.facade.RegionFacade;
 import com.lantone.dblayermbg.service.RegionDeptService;
 import com.lantone.common.enums.IsDeleteEnum;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,8 +32,6 @@ public class RegionManagementFacade {
     private RegionDeptService regionDeptService;
     @Autowired
     private RegionFacade regionFacade;
-    @Autowired
-    private DeptFacade deptFacade;
 
     /**
      * @Description: 新增病区
@@ -60,8 +45,9 @@ public class RegionManagementFacade {
         getCheckRegion(saveRegionVo);
         Region sysRegion = new Region();
         BeanUtils.copyProperties(saveRegionVo, sysRegion);
-        List<RegionDept> sysRegionDepts = new ArrayList<>();
-        return addRegion(saveRegionVo, sysRegion, sysRegionDepts);
+        sysRegion.setGmtCreate(new Date());
+        sysRegion.setCreator(saveRegionVo.getUserId().toString());
+        return regionFacade.save(sysRegion);
     }
 
     /**
@@ -74,27 +60,17 @@ public class RegionManagementFacade {
     public Object updateRegion(UpdateRegionVO updateRegionVO) {
         updateRegionVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
         updateRegionVO.setUserId(SysUserUtils.getCurrentPrincipleId());
-        if(1==updateRegionVO.getMark()){
+        //回显
+        if (1 == updateRegionVO.getMark()) {
             GetRegionVO getRegionVO = new GetRegionVO();
             BeanUtils.copyProperties(updateRegionVO, getRegionVO);
-            IPage<ViewRegionDTO> region = regionFacade.getWard(getRegionVO);
-            List<ViewRegionDTO> records = region.getRecords();
-            if(ListUtil.isNotEmpty(records) && records.size() == 1){
-                ViewRegionDTO viewRegionDTO = records.get(0);
-                String deptName = viewRegionDTO.getDeptName();
-                List<String> deptNameList = viewRegionDTO.getDeptNameList();
-                if(StringUtils.isNotBlank(deptName) && deptName.contains(",")){
-                    for (String str : deptName.split(",")) {
-                        deptNameList.add(str);
-                    }
-                }
-            }
-            return region;
+            return regionFacade.getWard(getRegionVO);
         }
         Region sysRegion = new Region();
         BeanUtils.copyProperties(updateRegionVO, sysRegion);
-        List<RegionDept> sysRegionDepts = new ArrayList<>();
-        return updateRegion(updateRegionVO, sysRegion, sysRegionDepts);
+        sysRegion.setGmtModified(new Date());
+        sysRegion.setModifier(updateRegionVO.getUserId().toString());
+        return regionFacade.updateById(sysRegion);
     }
 
     /**
@@ -107,20 +83,7 @@ public class RegionManagementFacade {
     public IPage<ViewRegionDTO> getRegion(GetRegionVO getRegionVO) {
         getRegionVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
         getRegionVO.setUserId(SysUserUtils.getCurrentPrincipleId());
-        IPage<ViewRegionDTO> page = regionFacade.getWard(getRegionVO);
-        List<ViewRegionDTO> wardList = page.getRecords();
-        if (ListUtil.isNotEmpty(wardList) && StringUtil.isNotEmpty(getRegionVO.getDeptName())) {
-            IPage pageOne = new Page();
-            List<ViewRegionDTO> viewRegionDTOS = new ArrayList<>();
-            wardList.forEach(obj -> {
-                if (StringUtil.isNotEmpty(obj.getDeptName()) && obj.getDeptName().contains(getRegionVO.getDeptName())) {
-                    viewRegionDTOS.add(obj);
-                }
-            });
-            pageOne.setRecords(viewRegionDTOS);
-            return pageOne;
-        }
-        return page;
+        return regionFacade.getWard(getRegionVO);
     }
 
     /**
@@ -132,15 +95,10 @@ public class RegionManagementFacade {
      */
     public Boolean deleteRegion(Integer id) {
         Long hospitalId = SysUserUtils.getCurrentHospitalId();
-                       regionFacade.lambdaUpdate()
-                .eq(Region::getId,id)
+        boolean flag = regionFacade.lambdaUpdate()
+                .eq(Region::getId, id)
                 .eq(Region::getHospitalId, hospitalId)
-                .set(Region::getIsDeleted,IsDeleteEnum.Y.getKey())
-                .update();
-        boolean flag = regionDeptService.lambdaUpdate()
-                .eq(RegionDept::getRegionId, id)
-                .eq(RegionDept::getHospitalId, hospitalId)
-                .set(RegionDept::getIsDeleted,IsDeleteEnum.Y.getKey())
+                .set(Region::getIsDeleted, IsDeleteEnum.Y.getKey())
                 .update();
         return flag;
     }
@@ -155,78 +113,14 @@ public class RegionManagementFacade {
     public void getCheckRegion(SaveRegionVO saveRegionVo) {
         saveRegionVo.setHospitalId(SysUserUtils.getCurrentHospitalId());
         saveRegionVo.setUserId(SysUserUtils.getCurrentPrincipleId());
-            int count = regionFacade.lambdaQuery()
-                    .eq(Region::getIsDeleted, IsDeleteEnum.N.getKey())
-                    .eq(Region::getName, saveRegionVo.getName())
-                    .eq(Region::getHospitalId, saveRegionVo.getHospitalId())
-                    .count();
-            if(count>0){
-                throw new ApiException("当前组织和病区已重复");
-            }
-    }
-
-    /**
-     * @Description: 新增病区
-     * @Param: [saveRegionVo, sysRegion, sysRegionDepts]
-     * @return: java.lang.Boolean
-     * @Author: cy
-     * @Date: 2021/7/30
-     */
-    public Boolean addRegion(SaveRegionVO saveRegionVo, Region sysRegion, List<RegionDept> sysRegionDepts) {
-        sysRegion.setGmtCreate(new Date());
-        sysRegion.setCreator(saveRegionVo.getUserId().toString());
-        regionFacade.save(sysRegion);
-        if (ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
-            saveRegionVo.getDeptIds().forEach(obj -> {
-                RegionDept sysRegionDept = new RegionDept();
-                BeanUtils.copyProperties(saveRegionVo, sysRegionDept);
-                sysRegionDept.setDeptId(obj);
-                sysRegionDept.setRegionId(sysRegion.getId());
-                sysRegionDept.setGmtCreate(new Date());
-                sysRegionDept.setCreator(saveRegionVo.getUserId().toString());
-                sysRegionDepts.add(sysRegionDept);
-            });
-            return regionDeptService.saveBatch(sysRegionDepts);
+        int count = regionFacade.lambdaQuery()
+                .eq(Region::getIsDeleted, IsDeleteEnum.N.getKey())
+                .eq(Region::getName, saveRegionVo.getName())
+                .eq(Region::getHospitalId, saveRegionVo.getHospitalId())
+                .count();
+        if (count > 0) {
+            throw new ApiException("上级组织和病区名称已重复");
         }
-        return true;
-    }
-
-    /**
-     * @Description: 修改病区
-     * @Param: [saveRegionVo, sysRegion, sysRegionDepts]
-     * @return: java.lang.Boolean
-     * @Author: cy
-     * @Date: 2021/7/30
-     */
-    public Boolean updateRegion(UpdateRegionVO updateRegionVO, Region sysRegion, List<RegionDept> sysRegionDepts) {
-        sysRegion.setGmtModified(new Date());
-        sysRegion.setModifier(updateRegionVO.getUserId().toString());
-        regionFacade.updateById(sysRegion);
-        if (ListUtil.isNotEmpty(updateRegionVO.getDeptIds())) {
-            Region region = regionFacade.lambdaQuery()
-                    .eq(Region::getId, updateRegionVO.getId())
-                    .eq(Region::getIsDeleted, IsDeleteEnum.N.getKey()).one();
-            regionDeptService.lambdaUpdate()
-                    .eq(RegionDept::getHospitalId, updateRegionVO.getHospitalId())
-                    .eq(RegionDept::getIsDeleted, IsDeleteEnum.N.getKey())
-                    .eq(RegionDept::getRegionId, updateRegionVO.getId()).remove();
-            updateRegionVO.getDeptIds().forEach(obj -> {
-                RegionDept sysRegionDeptEntry = new RegionDept();
-                BeanUtils.copyProperties(updateRegionVO, sysRegionDeptEntry);
-                sysRegionDeptEntry.setId(null);
-                sysRegionDeptEntry.setDeptId(obj);
-                sysRegionDeptEntry.setRegionId(updateRegionVO.getId());
-                if (null != region) {
-                    sysRegionDeptEntry.setGmtCreate(region.getGmtCreate());
-                    sysRegionDeptEntry.setCreator(region.getCreator());
-                }
-                sysRegionDeptEntry.setGmtModified(new Date());
-                sysRegionDeptEntry.setModifier(updateRegionVO.getUserId().toString());
-                sysRegionDepts.add(sysRegionDeptEntry);
-            });
-            return regionDeptService.saveBatch(sysRegionDepts);
-        }
-        return true;
     }
 
     /**
@@ -241,12 +135,12 @@ public class RegionManagementFacade {
         checkSolveRegionVO.setUserId(SysUserUtils.getCurrentPrincipleId());
         //禁用校验
         if (null != checkSolveRegionVO.getId() && 0 == checkSolveRegionVO.getMark()) {
-            List<Long> collectList = regionDeptService.lambdaQuery()
+            long count = regionDeptService.lambdaQuery()
                     .eq(RegionDept::getIsDeleted, IsDeleteEnum.N.getKey())
-                    .eq(RegionDept::getRegionId,checkSolveRegionVO.getId())
-                    .eq(RegionDept::getHospitalId,checkSolveRegionVO.getHospitalId())
-                    .list().stream().map(obj -> obj.getDeptId()).collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(collectList)) {
+                    .eq(RegionDept::getRegionId, checkSolveRegionVO.getId())
+                    .eq(RegionDept::getHospitalId, checkSolveRegionVO.getHospitalId())
+                    .list().stream().count();
+            if (count>0) {
                 //当前病区存在与之关联的科室
                 return 1;
             }
@@ -255,54 +149,19 @@ public class RegionManagementFacade {
 
         //禁用-启用病区处理
         if (null != checkSolveRegionVO.getId() && (1 == checkSolveRegionVO.getMark() || 2 == checkSolveRegionVO.getMark())) {
-            LambdaUpdateChainWrapper<Region> regionLambdaUpdate= regionFacade.lambdaUpdate();
+            LambdaUpdateChainWrapper<Region> regionLambdaUpdate = regionFacade.lambdaUpdate();
             regionLambdaUpdate.eq(Region::getIsDeleted, IsDeleteEnum.N.getKey());
-            regionLambdaUpdate.eq(Region::getId,checkSolveRegionVO.getId());
-            regionLambdaUpdate.eq(Region::getHospitalId,checkSolveRegionVO.getHospitalId());
-            if(1 == checkSolveRegionVO.getMark()){
-                regionLambdaUpdate.set(Region::getStatus,0).update();
+            regionLambdaUpdate.eq(Region::getId, checkSolveRegionVO.getId());
+            regionLambdaUpdate.eq(Region::getHospitalId, checkSolveRegionVO.getHospitalId());
+            if (1 == checkSolveRegionVO.getMark()) {
+                regionLambdaUpdate.set(Region::getStatus, 0).update();
             }
-            if(2 == checkSolveRegionVO.getMark()){
-                regionLambdaUpdate.set(Region::getStatus,1).update();
+            if (2 == checkSolveRegionVO.getMark()) {
+                regionLambdaUpdate.set(Region::getStatus, 1).update();
             }
-            regionLambdaUpdate.set(Region::getModifier,checkSolveRegionVO.getUserId().toString()).update();
-            regionLambdaUpdate.set(Region::getGmtModified,new Date()).update();
+            regionLambdaUpdate.set(Region::getModifier, checkSolveRegionVO.getUserId().toString()).update();
+            regionLambdaUpdate.set(Region::getGmtModified, new Date()).update();
         }
         return true;
     }
-
-    /**
-     * @Description:科室id，name返回
-     * @Param: [hospitalId]
-     * @return: java.util.List<com.lantone.dblayermbg.entity.Dept>
-     * @Author: cy
-     * @Date: 2021/8/2
-     */
-    public  List<DeptListDTO> getDept(GetDeptListVO getDeptListVO){
-        getDeptListVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
-        getDeptListVO.setUserId(SysUserUtils.getCurrentPrincipleId());
-        List<DeptListDTO> deptListDTOS = new ArrayList<>();
-        List<Long> depts = regionDeptService.lambdaQuery()
-                .eq(RegionDept::getHospitalId, getDeptListVO.getHospitalId())
-                .eq(RegionDept::getIsDeleted,IsDeleteEnum.N.getKey())
-                .eq(RegionDept::getCreator, getDeptListVO.getUserId())
-                .list().stream().map(RegionDept::getDeptId).collect(Collectors.toList());
-        LambdaQueryChainWrapper<Dept> lambdaQueryChainWrapper = deptFacade.lambdaQuery();
-        lambdaQueryChainWrapper.eq(Dept::getHospitalId,getDeptListVO.getHospitalId());
-        lambdaQueryChainWrapper.eq(Dept::getIsDeleted,IsDeleteEnum.N.getKey());
-        if(ListUtil.isNotEmpty(depts)){
-            lambdaQueryChainWrapper.in(Dept::getId,depts);
-        }
-        if(StringUtil.isNotEmpty(getDeptListVO.getDeptName())){
-            lambdaQueryChainWrapper.like(Dept::getName,getDeptListVO.getDeptName());
-        }
-        lambdaQueryChainWrapper.select(Dept::getId, Dept::getName).list().forEach(
-                obj->{
-                    DeptListDTO deptListDTO = new DeptListDTO();
-                    BeanUtils.copyProperties(obj,deptListDTO);
-                    deptListDTOS.add(deptListDTO);
-                }
-        );
-        return deptListDTOS;
-    }
 }

security-center/src/main/java/com/lantone/security/web/RegionManagementController.java

@@ -2,10 +2,8 @@ package com.lantone.security.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
-import com.lantone.common.dto.DeptListDTO;
 import com.lantone.common.dto.ViewRegionDTO;
 import com.lantone.common.vo.CheckSolveRegionVO;
-import com.lantone.common.vo.GetDeptListVO;
 import com.lantone.common.vo.GetRegionVO;
 import com.lantone.common.vo.SaveRegionVO;
 import com.lantone.common.vo.UpdateRegionVO;
@@ -22,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * @Description: 病区管理API
@@ -70,10 +67,4 @@ public class RegionManagementController {
     public CommonResult<Boolean> deleteRegion(@RequestParam @Valid @NotNull(message = "病区id为空") Integer id) {
         return CommonResult.success(sysRegionFacade.deleteRegion(id));
     }
-
-  /*  @ApiOperation(value = "获取科室列表[by:cy]")
-    @PostMapping("/getDeptList")
-    public CommonResult<List<DeptListDTO>> getDeptList(@RequestBody GetDeptListVO getDeptListVO) {
-        return CommonResult.success(sysRegionFacade.getDept(getDeptListVO));
-    }*/
 }