代码提交

liusheng

2024-08-05 19171d0f422487c3d656169fd5f57c443980d0c2

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java

@@ -57,7 +57,7 @@
     */
    @ApiOperation("导出患者档案列表")
    @PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
    @Log(title = "患者档案", businessType = BusinessType.EXPORT)
    @Log(title = "患者档案" , businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatArchive patArchive) {
        List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
@@ -71,7 +71,7 @@
    @ApiOperation("获取患者档案详细信息")
    @PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
    @GetMapping(value = "/getInfo/{patid}")
    @ApiImplicitParam(name = "patid", value = "患者id")
    @ApiImplicitParam(name = "patid" , value = "患者id")
    public AjaxResult getInfo(@PathVariable(name = "patid") Long patid) {
        return success(patArchiveService.selectPatArchiveByPatid(patid));
    }
@@ -92,7 +92,7 @@
     */
    @ApiOperation("修改患者档案")
    @PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
    @Log(title = "患者档案", businessType = BusinessType.UPDATE)
    @Log(title = "患者档案" , businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    public AjaxResult update(@RequestBody PatArchive patArchive) {
        return toAjax(patArchiveService.update(patArchive));
@@ -103,7 +103,7 @@
     */
    @ApiOperation("新增或修改患者档信息")
    @PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
    @Log(title = "患者档案", businessType = BusinessType.UPDATE)
    @Log(title = "患者档案" , businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdatePatInfo")
    public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
        return toAjax(patArchiveService.saveOrUpdatePatInfo(patArchiveVO));
@@ -114,9 +114,9 @@
     */
    @ApiOperation("删除患者档案")
    @PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
    @Log(title = "患者档案", businessType = BusinessType.DELETE)
    @Log(title = "患者档案" , businessType = BusinessType.DELETE)
    @GetMapping("/remove/{patids}")
    @ApiImplicitParam(name = "patids", value = "患者id集合", dataType = "long", dataTypeClass = Long.class)
    @ApiImplicitParam(name = "patids" , value = "患者id集合" , dataType = "long" , dataTypeClass = Long.class)
    public AjaxResult remove(@PathVariable Long[] patids) {
        return toAjax(patArchiveService.deletePatArchiveByPatids(patids));
    }
@@ -129,7 +129,7 @@
     */
    @ApiOperation("导入患者文件处理")
    @PostMapping("/importFilehandle")
    @ApiImplicitParams({@ApiImplicitParam(name = "tags", value = "标签"), @ApiImplicitParam(name = "multipartFile", value = "上传文件")})
    @ApiImplicitParams({@ApiImplicitParam(name = "tags" , value = "标签"), @ApiImplicitParam(name = "multipartFile" , value = "上传文件")})
    public AjaxResult importFilehandle(@RequestParam("tags") String tags, @RequestParam("multipartFile") MultipartFile multipartFile) {
        Executor executor = Executors.newFixedThreadPool(3);
        //获取当前登陆人
@@ -217,4 +217,5 @@
        return getDataTable2(count, patientInfo);
    }


}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSpeciallistCategoryController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,106 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatSpeciallistCategory;
import com.smartor.service.IPatSpeciallistCategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * ä¸“病患者分类Controller
 *
 * @author ruoyi
 * @date 2024-08-05
 */
@Api("专病患者分类")
@RestController
@RequestMapping("/smartor/patSpeciallistCategory")
public class PatSpeciallistCategoryController extends BaseController
{
    @Autowired
    private IPatSpeciallistCategoryService patSpeciallistCategoryService;

    /**
     * æŸ¥è¯¢ä¸“病患者分类列表
     */
    @ApiOperation("查询专病患者分类列表")
    @PreAuthorize("@ss.hasPermi('system:category:list')")
    @GetMapping("/list")
    public TableDataInfo list(PatSpeciallistCategory patSpeciallistCategory)
    {
        startPage();
        List<PatSpeciallistCategory> list = patSpeciallistCategoryService.selectPatSpeciallistCategoryList(patSpeciallistCategory);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä¸“病患者分类列表
     */
    @ApiOperation("导出专病患者分类列表")
    @PreAuthorize("@ss.hasPermi('system:category:export')")
    @Log(title = "专病患者分类", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatSpeciallistCategory patSpeciallistCategory)
    {
        List<PatSpeciallistCategory> list = patSpeciallistCategoryService.selectPatSpeciallistCategoryList(patSpeciallistCategory);
        ExcelUtil<PatSpeciallistCategory> util = new ExcelUtil<PatSpeciallistCategory>(PatSpeciallistCategory.class);
        util.exportExcel(response, list, "专病患者分类数据");
    }

    /**
     * èŽ·å–专病患者分类详细信息
     */
    @ApiOperation("获取专病患者分类详细信息")
    @PreAuthorize("@ss.hasPermi('system:category:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(patSpeciallistCategoryService.selectPatSpeciallistCategoryById(id));
    }

    /**
     * æ–°å¢žä¸“病患者分类
     */
    @PreAuthorize("@ss.hasPermi('system:category:add')")
    @Log(title = "专病患者分类", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PatSpeciallistCategory patSpeciallistCategory)
    {
        return toAjax(patSpeciallistCategoryService.insertPatSpeciallistCategory(patSpeciallistCategory));
    }

    /**
     * ä¿®æ”¹ä¸“病患者分类
     */
    @ApiOperation("修改专病患者分类")
    @PreAuthorize("@ss.hasPermi('system:category:edit')")
    @Log(title = "专病患者分类", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody PatSpeciallistCategory patSpeciallistCategory)
    {
        return toAjax(patSpeciallistCategoryService.updatePatSpeciallistCategory(patSpeciallistCategory));
    }

    /**
     * åˆ é™¤ä¸“病患者分类
     */
    @ApiOperation("删除专病患者分类")
    @PreAuthorize("@ss.hasPermi('system:category:remove')")
    @Log(title = "专病患者分类", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(patSpeciallistCategoryService.deletePatSpeciallistCategoryByIds(ids));
    }
}

 ruoyi-generator/src/main/resources/generator.yml

@@ -1,10 +1,11 @@
# ä»£ç ç”Ÿæˆ
gen: 
gen:
  # ä½œè€…
  author: ruoyi
  author: lihu
  # é»˜è®¤ç”ŸæˆåŒ…路径 system éœ€æ”¹æˆè‡ªå·±çš„模块名称 å¦‚ system monitor tool
  packageName: com.ruoyi.system
#  packageName: com.ruoyi.system
  packageName: com.smartor
  # è‡ªåŠ¨åŽ»é™¤è¡¨å‰ç¼€ï¼Œé»˜è®¤æ˜¯false
  autoRemovePre: false
  # è¡¨å‰ç¼€ï¼ˆç”Ÿæˆç±»åä¸ä¼šåŒ…含表前缀，多个用逗号分隔）
  tablePrefix: sys_
  tablePrefix: sys_

 ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -1,6 +1,8 @@
package ${packageName}.controller;

import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,10 +28,11 @@

/**
 * ${functionName}Controller
 * 
 *
 * @author ${author}
 * @date ${datetime}
 */
@Api("${functionName}")
@RestController
@RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController
@@ -40,6 +43,7 @@
    /**
     * æŸ¥è¯¢${functionName}列表
     */
    @ApiOperation("查询${functionName}列表")
    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
    @GetMapping("/list")
#if($table.crud || $table.sub)
@@ -60,6 +64,7 @@
    /**
     * å¯¼å‡º${functionName}列表
     */
    @ApiOperation("导出${functionName}列表")
    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
@@ -73,8 +78,9 @@
    /**
     * èŽ·å–${functionName}详细信息
     */
    @ApiOperation("获取${functionName}详细信息")
    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
    @GetMapping(value = "/{${pkColumn.javaField}}")
    @GetMapping(value = "/getInfo/{${pkColumn.javaField}}")
    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
    {
        return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
@@ -85,7 +91,7 @@
     */
    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    public AjaxResult add(@RequestBody ${ClassName} ${className})
    {
        return toAjax(${className}Service.insert${ClassName}(${className}));
@@ -94,9 +100,10 @@
    /**
     * ä¿®æ”¹${functionName}
     */
    @ApiOperation("修改${functionName}")
    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ${ClassName} ${className})
    {
        return toAjax(${className}Service.update${ClassName}(${className}));
@@ -105,9 +112,10 @@
    /**
     * åˆ é™¤${functionName}
     */
    @ApiOperation("删除${functionName}")
    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
    @DeleteMapping("/{${pkColumn.javaField}s}")
    @GetMapping("/remove/{${pkColumn.javaField}s}")
    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
    {
        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));

 ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -1,105 +1,78 @@
package ${packageName}.domain;

#foreach ($import in $importList)
import ${import};
#end
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
    #foreach ($import in $importList)
    import ${import};
    #end
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
#if($table.crud || $table.sub)
import com.ruoyi.common.core.domain.BaseEntity;
#elseif($table.tree)
import com.ruoyi.common.core.domain.TreeEntity;
#end
    #if($table.crud || $table.sub)
    import com.ruoyi.common.core.domain.BaseEntity;
    #elseif($table.tree)
    import com.ruoyi.common.core.domain.TreeEntity;
    #end
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * ${functionName}对象 ${tableName}
 * 
 *
 * @author ${author}
 * @date ${datetime}
 */
#if($table.crud || $table.sub)
#set($Entity="BaseEntity")
    #set($Entity="BaseEntity")
#elseif($table.tree)
#set($Entity="TreeEntity")
    #set($Entity="TreeEntity")
#end
@Data
@ApiModel("${functionName}")
public class ${ClassName} extends ${Entity}
{
    private static final long serialVersionUID = 1L;
        {
private static final long serialVersionUID = 1L;

#foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField))
    #if(!$table.isSuperColumn($column.javaField))
    /** $column.columnComment */
#if($column.list)
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
#else
#set($comment=$column.columnComment)
#end
#if($parentheseIndex != -1)
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
#elseif($column.javaType == 'Date')
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
#else
    @Excel(name = "${comment}")
#end
#end
    @ApiModelProperty("$column.columnComment")
        #if($column.pk)
        //数据库自增改成@TableId(type = IdType.AUTO)
##        @TableId(type = IdType.AUTO)
        #end
        #if($column.list)
            #set($parentheseIndex=$column.columnComment.indexOf("（"))
            #if($parentheseIndex != -1)
                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
            #else
                #set($comment=$column.columnComment)
            #end
            #if($parentheseIndex != -1)
            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
            #elseif($column.javaType == 'Date')
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
            @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
            #else
            @Excel(name = "${comment}")
            #end
        #end
    private $column.javaType $column.javaField;

#end
    #end
#end
#if($table.sub)
    /** $table.subTable.functionName信息 */
    private List<${subClassName}> ${subclassName}List;
/** $table.subTable.functionName信息 */
private List<${subClassName}> ${subclassName}List;

#end
#foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField))
#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
#set($AttrName=$column.javaField)
#else
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
    #if(!$table.isSuperColumn($column.javaField))
        #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
            #set($AttrName=$column.javaField)
        #else
            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
        #end
    #end
#end
    public void set${AttrName}($column.javaType $column.javaField) 
    {
        this.$column.javaField = $column.javaField;
    }
        }

    public $column.javaType get${AttrName}() 
    {
        return $column.javaField;
    }
#end
#end

#if($table.sub)
    public List<${subClassName}> get${subClassName}List()
    {
        return ${subclassName}List;
    }

    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
    {
        this.${subclassName}List = ${subclassName}List;
    }

#end
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
#foreach ($column in $columns)
#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
#set($AttrName=$column.javaField)
#else
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#end
            .append("${column.javaField}", get${AttrName}())
#end
#if($table.sub)
            .append("${subclassName}List", get${subClassName}List())
#end
            .toString();
    }
}

 ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,6 +1,7 @@
package ${packageName}.mapper;

import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import ${packageName}.domain.${ClassName};
#if($table.sub)
import ${packageName}.domain.${subClassName};
@@ -8,15 +9,16 @@

/**
 * ${functionName}Mapper接口
 * 
 *
 * @author ${author}
 * @date ${datetime}
 */
public interface ${ClassName}Mapper 
@Mapper
public interface ${ClassName}Mapper
{
    /**
     * æŸ¥è¯¢${functionName}
     * 
     *
     * @param ${pkColumn.javaField} ${functionName}主键
     * @return ${functionName}
     */
@@ -24,7 +26,7 @@

    /**
     * æŸ¥è¯¢${functionName}列表
     * 
     *
     * @param ${className} ${functionName}
     * @return ${functionName}集合
     */
@@ -32,7 +34,7 @@

    /**
     * æ–°å¢ž${functionName}
     * 
     *
     * @param ${className} ${functionName}
     * @return ç»“æžœ
     */
@@ -40,7 +42,7 @@

    /**
     * ä¿®æ”¹${functionName}
     * 
     *
     * @param ${className} ${functionName}
     * @return ç»“æžœ
     */
@@ -48,7 +50,7 @@

    /**
     * åˆ é™¤${functionName}
     * 
     *
     * @param ${pkColumn.javaField} ${functionName}主键
     * @return ç»“æžœ
     */
@@ -56,7 +58,7 @@

    /**
     * æ‰¹é‡åˆ é™¤${functionName}
     * 
     *
     * @param ${pkColumn.javaField}s éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
@@ -65,24 +67,24 @@

    /**
     * æ‰¹é‡åˆ é™¤${subTable.functionName}
     * 
     *
     * @param ${pkColumn.javaField}s éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
    

    /**
     * æ‰¹é‡æ–°å¢ž${subTable.functionName}
     * 
     *
     * @param ${subclassName}List ${subTable.functionName}列表
     * @return ç»“æžœ
     */
    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
    


    /**
     * é€šè¿‡${functionName}主键删除${subTable.functionName}信息
     * 
     *
     * @param ${pkColumn.javaField} ${functionName}ID
     * @return ç»“æžœ
     */

 ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -3,8 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
    
    <resultMap type="${ClassName}" id="${ClassName}Result">

    <resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
#foreach ($column in $columns)
        <result property="${column.javaField}"    column="${column.columnName}"    />
#end
@@ -26,9 +26,9 @@
        select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
    </sql>

    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
    <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
        <include refid="select${ClassName}Vo"/>
        <where>  
        <where>
#foreach($column in $columns)
#set($queryType=$column.queryType)
#set($javaField=$column.javaField)
@@ -57,7 +57,7 @@
#end
        </where>
    </select>
    

    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
#if($table.crud || $table.tree)
        <include refid="select${ClassName}Vo"/>
@@ -71,8 +71,8 @@
        where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
#end
    </select>
        
    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>

    <insert id="insert${ClassName}" parameterType="${packageName}.domain.${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
        insert into ${tableName}
        <trim prefix="(" suffix=")" suffixOverrides=",">
#foreach($column in $columns)
@@ -90,7 +90,7 @@
         </trim>
    </insert>

    <update id="update${ClassName}" parameterType="${ClassName}">
    <update id="update${ClassName}" parameterType="${packageName}.domain.${ClassName}">
        update ${tableName}
        <trim prefix="SET" suffixOverrides=",">
#foreach($column in $columns)
@@ -107,15 +107,15 @@
    </delete>

    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
        delete from ${tableName} where ${pkColumn.columnName} in 
        delete from ${tableName} where ${pkColumn.columnName} in
        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
            #{${pkColumn.javaField}}
        </foreach>
    </delete>
#if($table.sub)
    

    <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
        delete from ${subTableName} where ${subTableFkName} in 
        delete from ${subTableName} where ${subTableFkName} in
        <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
            #{${subTableFkclassName}}
        </foreach>
@@ -132,4 +132,4 @@
        </foreach>
    </insert>
#end
</mapper>
</mapper>

 smartor/src/main/java/com/smartor/domain/PatArchiveReq.java

@@ -18,7 +18,7 @@
 * @author ls
 * @date 2023-06-14
 */
@ApiModel(value = "PatArchiveReq", description = "患者档案请求对象")
@ApiModel(value = "PatArchiveReq" , description = "患者档案请求对象")
@Data
public class PatArchiveReq {
    /**
@@ -137,4 +137,11 @@
    private Integer pageSize;


    /**
     * æ˜¯å¦è¿‡è™‘
     */
    @ApiModelProperty(value = " æ˜¯å¦è¿‡è™‘,默认false ")
    private boolean isFilter = false;


}

 smartor/src/main/java/com/smartor/domain/PatSpeciallistCategory.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.smartor.domain;

import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * ä¸“病患者分类对象 pat_speciallist_category
 *
 * @author ruoyi
 * @date 2024-08-05
 */
@Data
@ApiModel("专病患者分类")
public class PatSpeciallistCategory extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    private Long id;

    /**
     * åˆ†ç±»åç§°
     */
    @ApiModelProperty("分类名称")
    @Excel(name = "分类名称")
    private String name;

    /**
     * åºå·
     */
    @ApiModelProperty("序号")
    @Excel(name = "序号")
    private Long seqno;

    /**
     * çˆ¶ID
     */
    @ApiModelProperty("父ID")
    @Excel(name = "父ID")
    private Long pid;

    /**
     * GUID
     */
    @ApiModelProperty("GUID")
    @Excel(name = "GUID")
    private String guid;

    /**
     * åŒ»é™¢æœºæž„id
     */
    @ApiModelProperty("医院机构id")
    @Excel(name = "医院机构id")
    private Long orgid;

    /**
     * åˆ é™¤æ ‡å¿—（0：未删除 1：已删除）
     */
    @ApiModelProperty("删除标志（0：未删除 1：已删除）")
    private Long delFlag;

}


 smartor/src/main/java/com/smartor/mapper/PatSpeciallistCategoryMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
package com.smartor.mapper;

import com.smartor.domain.PatSpeciallistCategory;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * ä¸“病患者分类Mapper接口
 *
 * @author ruoyi
 * @date 2024-08-05
 */
@Mapper
public interface PatSpeciallistCategoryMapper
{
    /**
     * æŸ¥è¯¢ä¸“病患者分类
     *
     * @param id ä¸“病患者分类主键
     * @return ä¸“病患者分类
     */
    public PatSpeciallistCategory selectPatSpeciallistCategoryById(Long id);

    /**
     * æŸ¥è¯¢ä¸“病患者分类列表
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ä¸“病患者分类集合
     */
    public List<PatSpeciallistCategory> selectPatSpeciallistCategoryList(PatSpeciallistCategory patSpeciallistCategory);

    /**
     * æ–°å¢žä¸“病患者分类
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ç»“æžœ
     */
    public int insertPatSpeciallistCategory(PatSpeciallistCategory patSpeciallistCategory);

    /**
     * ä¿®æ”¹ä¸“病患者分类
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ç»“æžœ
     */
    public int updatePatSpeciallistCategory(PatSpeciallistCategory patSpeciallistCategory);

    /**
     * åˆ é™¤ä¸“病患者分类
     *
     * @param id ä¸“病患者分类主键
     * @return ç»“æžœ
     */
    public int deletePatSpeciallistCategoryById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤ä¸“病患者分类
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deletePatSpeciallistCategoryByIds(Long[] ids);
}

 smartor/src/main/java/com/smartor/service/IPatSpeciallistCategoryService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.smartor.service;

import com.smartor.domain.PatSpeciallistCategory;

import java.util.List;

/**
 * ä¸“病患者分类Service接口
 *
 * @author ruoyi
 * @date 2024-08-05
 */
public interface IPatSpeciallistCategoryService
{
    /**
     * æŸ¥è¯¢ä¸“病患者分类
     *
     * @param id ä¸“病患者分类主键
     * @return ä¸“病患者分类
     */
    public PatSpeciallistCategory selectPatSpeciallistCategoryById(Long id);

    /**
     * æŸ¥è¯¢ä¸“病患者分类列表
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ä¸“病患者分类集合
     */
    public List<PatSpeciallistCategory> selectPatSpeciallistCategoryList(PatSpeciallistCategory patSpeciallistCategory);

    /**
     * æ–°å¢žä¸“病患者分类
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ç»“æžœ
     */
    public int insertPatSpeciallistCategory(PatSpeciallistCategory patSpeciallistCategory);

    /**
     * ä¿®æ”¹ä¸“病患者分类
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ç»“æžœ
     */
    public int updatePatSpeciallistCategory(PatSpeciallistCategory patSpeciallistCategory);

    /**
     * æ‰¹é‡åˆ é™¤ä¸“病患者分类
     *
     * @param ids éœ€è¦åˆ é™¤çš„专病患者分类主键集合
     * @return ç»“æžœ
     */
    public int deletePatSpeciallistCategoryByIds(Long[] ids);

    /**
     * åˆ é™¤ä¸“病患者分类信息
     *
     * @param id ä¸“病患者分类主键
     * @return ç»“æžœ
     */
    public int deletePatSpeciallistCategoryById(Long id);
}

 smartor/src/main/java/com/smartor/service/impl/PatFilterlistServiceImpl.java

@@ -2,10 +2,14 @@

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatFilterlist;
import com.smartor.domain.ServiceSubtask;
import com.smartor.mapper.PatFilterlistMapper;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.service.IPatFilterlistService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@@ -16,10 +20,11 @@
 * @date 2024-08-02
 */
@Service
public class PatFilterlistServiceImpl implements IPatFilterlistService
{
public class PatFilterlistServiceImpl implements IPatFilterlistService {
    @Autowired
    private PatFilterlistMapper patFilterlistMapper;
    @Autowired
    private ServiceSubtaskMapper serviceSubtaskMapper;

    /**
     * æŸ¥è¯¢æ‚£è€…过滤名单
@@ -28,8 +33,7 @@
     * @return æ‚£è€…过滤名单
     */
    @Override
    public PatFilterlist selectPatFilterlistById(Long id)
    {
    public PatFilterlist selectPatFilterlistById(Long id) {
        return patFilterlistMapper.selectPatFilterlistById(id);
    }

@@ -40,8 +44,7 @@
     * @return æ‚£è€…过滤名单
     */
    @Override
    public List<PatFilterlist> selectPatFilterlistList(PatFilterlist patFilterlist)
    {
    public List<PatFilterlist> selectPatFilterlistList(PatFilterlist patFilterlist) {
        return patFilterlistMapper.selectPatFilterlistList(patFilterlist);
    }

@@ -51,10 +54,20 @@
     * @param patFilterlist æ‚£è€…过滤名单
     * @return ç»“æžœ
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public int insertPatFilterlist(PatFilterlist patFilterlist)
    {
    public int insertPatFilterlist(PatFilterlist patFilterlist) {
        //先查询一下，该患者是否有执行的任务，如果有的话，将任务暂停
        ServiceSubtask serviceSubtask = new ServiceSubtask();
        serviceSubtask.setPatid(patFilterlist.getPatid());
        serviceSubtask.setDelFlag("0");
        List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtask);
        if (CollectionUtils.isNotEmpty(selectServiceSubtaskList)) {
            serviceSubtaskMapper.deleteServiceSubtaskById(selectServiceSubtaskList.get(0).getId());
        }
        //新增患者过滤信息
        patFilterlist.setCreateTime(DateUtils.getNowDate());
        patFilterlist.setUpdateTime(DateUtils.getNowDate());
        return patFilterlistMapper.insertPatFilterlist(patFilterlist);
    }

@@ -64,9 +77,9 @@
     * @param patFilterlist æ‚£è€…过滤名单
     * @return ç»“æžœ
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public int updatePatFilterlist(PatFilterlist patFilterlist)
    {
    public int updatePatFilterlist(PatFilterlist patFilterlist) {
        patFilterlist.setUpdateTime(DateUtils.getNowDate());
        return patFilterlistMapper.updatePatFilterlist(patFilterlist);
    }
@@ -77,9 +90,9 @@
     * @param ids éœ€è¦åˆ é™¤çš„患者过滤名单主键
     * @return ç»“æžœ
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public int deletePatFilterlistByIds(Long[] ids)
    {
    public int deletePatFilterlistByIds(Long[] ids) {
        return patFilterlistMapper.deletePatFilterlistByIds(ids);
    }

@@ -89,9 +102,9 @@
     * @param id æ‚£è€…过滤名单主键
     * @return ç»“æžœ
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public int deletePatFilterlistById(Long id)
    {
    public int deletePatFilterlistById(Long id) {
        return patFilterlistMapper.deletePatFilterlistById(id);
    }
}

 smartor/src/main/java/com/smartor/service/impl/PatSpeciallistCategoryServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
package com.smartor.service.impl;

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatSpeciallistCategory;
import com.smartor.mapper.PatSpeciallistCategoryMapper;
import com.smartor.service.IPatSpeciallistCategoryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * ä¸“病患者分类Service业务层处理
 *
 * @author ruoyi
 * @date 2024-08-05
 */
@Service
public class PatSpeciallistCategoryServiceImpl implements IPatSpeciallistCategoryService {
    @Autowired
    private PatSpeciallistCategoryMapper patSpeciallistCategoryMapper;

    /**
     * æŸ¥è¯¢ä¸“病患者分类
     *
     * @param id ä¸“病患者分类主键
     * @return ä¸“病患者分类
     */
    @Override
    public PatSpeciallistCategory selectPatSpeciallistCategoryById(Long id) {
        return patSpeciallistCategoryMapper.selectPatSpeciallistCategoryById(id);
    }

    /**
     * æŸ¥è¯¢ä¸“病患者分类列表
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ä¸“病患者分类
     */
    @Override
    public List<PatSpeciallistCategory> selectPatSpeciallistCategoryList(PatSpeciallistCategory patSpeciallistCategory) {
        return patSpeciallistCategoryMapper.selectPatSpeciallistCategoryList(patSpeciallistCategory);
    }

    /**
     * æ–°å¢žä¸“病患者分类
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ç»“æžœ
     */
    @Override
    public int insertPatSpeciallistCategory(PatSpeciallistCategory patSpeciallistCategory) {
        patSpeciallistCategory.setCreateTime(DateUtils.getNowDate());
        return patSpeciallistCategoryMapper.insertPatSpeciallistCategory(patSpeciallistCategory);
    }

    /**
     * ä¿®æ”¹ä¸“病患者分类
     *
     * @param patSpeciallistCategory ä¸“病患者分类
     * @return ç»“æžœ
     */
    @Override
    public int updatePatSpeciallistCategory(PatSpeciallistCategory patSpeciallistCategory) {
        patSpeciallistCategory.setUpdateTime(DateUtils.getNowDate());
        return patSpeciallistCategoryMapper.updatePatSpeciallistCategory(patSpeciallistCategory);
    }

    /**
     * æ‰¹é‡åˆ é™¤ä¸“病患者分类
     *
     * @param ids éœ€è¦åˆ é™¤çš„专病患者分类主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePatSpeciallistCategoryByIds(Long[] ids) {
        return patSpeciallistCategoryMapper.deletePatSpeciallistCategoryByIds(ids);
    }

    /**
     * åˆ é™¤ä¸“病患者分类信息
     *
     * @param id ä¸“病患者分类主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePatSpeciallistCategoryById(Long id) {
        return patSpeciallistCategoryMapper.deletePatSpeciallistCategoryById(id);
    }
}

 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml

@@ -315,6 +315,8 @@
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
            <if test="pid != null  and pid != ''">and a.id = #{id}</if>
@@ -353,8 +355,9 @@
                    #{pid}
                </foreach>
            </if>
            AND d.del_flag != 1
            AND a.del_flag != 1
            <if test="isFilter == true">
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>
    </select>

@@ -394,6 +397,8 @@
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -422,8 +427,9 @@
                    #{pid}
                </foreach>
            </if>
            AND d.del_flag != 1
            AND a.del_flag != 1
            <if test="isFilter == true">
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>
    </select>

@@ -463,6 +469,8 @@
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -492,8 +500,9 @@
                    #{pid}
                </foreach>
            </if>
            AND d.del_flag != 1
            AND a.del_flag != 1
            <if test="isFilter == true">
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>

    </select>

 smartor/src/main/resources/mapper/smartor/PatSpeciallistCategoryMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.PatSpeciallistCategoryMapper">

    <resultMap type="com.smartor.domain.PatSpeciallistCategory" id="PatSpeciallistCategoryResult">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="seqno" column="seqno"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="orgid" column="orgid"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
    </resultMap>

    <sql id="selectPatSpeciallistCategoryVo">
        select id,
               name,
               seqno,
               pid,
               guid,
               orgid,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time
        from pat_speciallist_category
    </sql>

    <select id="selectPatSpeciallistCategoryList" parameterType="com.smartor.domain.PatSpeciallistCategory"
            resultMap="PatSpeciallistCategoryResult">
        <include refid="selectPatSpeciallistCategoryVo"/>
        <where>
            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
            <if test="seqno != null ">and seqno = #{seqno}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="orgid != null ">and orgid = #{orgid}</if>
        </where>
    </select>

    <select id="selectPatSpeciallistCategoryById" parameterType="Long" resultMap="PatSpeciallistCategoryResult">
        <include refid="selectPatSpeciallistCategoryVo"/>
        where id = #{id}
    </select>

    <insert id="insertPatSpeciallistCategory" parameterType="com.smartor.domain.PatSpeciallistCategory"
            useGeneratedKeys="true" keyProperty="id">
        insert into pat_speciallist_category
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="name != null">name,</if>
            <if test="seqno != null">seqno,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="orgid != null">orgid,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="name != null">#{name},</if>
            <if test="seqno != null">#{seqno},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
        </trim>
    </insert>

    <update id="updatePatSpeciallistCategory" parameterType="com.smartor.domain.PatSpeciallistCategory">
        update pat_speciallist_category
        <trim prefix="SET" suffixOverrides=",">
            <if test="name != null">name = #{name},</if>
            <if test="seqno != null">seqno = #{seqno},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deletePatSpeciallistCategoryById" parameterType="Long">
        delete
        from pat_speciallist_category
        where id = #{id}
    </delete>

    <delete id="deletePatSpeciallistCategoryByIds" parameterType="String">
        delete from pat_speciallist_category where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>