代码提交

liusheng

2024-08-02 57ae7faf87e490576141ff19727057d2f7ad1840

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/component/DeptUtils.java

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

import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import org.springframework.stereotype.Component;

import java.util.HashMap;
import java.util.Map;

import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;

@Component
public class DeptUtils {
    public static Map<String, String> getDeptAndDocID() {
        Map<String, String> map = new HashMap<>();
        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        String detpId = user.getDeptId().toString();
        String userName = user.getUserName();
        map.put("deptId", detpId);
        map.put("userName", userName);
        return map;
    }
}

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

@@ -38,7 +38,9 @@
    @PreAuthorize("@ss.hasPermi('system:icd10:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody Icd10Association icd10Association) {
        if (icd10Association.getIsPage()) {
        PageUtils.startPageByPost(icd10Association.getPageNum(), icd10Association.getPageSize());
        }
        List<Icd10Association> list = iIcd10AssociationService.selectIcd10AssociationList(icd10Association);
        return getDataTable(list);
    }

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

@@ -39,18 +39,18 @@
public class PatArchiveController extends BaseController {
    @Autowired
    private IPatArchiveService patArchiveService;
//
//    /**
//     * æŸ¥è¯¢æ‚£è€…档案列表
//     */
//    @ApiOperation("查询患者档案列表")
//    @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
//   @PostMapping("/list")
//    public TableDataInfo list(@RequestBody PatArchive patArchive) {
//        startPage();
//        List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
//        return getDataTable(list);
//}

    /**
     * æŸ¥è¯¢æ‚£è€…档案列表
     */
    @ApiOperation("查询患者档案列表")
    @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody PatArchive patArchive) {
        startPage();
        List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ‚£è€…档案列表
@@ -88,6 +88,17 @@
//    }

    /**
     * æ–°å¢žæ‚£è€…档案
     */
    @ApiOperation("修改患者档案")
    @PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
    @Log(title = "患者档案", businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    public AjaxResult update(@RequestBody PatArchive patArchive) {
        return toAjax(patArchiveService.update(patArchive));
    }

    /**
     * æ–°å¢žæˆ–修改患者档信息
     */
    @ApiOperation("新增或修改患者档信息")

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

@@ -11,8 +11,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
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.PatFilterlist;
import com.smartor.service.IPatFilterlistService;
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-02
 */
@RestController
@RequestMapping("/smartor/filterlist")
public class PatFilterlistController extends BaseController {
    @Autowired
    private IPatFilterlistService patFilterlistService;

    /**
     * æŸ¥è¯¢æ‚£è€…过滤名单列表
     */
    @PreAuthorize("@ss.hasPermi('system:filterlist:list')")
    @GetMapping("/list")
    public TableDataInfo list(PatFilterlist patFilterlist) {
        startPage();
        List<PatFilterlist> list = patFilterlistService.selectPatFilterlistList(patFilterlist);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ‚£è€…过滤名单列表
     */
    @PreAuthorize("@ss.hasPermi('system:filterlist:export')")
    @Log(title = "患者过滤名单", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatFilterlist patFilterlist) {
        List<PatFilterlist> list = patFilterlistService.selectPatFilterlistList(patFilterlist);
        ExcelUtil<PatFilterlist> util = new ExcelUtil<PatFilterlist>(PatFilterlist.class);
        util.exportExcel(response, list, "患者过滤名单数据");
    }

    /**
     * èŽ·å–患者过滤名单详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:filterlist:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(patFilterlistService.selectPatFilterlistById(id));
    }

    /**
     * æ–°å¢žæ‚£è€…过滤名单
     */
    @PreAuthorize("@ss.hasPermi('system:filterlist:add')")
    @Log(title = "患者过滤名单", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PatFilterlist patFilterlist) {
        return toAjax(patFilterlistService.insertPatFilterlist(patFilterlist));
    }

    /**
     * ä¿®æ”¹æ‚£è€…过滤名单
     */
    @PreAuthorize("@ss.hasPermi('system:filterlist:edit')")
    @Log(title = "患者过滤名单", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody PatFilterlist patFilterlist) {
        return toAjax(patFilterlistService.updatePatFilterlist(patFilterlist));
    }

    /**
     * åˆ é™¤æ‚£è€…过滤名单
     */
    @PreAuthorize("@ss.hasPermi('system:filterlist:remove')")
    @Log(title = "患者过滤名单", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(patFilterlistService.deletePatFilterlistByIds(ids));
    }
}

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

@@ -70,7 +70,7 @@
    @ApiOperation("获取患者门诊记录详细信息")
    @ApiImplicitParam(name = "getInfo", value = "主键ID", dataType = "long", dataTypeClass = Long.class)
    @PreAuthorize("@ss.hasPermi('smartor:patouthosp:query')")
    @GetMapping(value = "/{id}")
    @GetMapping(value = "getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(patMedOuthospService.selectPatMedOuthospById(id));
    }
@@ -104,7 +104,7 @@
    @PreAuthorize("@ss.hasPermi('smartor:patouthosp:remove')")
    @ApiImplicitParam(name = "remove", value = "主键ID", dataType = "long", dataTypeClass = Array.class)
    @Log(title = "患者门诊记录", businessType = BusinessType.DELETE)
    @GetMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(patMedOuthospService.deletePatMedOuthospByIds(ids));
    }

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
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.PatMedRegistration;
import com.smartor.service.IPatMedRegistrationService;
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-01
 */
@RestController
@RequestMapping("/smartor/registration")
public class PatMedRegistrationController extends BaseController {
    @Autowired
    private IPatMedRegistrationService patMedRegistrationService;

    /**
     * æŸ¥è¯¢æ‚£è€…挂号记录列表
     */
    @PreAuthorize("@ss.hasPermi('system:registration:list')")
    @GetMapping("/list")
    public TableDataInfo list(PatMedRegistration patMedRegistration) {
        startPage();
        List<PatMedRegistration> list = patMedRegistrationService.selectPatMedRegistrationList(patMedRegistration);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ‚£è€…挂号记录列表
     */
    @PreAuthorize("@ss.hasPermi('system:registration:export')")
    @Log(title = "患者挂号记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatMedRegistration patMedRegistration) {
        List<PatMedRegistration> list = patMedRegistrationService.selectPatMedRegistrationList(patMedRegistration);
        ExcelUtil<PatMedRegistration> util = new ExcelUtil<PatMedRegistration>(PatMedRegistration.class);
        util.exportExcel(response, list, "患者挂号记录数据");
    }

    /**
     * èŽ·å–患者挂号记录详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:registration:query')")
    @GetMapping(value = "/getInfo/{registid}")
    public AjaxResult getInfo(@PathVariable("registid") Long registid) {
        return success(patMedRegistrationService.selectPatMedRegistrationByRegistid(registid));
    }

    /**
     * æ–°å¢žæ‚£è€…挂号记录
     */
    @PreAuthorize("@ss.hasPermi('system:registration:add')")
    @Log(title = "患者挂号记录", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PatMedRegistration patMedRegistration) {
        return toAjax(patMedRegistrationService.insertPatMedRegistration(patMedRegistration));
    }

    /**
     * ä¿®æ”¹æ‚£è€…挂号记录
     */
    @PreAuthorize("@ss.hasPermi('system:registration:edit')")
    @Log(title = "患者挂号记录", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody PatMedRegistration patMedRegistration) {
        return toAjax(patMedRegistrationService.updatePatMedRegistration(patMedRegistration));
    }

    /**
     * åˆ é™¤æ‚£è€…挂号记录
     */
    @PreAuthorize("@ss.hasPermi('system:registration:remove')")
    @Log(title = "患者挂号记录", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{registids}")
    public AjaxResult remove(@PathVariable Long[] registids) {
        return toAjax(patMedRegistrationService.deletePatMedRegistrationByRegistids(registids));
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
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.PatSpeciallist;
import com.smartor.service.IPatSpeciallistService;
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-02
 */
@RestController
@RequestMapping("/smartor/speciallist")
public class PatSpeciallistController extends BaseController
{
    @Autowired
    private IPatSpeciallistService patSpeciallistService;

    /**
     * æŸ¥è¯¢ä¸“病患者列表
     */
    @PreAuthorize("@ss.hasPermi('system:speciallist:list')")
    @GetMapping("/list")
    public TableDataInfo list(PatSpeciallist patSpeciallist)
    {
        startPage();
        List<PatSpeciallist> list = patSpeciallistService.selectPatSpeciallistList(patSpeciallist);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä¸“病患者列表
     */
    @PreAuthorize("@ss.hasPermi('system:speciallist:export')")
    @Log(title = "专病患者", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatSpeciallist patSpeciallist)
    {
        List<PatSpeciallist> list = patSpeciallistService.selectPatSpeciallistList(patSpeciallist);
        ExcelUtil<PatSpeciallist> util = new ExcelUtil<PatSpeciallist>(PatSpeciallist.class);
        util.exportExcel(response, list, "专病患者数据");
    }

    /**
     * èŽ·å–专病患者详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:speciallist:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(patSpeciallistService.selectPatSpeciallistById(id));
    }

    /**
     * æ–°å¢žä¸“病患者
     */
    @PreAuthorize("@ss.hasPermi('system:speciallist:add')")
    @Log(title = "专病患者", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PatSpeciallist patSpeciallist)
    {
        return toAjax(patSpeciallistService.insertPatSpeciallist(patSpeciallist));
    }

    /**
     * ä¿®æ”¹ä¸“病患者
     */
    @PreAuthorize("@ss.hasPermi('system:speciallist:edit')")
    @Log(title = "专病患者", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody PatSpeciallist patSpeciallist)
    {
        return toAjax(patSpeciallistService.updatePatSpeciallist(patSpeciallist));
    }

    /**
     * åˆ é™¤ä¸“病患者
     */
    @PreAuthorize("@ss.hasPermi('system:speciallist:remove')")
    @Log(title = "专病患者", businessType = BusinessType.DELETE)
    @DeleteMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(patSpeciallistService.deletePatSpeciallistByIds(ids));
    }
}

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

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

import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.web.component.DeptUtils;
import com.smartor.domain.PerSonWorkbenchDto;
import com.smartor.service.PersonWorkbenchService;
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 java.util.List;
import java.util.Map;

/**
 * æ ‡ç­¾Controller
 *
 * @author ruoyi
 * @date 2023-06-06
 */
@Api(description = "个人工作台")
@RestController
@RequestMapping("/smartor/workbench")
public class PersonWorkbenchController extends BaseController {
    @Autowired
    private PersonWorkbenchService personWorkbenchService;

    /**
     * å½“前登录用户的门诊、在院、出院病人的统计情况
     */
    @ApiOperation("当前登录用户的门诊、在院、出院病人的统计情况")
    @GetMapping("/getPatCount")
    public TableDataInfo getPatCount(@RequestParam("deptIds") String detpIds, @RequestParam("dcCodes") String dcCodes) {
        //获取当前登陆人
        Map<String, String> deptAndDocID = DeptUtils.getDeptAndDocID();
        if (StringUtils.isEmpty(detpIds)) {
            detpIds = deptAndDocID.get("deptId");
        }
        if (StringUtils.isEmpty(dcCodes)) {
            dcCodes = deptAndDocID.get("userName");
        }

        List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(detpIds, dcCodes);
        return getDataTable(patCount);
    }

    /**
     * å½“前登录用户的门诊、在院、出院病人的统计情况
     */
    @ApiOperation("当前登录用户的门诊、在院、出院病人的统计情况")
    @PreAuthorize("@ss.hasPermi('system:tag:list')")
    @GetMapping("/getTaskInfo")
    public TableDataInfo getTaskInfo(@RequestParam("deptIds") String detpIds, @RequestParam("dcCodes") String dcCodes) {
        //获取当前登陆人
        Map<String, String> deptAndDocID = DeptUtils.getDeptAndDocID();
        if (StringUtils.isEmpty(detpIds)) {
            detpIds = deptAndDocID.get("deptId");
        }
        if (StringUtils.isEmpty(dcCodes)) {
            dcCodes = deptAndDocID.get("userName");
        }

        List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(detpIds, dcCodes);
        return getDataTable(patCount);
    }


}

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

@@ -38,7 +38,6 @@
    @PreAuthorize("@ss.hasPermi('smartor:category:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody SvyLibTemplateCategory svyLibTemplateCategory) {
        startPage();
        List<SvyLibTemplateCategoryVO> list = svyLibTemplateCategoryService.selectSvyLibTemplateCategoryList(svyLibTemplateCategory);
        return getDataTable(list);
    }

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

@@ -14,6 +14,7 @@
import com.smartor.domain.SvyLibScriptTag;
import com.smartor.domain.SvyLibTemplate;
import com.smartor.domain.SvyLibTemplateReq;
import com.smartor.domain.SvyLibTemplateVO;
import com.smartor.service.ISvyLibTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -53,7 +54,7 @@
    @PostMapping("/selectSvyLibTemplatelist")
    public TableDataInfo selectSvyLibTemplatelist(@RequestBody SvyLibTemplateReq svyLibTemplateReq) {
        PageUtils.startPageByPost(svyLibTemplateReq.getPageNum(), svyLibTemplateReq.getPageSize());
        List<SvyLibTemplate> list = svyLibTemplateService.selectSvyLibTemplateList(svyLibTemplateReq);
        List<SvyLibTemplateVO> list = svyLibTemplateService.selectSvyLibTemplateList(svyLibTemplateReq);

        if (CollectionUtils.isNotEmpty(list)) {
            //获取total
@@ -97,11 +98,11 @@
    @ApiOperation("新增或修改问卷模板信息")
    @PreAuthorize("@ss.hasPermi('system:script:list')")
    @PostMapping("/saveOrUpdateTemplate")
    public AjaxResult saveOrUpdateTemplate(@RequestBody SvyLibTemplate svyLibTemplate) {
        if (ObjectUtils.isEmpty(svyLibTemplate)) {
    public AjaxResult saveOrUpdateTemplate(@RequestBody SvyLibTemplateVO svyLibTemplateVO) {
        if (ObjectUtils.isEmpty(svyLibTemplateVO)) {
            throw new BaseException("入参为空，请检查入参");
        }
        return success(svyLibTemplateService.saveOrUpdateTemplate(svyLibTemplate));
        return success(svyLibTemplateService.saveOrUpdateTemplate(svyLibTemplateVO));
    }

    /**

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

@@ -33,6 +33,8 @@
            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
            // åŽ‹ç¼©æ–‡ä»¶
            "rar", "zip", "gz", "bz2",
            //音频格式
            "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", "asf", "rm", "rmvb",
            // è§†é¢‘格式
            "mp4", "avi", "rmvb",
            // pdf

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

@@ -236,4 +236,10 @@
    @Excel(name = "富文本")
    @ApiModelProperty("富文本")
    private String richText = "";

    /**
     * ç±»åž‹ï¼š1宣教  2通知
     */
    @ApiModelProperty("类型：1宣教  2通知")
    private String hetype;
}

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

@@ -120,4 +120,6 @@
    @Excel(name = "pageSize")
    private Integer pageSize;

    @ApiModelProperty(value = "是否分页")
    private Boolean isPage = true;
}

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * æ‚£è€…过滤名单对象 pat_filterlist
 *
 * @author ruoyi
 * @date 2024-08-02
 */
@Data
@ApiModel(value = "PatFilterlist", description = "患者过滤名单对象 ")
public class PatFilterlist extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty("主键")
    private Long id;

    /**
     * ç—…人档案ID
     */
    @ApiModelProperty("病人档案ID")
    private Long patid;

    /**
     * è¿‡æ»¤ç±»åž‹ç¼–号
     */
    @ApiModelProperty("过滤类型编号")
    private String filtertype;

    /**
     * è¿‡æ»¤ç±»åž‹
     */
    @ApiModelProperty("过滤类型")
    private String filterdesc;

    /**
     * è¿‡æ»¤ç”³è¯·è¯´æ˜Ž
     */
    @ApiModelProperty("过滤申请说明")
    private String filternotes;

    /**
     * ç”³è¯·æ—¥æœŸ
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("申请日期")
    private Date applyTime;

    /**
     * åˆ é™¤æ ‡å¿—（0：未删除 1：已删除）
     */
    private String delFlag;

    /**
     * å®¡æ ¸äºº
     */
    @ApiModelProperty("审核人")
    private Long checkBy;

    /**
     * å®¡æ ¸çŠ¶æ€
     */
    @ApiModelProperty("审核状态")
    private String checkFlag;

    /**
     * å®¡æ ¸æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("审核时间")
    private Date checkTime;

    /**
     * å®¡æ ¸æ„è§
     */
    @ApiModelProperty("审核意见")
    private String checkdesc;

    /**
     * ä¸Šä¼ æ ‡å¿—（0：未上传 1：已上传）
     */
    @ApiModelProperty("上传标志")
    private Long isupload;

    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("上传时间")
    private Date uploadTime;

    /**
     * æœºæž„ID
     */
    @ApiModelProperty("机构ID")
    private String orgid;

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

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

}

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * æ‚£è€…挂号记录对象 pat_med_registration
 *
 * @author ruoyi
 * @date 2024-08-01
 */
@Data
@ApiModel(value = "PatMedRegistration", description = "患者挂号记录对象")
public class PatMedRegistration extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è‡ªå¢žID
     */
    private Long registid;

    /**
     * æµæ°´è¡¨
     */
    @ApiModelProperty("流水表")
    private String serialnum;

    /**
     * æ¡£æ¡ˆID
     */
    @ApiModelProperty("档案ID")
    private Long patid;

    /**
     * åŒ»é™¢åç§°
     */
    @ApiModelProperty("医院名称")
    private String hospitalname;

    /**
     * åŒ»é™¢ç¼–号
     */
    @ApiModelProperty("医院编号")
    private String hospitalcode;

    /**
     * ç§‘室代码
     */
    @ApiModelProperty("科室代码")
    private String deptcode;

    /**
     * ç§‘室名称
     */
    @ApiModelProperty("科室名称")
    private String deptname;

    /**
     * ç§‘室ID
     */
    @ApiModelProperty("科室ID")
    private Long deptid;

    /**
     * é¢„约状态;0.已预约 1.已完成 2.已取消
     */
    @ApiModelProperty("预约状态;0.已预约 1.已完成 2.已取消")
    private Long state;

    /**
     * é¢„约时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("预约时间")
    private Date appointmenttime;

    /**
     * é¢„约班别;1:上午 2:下午 3:晚上
     */
    @ApiModelProperty("预约班别;1:上午 2:下午 3:晚上")
    private Long appointmenttimetype;

    /**
     * é¢„约号源
     */
    @ApiModelProperty("预约号源")
    private String appointmentcode;

    /**
     * é¢„约时段开始时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("预约时段开始时间")
    private Date appointmentbegintime;

    /**
     * é¢„约时段结束时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("预约时段结束时间")
    private Date appointmentendtime;

    /**
     * æœºæž„ID
     */
    @ApiModelProperty("机构ID")
    private String orgid;

    /**
     * åˆ é™¤æ ‡å¿—（0：未删除 1：已删除）
     */
    private String delFlag;

    /**
     * ä¸Šä¼ æ ‡å¿—（0：未上传 1：已上传）
     */
    @ApiModelProperty("上传标志")
    private Long isupload;

    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("上传时间")
    private Date uploadTime;

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

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

}

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * ä¸“病患者对象 pat_speciallist
 *
 * @author ruoyi
 * @date 2024-08-02
 */
@Data
@ApiModel(value = "PatSpeciallist", description = "专病患者对象 ")
public class PatSpeciallist extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è‡ªå¢žID
     */
    private Long id;

    /**
     * ç—…人档案ID
     */
    @ApiModelProperty("病人档案ID")
    private Long patid;

    /**
     * sd（specialize disease） ç±»åž‹ç¼–号
     */
    @ApiModelProperty("类型编号")
    private String sdtype;

    /**
     * sd（specialize disease） ç±»åž‹
     */
    @ApiModelProperty("类型描述")
    private String sddesc;

    /**
     * sd（specialize disease） ç”³è¯·è¯´æ˜Ž
     */
    @ApiModelProperty("申请说明")
    private String sdnotes;

    /**
     * ç”³è¯·æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("申请时间")
    private Date applyTime;

    /**
     * åˆ é™¤æ ‡å¿—（0：未删除 1：已删除）
     */
    private String delFlag;

    /**
     * å®¡æ ¸äºº
     */
    @ApiModelProperty("审核人")
    private Long checkBy;

    /**
     * å®¡æ ¸çŠ¶æ€
     */
    @ApiModelProperty("审核状态")
    private String checkFlag;

    /**
     * å®¡æ ¸æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("审核时间")
    private Date checkTime;

    /**
     * å®¡æ ¸æ„è§
     */
    @ApiModelProperty("审核意见")
    private String checkdesc;

    /**
     * ä¸Šä¼ æ ‡å¿—（0：未上传 1：已上传）
     */
    @ApiModelProperty("上传标志")
    private Long uploadFlag;

    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("上传时间")
    private Date uploadTime;

    /**
     * æœºæž„ID
     */
    @ApiModelProperty("机构ID")
    private String orgid;

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

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

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
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;

import java.util.Date;

/**
 * å¤–部患者档案对象 pat_archive_out
 *
 * @author ruoyi
 * @date 2024-04-29
 */
@ApiModel(value = "PatArchiveOut", description = "外部患者档案对象")
@Data
public class PerSonWorkbenchDto extends BaseEntity {

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("数量")
    private String count;

}

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

@@ -123,6 +123,17 @@
    @ApiModelProperty(value = "添加时间")
    private Date addtime;


    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始时间")
    private Date beginTime;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束时间")
    private Date endTime;

    /**
     * å®¡æ ¸äººid
     */

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
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;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * é—®å·å¯¹è±¡ svy_lib_Template
 *
 * @author ruoyi
 * @date 2023-03-02
 */
@Data
@ApiModel(value = "SvyLibTemplate", description = "问卷对象")
public class SvyLibTemplateVO extends BaseEntity {

    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty(value = "自增ID")
    private Long svyid;

    /**
     * é—®å·åˆ†ç±»ID
     */
    @ApiModelProperty(value = "问卷分类ID", required = true)
    @Excel(name = " é—®å·åˆ†ç±»ID ")
    private Long categoryid;

    /**
     * é—®å·ä»£ç 
     */
    @ApiModelProperty(value = "问卷代码")
    @Excel(name = " é—®å·ä»£ç  ")
    private String svycode;

    /**
     * é—®å·åç§°
     */
    @ApiModelProperty(value = "问卷名称", required = true)
    @Excel(name = " é—®å·åç§° ")
    private String svyname;

    /**
     * æè¿°
     */
    @ApiModelProperty(value = "描述", required = true)
    @Excel(name = " æè¿° ")
    private String description;

    /**
     * é—®å·ä»‹ç»
     */
    @ApiModelProperty(value = "问卷介绍")
    @Excel(name = " é—®å·ä»‹ç» ")
    private String introduce;

    /**
     * é—®å·æç¤º
     */
    @ApiModelProperty(value = "问卷提示")
    @Excel(name = " é—®å·æç¤º ")
    private String submitprompt;

    /**
     * æ¨¡æ¿ID
     */
    @ApiModelProperty(value = "模板ID")
    @Excel(name = " æ¨¡æ¿ID ")
    private Long templateid;

    /**
     * ç‰ˆæœ¬
     */
    @ApiModelProperty(value = "版本")
    @Excel(name = " ç‰ˆæœ¬ ")
    private String version;

    /**
     * ä¸­å¿ƒåº“代码
     */
    @ApiModelProperty(value = "中心库代码")
    @Excel(name = " ä¸­å¿ƒåº“代码 ")
    private String centerlibrarycode;

    /**
     * ä¸­å¿ƒåº“ID
     */
    @ApiModelProperty(value = "中心库ID")
    @Excel(name = " ä¸­å¿ƒåº“ID ")
    private Long centerlibraryid;

    /**
     * æ˜¯å¦æœ¬åœ°
     */
    @ApiModelProperty(value = "是否本地")
    @Excel(name = " æ˜¯å¦æœ¬åœ° ")
    private Long islocal;

    /**
     * æ˜¯å¦å¯ç”¨
     */
    @ApiModelProperty(value = "是否启用")
    @Excel(name = " æ˜¯å¦å¯ç”¨ ")
    private String isenable = "0";

    /**
     * æœºæž„ID
     */
    @ApiModelProperty(value = "机构ID")
    @Excel(name = " æœºæž„ID ")
    private String orgid;

    /**
     * åˆ é™¤æ ‡è®°
     */
    @ApiModelProperty(value = "删除标记")
    private String delFlag;

    /**
     * ä¸Šä¼ æ ‡è®°
     */
    @ApiModelProperty(value = "上传标记")
    @Excel(name = " ä¸Šä¼ æ ‡è®° ")
    private Long isupload;


    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @ApiModelProperty(value = "上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " ä¸Šä¼ æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    private Date uploadTime;

    /**
     * ç–¾ç—…名称
     */
    @ApiModelProperty(value = "疾病名称")
    private String icdname;

    /**
     * ç–¾ç—…ID
     */
    @ApiModelProperty(value = "疾病关联表")
    private List<Icd10Association> icd10Associations;

    /**
     * é—®å·é¢˜ç›®é›†åˆ
     */
    @ApiModelProperty(value = "问卷题目集合")
    private List<SvyLibTemplateScript> svyTemplateLibScripts;

    /**
     * æ¨¡æ¿ç§‘室关联集合
     */
    @ApiModelProperty(value = "模板科室关联集合")
    private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>();

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    private Integer isoperation;

    /**
     * ç§‘室名称
     */
    @Excel(name = "科室名称")
    @ApiModelProperty("科室名称")
    private String deptNames = "";

    /**
     * æ ‡ç­¾ä¿¡æ¯
     */
    @Excel(name = "标签信息")
    @ApiModelProperty("标签信息")
    private List<SvyLibTemplateTag> svyLibTemplateTagList;

    /**
     * å…¶å®ƒç–¾ç—…
     */
    @Excel(name = "其它疾病")
    @ApiModelProperty("其它疾病")
    private List<Icd10Association> icd10AssociationList;

    /**
     * é™¢åŒº
     */
    @Excel(name = "院区")
    @ApiModelProperty("院区")
    private String campus = "";

    /**
     * é€‚用方式：调查表1，智能语音2、人工3
     */
    @Excel(name = "院适用方式：调查表1，智能语音2、人工3区")
    @ApiModelProperty("适用方式：调查表1，智能语音2、人工3")
    private String suitway = "";


    /**
     * å…¶å®ƒæ•°æ®ï¼ˆå­˜å‚¨å˜é‡ï¼‰
     */
    @ApiModelProperty("其它数据（存储变量）")
    private String otherdata = "";

    /**
     * é—®é¢˜æ€»åˆ†å€¼
     */
    @ApiModelProperty("问题总分值")
    private String scriptScore;

    /**
     * å€¼ç±»åž‹ï¼ˆ1 é€‰é¡¹  2 æ–‡æœ¬  3 æ•°å€¼ï¼‰
     */
    @ApiModelProperty(value = "值类型（1 é€‰é¡¹  2 æ–‡æœ¬  3 æ•°å€¼ï¼‰")
    @Excel(name = "值类型", readConverterExp = "1=选项,2=文本,3=数值")
    private Long valueType;


    @ApiModelProperty(value = "回复（指问题的回复，给问答题用的）")
    private String reply;

    @ApiModelProperty(value = "分数类型（数字，字母，等级）")
    private String scoreType;


    public SvyLibTemplateVO() {
    }

    public SvyLibTemplateVO(Long svyid, String icdname) {
        this.svyid = svyid;
        this.icdname = icdname;
    }
}

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

@@ -1,9 +1,12 @@
package com.smartor.mapper;

import com.smartor.domain.PatArchiveOut;
import com.smartor.domain.PerSonWorkbenchDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

/**
 * å¤–部患者档案Mapper接口
@@ -12,8 +15,7 @@
 * @date 2024-04-29
 */
@Mapper
public interface PatArchiveOutMapper
{
public interface PatArchiveOutMapper {
    /**
     * æŸ¥è¯¢å¤–部患者档案
     *
@@ -22,6 +24,8 @@
     */
    public PatArchiveOut selectPatArchiveOutByPatid(Long patid);

    public List<PerSonWorkbenchDto> selectPatArchiveCount(@Param("deptIds") long[] deptIds,@Param("drCodes")  String[] drCodes);

    /**
     * æŸ¥è¯¢å¤–部患者档案列表
     *

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

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

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

import java.util.List;

/**
 * æ‚£è€…过滤名单Mapper接口
 *
 * @author ruoyi
 * @date 2024-08-02
 */
@Mapper
public interface PatFilterlistMapper
{
    /**
     * æŸ¥è¯¢æ‚£è€…过滤名单
     *
     * @param id æ‚£è€…过滤名单主键
     * @return æ‚£è€…过滤名单
     */
    public PatFilterlist selectPatFilterlistById(Long id);

    /**
     * æŸ¥è¯¢æ‚£è€…过滤名单列表
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return æ‚£è€…过滤名单集合
     */
    public List<PatFilterlist> selectPatFilterlistList(PatFilterlist patFilterlist);

    /**
     * æ–°å¢žæ‚£è€…过滤名单
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return ç»“æžœ
     */
    public int insertPatFilterlist(PatFilterlist patFilterlist);

    /**
     * ä¿®æ”¹æ‚£è€…过滤名单
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return ç»“æžœ
     */
    public int updatePatFilterlist(PatFilterlist patFilterlist);

    /**
     * åˆ é™¤æ‚£è€…过滤名单
     *
     * @param id æ‚£è€…过滤名单主键
     * @return ç»“æžœ
     */
    public int deletePatFilterlistById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…过滤名单
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deletePatFilterlistByIds(Long[] ids);
}

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

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

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

import java.util.List;

/**
 * æ‚£è€…挂号记录Mapper接口
 *
 * @author ruoyi
 * @date 2024-08-01
 */
@Mapper
public interface PatMedRegistrationMapper {
    /**
     * æŸ¥è¯¢æ‚£è€…挂号记录
     *
     * @param registid æ‚£è€…挂号记录主键
     * @return æ‚£è€…挂号记录
     */
    public PatMedRegistration selectPatMedRegistrationByRegistid(Long registid);

    /**
     * æŸ¥è¯¢æ‚£è€…挂号记录列表
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return æ‚£è€…挂号记录集合
     */
    public List<PatMedRegistration> selectPatMedRegistrationList(PatMedRegistration patMedRegistration);

    /**
     * æ–°å¢žæ‚£è€…挂号记录
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return ç»“æžœ
     */
    public int insertPatMedRegistration(PatMedRegistration patMedRegistration);

    /**
     * ä¿®æ”¹æ‚£è€…挂号记录
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return ç»“æžœ
     */
    public int updatePatMedRegistration(PatMedRegistration patMedRegistration);

    /**
     * åˆ é™¤æ‚£è€…挂号记录
     *
     * @param registid æ‚£è€…挂号记录主键
     * @return ç»“æžœ
     */
    public int deletePatMedRegistrationByRegistid(Long registid);

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…挂号记录
     *
     * @param registids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deletePatMedRegistrationByRegistids(Long[] registids);
}

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

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

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

import java.util.List;

/**
 * ä¸“病患者Mapper接口
 *
 * @author ruoyi
 * @date 2024-08-02
 */
@Mapper
public interface PatSpeciallistMapper {
    /**
     * æŸ¥è¯¢ä¸“病患者
     *
     * @param id ä¸“病患者主键
     * @return ä¸“病患者
     */
    public PatSpeciallist selectPatSpeciallistById(Long id);

    /**
     * æŸ¥è¯¢ä¸“病患者列表
     *
     * @param patSpeciallist ä¸“病患者
     * @return ä¸“病患者集合
     */
    public List<PatSpeciallist> selectPatSpeciallistList(PatSpeciallist patSpeciallist);

    /**
     * æ–°å¢žä¸“病患者
     *
     * @param patSpeciallist ä¸“病患者
     * @return ç»“æžœ
     */
    public int insertPatSpeciallist(PatSpeciallist patSpeciallist);

    /**
     * ä¿®æ”¹ä¸“病患者
     *
     * @param patSpeciallist ä¸“病患者
     * @return ç»“æžœ
     */
    public int updatePatSpeciallist(PatSpeciallist patSpeciallist);

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

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

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

@@ -49,6 +49,8 @@
     */
    public Boolean saveOrUpdatePatInfo(PatArchiveVO patArchiveVO);

    public Boolean update(PatArchive patArchive);

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…档案
     *

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

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

import com.smartor.domain.PatFilterlist;

import java.util.List;

/**
 * æ‚£è€…过滤名单Service接口
 *
 * @author ruoyi
 * @date 2024-08-02
 */
public interface IPatFilterlistService
{
    /**
     * æŸ¥è¯¢æ‚£è€…过滤名单
     *
     * @param id æ‚£è€…过滤名单主键
     * @return æ‚£è€…过滤名单
     */
    public PatFilterlist selectPatFilterlistById(Long id);

    /**
     * æŸ¥è¯¢æ‚£è€…过滤名单列表
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return æ‚£è€…过滤名单集合
     */
    public List<PatFilterlist> selectPatFilterlistList(PatFilterlist patFilterlist);

    /**
     * æ–°å¢žæ‚£è€…过滤名单
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return ç»“æžœ
     */
    public int insertPatFilterlist(PatFilterlist patFilterlist);

    /**
     * ä¿®æ”¹æ‚£è€…过滤名单
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return ç»“æžœ
     */
    public int updatePatFilterlist(PatFilterlist patFilterlist);

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…过滤名单
     *
     * @param ids éœ€è¦åˆ é™¤çš„患者过滤名单主键集合
     * @return ç»“æžœ
     */
    public int deletePatFilterlistByIds(Long[] ids);

    /**
     * åˆ é™¤æ‚£è€…过滤名单信息
     *
     * @param id æ‚£è€…过滤名单主键
     * @return ç»“æžœ
     */
    public int deletePatFilterlistById(Long id);
}

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

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

import com.smartor.domain.PatMedRegistration;

import java.util.List;

/**
 * æ‚£è€…挂号记录Service接口
 *
 * @author ruoyi
 * @date 2024-08-01
 */
public interface IPatMedRegistrationService {
    /**
     * æŸ¥è¯¢æ‚£è€…挂号记录
     *
     * @param registid æ‚£è€…挂号记录主键
     * @return æ‚£è€…挂号记录
     */
    public PatMedRegistration selectPatMedRegistrationByRegistid(Long registid);

    /**
     * æŸ¥è¯¢æ‚£è€…挂号记录列表
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return æ‚£è€…挂号记录集合
     */
    public List<PatMedRegistration> selectPatMedRegistrationList(PatMedRegistration patMedRegistration);

    /**
     * æ–°å¢žæ‚£è€…挂号记录
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return ç»“æžœ
     */
    public int insertPatMedRegistration(PatMedRegistration patMedRegistration);

    /**
     * ä¿®æ”¹æ‚£è€…挂号记录
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return ç»“æžœ
     */
    public int updatePatMedRegistration(PatMedRegistration patMedRegistration);

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…挂号记录
     *
     * @param registids éœ€è¦åˆ é™¤çš„患者挂号记录主键集合
     * @return ç»“æžœ
     */
    public int deletePatMedRegistrationByRegistids(Long[] registids);

    /**
     * åˆ é™¤æ‚£è€…挂号记录信息
     *
     * @param registid æ‚£è€…挂号记录主键
     * @return ç»“æžœ
     */
    public int deletePatMedRegistrationByRegistid(Long registid);
}

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

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

import com.smartor.domain.PatSpeciallist;

import java.util.List;

/**
 * ä¸“病患者Service接口
 *
 * @author ruoyi
 * @date 2024-08-02
 */
public interface IPatSpeciallistService
{
    /**
     * æŸ¥è¯¢ä¸“病患者
     *
     * @param id ä¸“病患者主键
     * @return ä¸“病患者
     */
    public PatSpeciallist selectPatSpeciallistById(Long id);

    /**
     * æŸ¥è¯¢ä¸“病患者列表
     *
     * @param patSpeciallist ä¸“病患者
     * @return ä¸“病患者集合
     */
    public List<PatSpeciallist> selectPatSpeciallistList(PatSpeciallist patSpeciallist);

    /**
     * æ–°å¢žä¸“病患者
     *
     * @param patSpeciallist ä¸“病患者
     * @return ç»“æžœ
     */
    public int insertPatSpeciallist(PatSpeciallist patSpeciallist);

    /**
     * ä¿®æ”¹ä¸“病患者
     *
     * @param patSpeciallist ä¸“病患者
     * @return ç»“æžœ
     */
    public int updatePatSpeciallist(PatSpeciallist patSpeciallist);

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

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

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

@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.smartor.domain.SvyLibTemplate;
import com.smartor.domain.SvyLibTemplateReq;
import com.smartor.domain.SvyLibTemplateVO;
import org.springframework.web.bind.annotation.RequestBody;

/**
@@ -30,7 +31,7 @@
     * @param svyLibTemplateReq é—®å·
     * @return é—®å·é›†åˆ
     */
    public List<SvyLibTemplate> selectSvyLibTemplateList(SvyLibTemplateReq svyLibTemplateReq);
    public List<SvyLibTemplateVO> selectSvyLibTemplateList(SvyLibTemplateReq svyLibTemplateReq);

//    /**
//     * æ–°å¢žé—®å·
@@ -46,7 +47,7 @@
     * @param svyLibTemplate
     * @return
     */
    public Integer saveOrUpdateTemplate(@RequestBody SvyLibTemplate svyLibTemplate);
    public Integer saveOrUpdateTemplate(SvyLibTemplateVO svyLibTemplateVO);

    /**
     * ä¿®æ”¹é—®å·

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

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

import com.smartor.domain.BaseTag;
import com.smartor.domain.PerSonWorkbenchDto;

import java.util.List;

/**
 * æ ‡ç­¾Service接口
 *
 * @author ruoyi
 * @date 2023-06-02
 */
public interface PersonWorkbenchService {
    /**
     * å½“前登录用户的门诊、在院、出院病人的统计情况
     */
    public  List<PerSonWorkbenchDto> getPatCount(String detpId, String drCode);

}

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

@@ -107,6 +107,15 @@
        return null;
    }

    @Override
    public Boolean update(PatArchive patArchive) {
        int i = patArchiveMapper.updatePatArchive(patArchive);
        if (i != 1) {
            return false;
        }
        return true;
    }

    /**
     * æ–°å¢žæˆ–修改患者档信息
     *

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatFilterlist;
import com.smartor.mapper.PatFilterlistMapper;
import com.smartor.service.IPatFilterlistService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ‚£è€…过滤名单Service业务层处理
 *
 * @author ruoyi
 * @date 2024-08-02
 */
@Service
public class PatFilterlistServiceImpl implements IPatFilterlistService
{
    @Autowired
    private PatFilterlistMapper patFilterlistMapper;

    /**
     * æŸ¥è¯¢æ‚£è€…过滤名单
     *
     * @param id æ‚£è€…过滤名单主键
     * @return æ‚£è€…过滤名单
     */
    @Override
    public PatFilterlist selectPatFilterlistById(Long id)
    {
        return patFilterlistMapper.selectPatFilterlistById(id);
    }

    /**
     * æŸ¥è¯¢æ‚£è€…过滤名单列表
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return æ‚£è€…过滤名单
     */
    @Override
    public List<PatFilterlist> selectPatFilterlistList(PatFilterlist patFilterlist)
    {
        return patFilterlistMapper.selectPatFilterlistList(patFilterlist);
    }

    /**
     * æ–°å¢žæ‚£è€…过滤名单
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return ç»“æžœ
     */
    @Override
    public int insertPatFilterlist(PatFilterlist patFilterlist)
    {
        patFilterlist.setCreateTime(DateUtils.getNowDate());
        return patFilterlistMapper.insertPatFilterlist(patFilterlist);
    }

    /**
     * ä¿®æ”¹æ‚£è€…过滤名单
     *
     * @param patFilterlist æ‚£è€…过滤名单
     * @return ç»“æžœ
     */
    @Override
    public int updatePatFilterlist(PatFilterlist patFilterlist)
    {
        patFilterlist.setUpdateTime(DateUtils.getNowDate());
        return patFilterlistMapper.updatePatFilterlist(patFilterlist);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…过滤名单
     *
     * @param ids éœ€è¦åˆ é™¤çš„患者过滤名单主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePatFilterlistByIds(Long[] ids)
    {
        return patFilterlistMapper.deletePatFilterlistByIds(ids);
    }

    /**
     * åˆ é™¤æ‚£è€…过滤名单信息
     *
     * @param id æ‚£è€…过滤名单主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePatFilterlistById(Long id)
    {
        return patFilterlistMapper.deletePatFilterlistById(id);
    }
}

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

@@ -54,6 +54,7 @@
    public int insertPatMedOuthosp(PatMedOuthosp patMedOuthosp)
    {
        patMedOuthosp.setCreateTime(DateUtils.getNowDate());
        patMedOuthosp.setUpdateTime(DateUtils.getNowDate());
        return patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp);
    }


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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatMedRegistration;
import com.smartor.mapper.PatMedRegistrationMapper;
import com.smartor.service.IPatMedRegistrationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ‚£è€…挂号记录Service业务层处理
 *
 * @author ruoyi
 * @date 2024-08-01
 */
@Service
public class PatMedRegistrationServiceImpl implements IPatMedRegistrationService
{
    @Autowired
    private PatMedRegistrationMapper patMedRegistrationMapper;

    /**
     * æŸ¥è¯¢æ‚£è€…挂号记录
     *
     * @param registid æ‚£è€…挂号记录主键
     * @return æ‚£è€…挂号记录
     */
    @Override
    public PatMedRegistration selectPatMedRegistrationByRegistid(Long registid)
    {
        return patMedRegistrationMapper.selectPatMedRegistrationByRegistid(registid);
    }

    /**
     * æŸ¥è¯¢æ‚£è€…挂号记录列表
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return æ‚£è€…挂号记录
     */
    @Override
    public List<PatMedRegistration> selectPatMedRegistrationList(PatMedRegistration patMedRegistration)
    {
        return patMedRegistrationMapper.selectPatMedRegistrationList(patMedRegistration);
    }

    /**
     * æ–°å¢žæ‚£è€…挂号记录
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return ç»“æžœ
     */
    @Override
    public int insertPatMedRegistration(PatMedRegistration patMedRegistration)
    {
        patMedRegistration.setCreateTime(DateUtils.getNowDate());
        return patMedRegistrationMapper.insertPatMedRegistration(patMedRegistration);
    }

    /**
     * ä¿®æ”¹æ‚£è€…挂号记录
     *
     * @param patMedRegistration æ‚£è€…挂号记录
     * @return ç»“æžœ
     */
    @Override
    public int updatePatMedRegistration(PatMedRegistration patMedRegistration)
    {
        patMedRegistration.setUpdateTime(DateUtils.getNowDate());
        return patMedRegistrationMapper.updatePatMedRegistration(patMedRegistration);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…挂号记录
     *
     * @param registids éœ€è¦åˆ é™¤çš„患者挂号记录主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePatMedRegistrationByRegistids(Long[] registids)
    {
        return patMedRegistrationMapper.deletePatMedRegistrationByRegistids(registids);
    }

    /**
     * åˆ é™¤æ‚£è€…挂号记录信息
     *
     * @param registid æ‚£è€…挂号记录主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePatMedRegistrationByRegistid(Long registid)
    {
        return patMedRegistrationMapper.deletePatMedRegistrationByRegistid(registid);
    }
}

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatSpeciallist;
import com.smartor.mapper.PatSpeciallistMapper;
import com.smartor.service.IPatSpeciallistService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * ä¸“病患者Service业务层处理
 *
 * @author ruoyi
 * @date 2024-08-02
 */
@Service
public class PatSpeciallistServiceImpl implements IPatSpeciallistService
{
    @Autowired
    private PatSpeciallistMapper patSpeciallistMapper;

    /**
     * æŸ¥è¯¢ä¸“病患者
     *
     * @param id ä¸“病患者主键
     * @return ä¸“病患者
     */
    @Override
    public PatSpeciallist selectPatSpeciallistById(Long id)
    {
        return patSpeciallistMapper.selectPatSpeciallistById(id);
    }

    /**
     * æŸ¥è¯¢ä¸“病患者列表
     *
     * @param patSpeciallist ä¸“病患者
     * @return ä¸“病患者
     */
    @Override
    public List<PatSpeciallist> selectPatSpeciallistList(PatSpeciallist patSpeciallist)
    {
        return patSpeciallistMapper.selectPatSpeciallistList(patSpeciallist);
    }

    /**
     * æ–°å¢žä¸“病患者
     *
     * @param patSpeciallist ä¸“病患者
     * @return ç»“æžœ
     */
    @Override
    public int insertPatSpeciallist(PatSpeciallist patSpeciallist)
    {
        patSpeciallist.setCreateTime(DateUtils.getNowDate());
        return patSpeciallistMapper.insertPatSpeciallist(patSpeciallist);
    }

    /**
     * ä¿®æ”¹ä¸“病患者
     *
     * @param patSpeciallist ä¸“病患者
     * @return ç»“æžœ
     */
    @Override
    public int updatePatSpeciallist(PatSpeciallist patSpeciallist)
    {
        patSpeciallist.setUpdateTime(DateUtils.getNowDate());
        return patSpeciallistMapper.updatePatSpeciallist(patSpeciallist);
    }

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

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

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.Icd10;
import com.smartor.domain.PerSonWorkbenchDto;
import com.smartor.mapper.Icd10Mapper;
import com.smartor.mapper.PatArchiveOutMapper;
import com.smartor.service.IIcd10Service;
import com.smartor.service.PersonWorkbenchService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.List;

/**
 * ç–¾ç—…Service业务层处理
 *
 * @author ruoyi
 * @date 2023-12-21
 */
@Service
public class PersonWorkbenchServiceImpl implements PersonWorkbenchService {
    @Autowired
    private PatArchiveOutMapper patArchiveOutMapper;

    @Override
    public List<PerSonWorkbenchDto> getPatCount(String detpId, String drCode) {
        long[] deptIds = Arrays.stream(detpId.split(",")).mapToLong(Long::parseLong).toArray();
        String[] drCodes = drCode.split(",");

        List<PerSonWorkbenchDto> perSonWorkbenchDtos = patArchiveOutMapper.selectPatArchiveCount(deptIds, drCodes);
        return perSonWorkbenchDtos;
    }
}

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

@@ -87,6 +87,7 @@
    @Override
    public int insertServiceTask(ServiceTask serviceTask) {
        serviceTask.setCreateTime(DateUtils.getNowDate());
        serviceTask.setUpdateTime(DateUtils.getNowDate());
        return serviceTaskMapper.insertServiceTask(serviceTask);
    }


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

@@ -1,6 +1,7 @@
package com.smartor.service.impl;

import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
@@ -37,6 +38,8 @@
    private TempDetpRelevanceMapper tempDetpRelevanceMapper;
    @Autowired
    private SvyLibTemplateTagMapper svyLibTemplateTagMapper;
    @Autowired
    private Icd10AssociationMapper icd10AssociationMapper;

    /**
     * æŸ¥è¯¢é—®å·
@@ -65,12 +68,13 @@
     * @return é—®å·
     */
    @Override
    public List<SvyLibTemplate> selectSvyLibTemplateList(SvyLibTemplateReq svyLibTemplateReq) {
    public List<SvyLibTemplateVO> selectSvyLibTemplateList(SvyLibTemplateReq svyLibTemplateReq) {
        List<SvyLibTemplate> svyLibTemplates = svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq);
        List<SvyLibTemplateVO> svyLibTemplateVOS = DtoConversionUtils.sourceToTarget(svyLibTemplates, SvyLibTemplateVO.class);
        //添加题目
        for (int i = 0; i < svyLibTemplates.size(); i++) {
        for (int i = 0; i < svyLibTemplateVOS.size(); i++) {
            SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
            svyLibTemplateScript.setSvyid(svyLibTemplates.get(i).getSvyid());
            svyLibTemplateScript.setSvyid(svyLibTemplateVOS.get(i).getSvyid());
            List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
            //获取题目选项
            a:
@@ -88,48 +92,57 @@
                }
            }
            //将题目放到问卷列表中
            svyLibTemplates.get(i).setSvyTemplateLibScripts(svyLibTemplateScripts);
            svyLibTemplateVOS.get(i).setSvyTemplateLibScripts(svyLibTemplateScripts);

            //获取每个问卷对应的科室
            TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
            tempDetpRelevance.setTempid(svyLibTemplates.get(i).getSvyid());
            tempDetpRelevance.setTempid(svyLibTemplateVOS.get(i).getSvyid());
            List<TempDetpRelevance> tempDetpRelevances = tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance);
            svyLibTemplates.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>());
            svyLibTemplateVOS.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>());

            //获取标签
            SvyLibTemplateTag svyLibTemplateTag = new SvyLibTemplateTag();
            svyLibTemplateTag.setTemplateid(svyLibTemplates.get(i).getSvyid());
            svyLibTemplateTag.setTemplateid(svyLibTemplateVOS.get(i).getSvyid());
            List<SvyLibTemplateTag> svyLibTemplateTags = svyLibTemplateTagMapper.selectSvyLibTemplateTagList(svyLibTemplateTag);
            svyLibTemplates.get(i).setSvyLibTemplateTagList(svyLibTemplateTags);
            svyLibTemplateVOS.get(i).setSvyLibTemplateTagList(svyLibTemplateTags);

            //获取疾病
            Icd10Association icd10Association = new Icd10Association();
            icd10Association.setType(5L);
            icd10Association.setOutid(svyLibTemplateVOS.get(i).getSvyid());
            svyLibTemplateVOS.get(i).setIcd10AssociationList(icd10AssociationMapper.selectIcd10AssociationList(icd10Association));

        }

        //先将相同的id的icdname,整理到一块
        List<SvyLibTemplate> libTemplates = svyLibTemplates.stream().collect(Collectors.groupingBy(SvyLibTemplate::getSvyid, Collectors.mapping(SvyLibTemplate::getIcdname, Collectors.joining(", ")))).entrySet().stream().map(entry -> new SvyLibTemplate(entry.getKey(), entry.getValue())).collect(Collectors.toList());
        List<SvyLibTemplateVO> libTemplates = svyLibTemplateVOS.stream().collect(Collectors.groupingBy(SvyLibTemplateVO::getSvyid, Collectors.mapping(SvyLibTemplateVO::getIcdname, Collectors.joining(", ")))).entrySet().stream().map(entry -> new SvyLibTemplateVO(entry.getKey(), entry.getValue())).collect(Collectors.toList());
        //临时变量，用来保存疾病名称
        String icdname = null;
        for (int i = 0; i < libTemplates.size(); i++) {
            for (int j = 0; j < svyLibTemplates.size(); j++) {
                if (ObjectUtils.isNotEmpty(libTemplates.get(i).getSvyid()) && libTemplates.get(i).getSvyid() == svyLibTemplates.get(j).getSvyid()) {
            for (int j = 0; j < svyLibTemplateVOS.size(); j++) {
                if (ObjectUtils.isNotEmpty(libTemplates.get(i).getSvyid()) && libTemplates.get(i).getSvyid() == svyLibTemplateVOS.get(j).getSvyid()) {
                    icdname = libTemplates.get(i).getIcdname();
                    // å°†åŽŸæ•°æ®æ‹·è´åˆ°æ•´ç†çš„好的对象上
                    BeanUtils.copyProperties(svyLibTemplates.get(j), libTemplates.get(i));
                    BeanUtils.copyProperties(svyLibTemplateVOS.get(j), libTemplates.get(i));
                    //再将整理好的“疾病名称”替换
                    libTemplates.get(i).setIcdname(icdname);
                }
            }
        }
        return libTemplates;

        return svyLibTemplateVOS;
    }

    /**
     * æ–°å¢žæˆ–修改问卷模板信息
     *
     * @param svyLibTemplate
     * @param svyLibTemplateVO
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public Integer saveOrUpdateTemplate(SvyLibTemplate svyLibTemplate) {
    public Integer saveOrUpdateTemplate(SvyLibTemplateVO svyLibTemplateVO) {
        SvyLibTemplate svyLibTemplate = DtoConversionUtils.sourceToTarget(svyLibTemplateVO, SvyLibTemplate.class);
        Integer i = null;
        if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 1) {
            //新增
@@ -202,6 +215,19 @@
            }

        }
        if (CollectionUtils.isNotEmpty(svyLibTemplateVO.getIcd10AssociationList())) {
            for (Icd10Association icd10Association : svyLibTemplateVO.getIcd10AssociationList()) {
                if (icd10Association.getId() == null) {
                    icd10Association.setType(5L);
                    icd10Association.setOutid(svyLibTemplate.getSvyid());
                    icd10AssociationMapper.insertIcd10Association(icd10Association);
                } else {
                    icd10Association.setType(5L);
                    icd10Association.setOutid(svyLibTemplate.getSvyid());
                    icd10AssociationMapper.updateIcd10Association(icd10Association);
                }
            }
        }
        return i;
    }


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

@@ -260,10 +260,10 @@
            <if test="scriptTopic != null">script_topic = #{scriptTopic},</if>
            <if test="nextScriptno != null">next_scriptno = #{nextScriptno},</if>
            <if test="otherdata != null">otherdata = #{otherdata},</if>
            <if test="isMust != null  and isMust != ''">is_must = #{isMust}</if>
            <if test="scriptDesc != null ">script_desc = #{scriptDesc}</if>
            <if test="scriptType != null ">script_type = #{scriptType}</if>
            <if test="sort != null ">sort = #{sort}</if>
            <if test="isMust != null  and isMust != ''">is_must = #{isMust},</if>
            <if test="scriptDesc != null ">script_desc = #{scriptDesc},</if>
            <if test="scriptType != null ">script_type = #{scriptType},</if>
            <if test="sort != null ">sort = #{sort},</if>
            <if test="branchFlag != null  and branchFlag != ''">branch_flag = #{branchFlag},</if>
            <if test="branchNextscriptno != null  and branchNextscriptno != ''">branch_nextscriptno =
                #{branchNextscriptno},

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

@@ -112,6 +112,45 @@
        where patid = #{patid}
    </select>

    <select id="selectPatArchiveCount" parameterType="Long" resultType="com.smartor.domain.PerSonWorkbenchDto">
        select aa.name1 as name, aa.count as count
        from (
        SELECT "住院" as name1, count(1) as count FROM `pat_med_inhosp`
        <where>
            del_flag = 0 and endtime = null
            <if test="deptIds != null ">and deptId in
                <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
            <if test="drCodes != null ">and drcode in
                <foreach collection="drCodes" item="drCode" open="(" separator="," close=")">
                    #{drCode}
                </foreach>
            </if>
        </where>
        union
        select "出院" name1, count(1) as count FROM `pat_med_inhosp`
        <where>
            del_flag=0 and endtime != null
            <if test="deptIds != null ">and deptId in
                <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
            <if test="drCodes != null ">and drcode in
                <foreach collection="drCodes" item="drCode" open="(" separator="," close=")">
                    #{drCode}
                </foreach>
            </if>
        </where>
        union
        select "门诊" name1, count(1) as count FROM `pat_med_outhosp`
        where del_flag=0
        ) aa

    </select>

    <insert id="insertPatArchiveOut" parameterType="com.smartor.domain.PatArchiveOut" useGeneratedKeys="true"
            keyProperty="patid">
        insert into pat_archive_out

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
<?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.PatFilterlistMapper">

    <resultMap type="com.smartor.domain.PatFilterlist" id="PatFilterlistResult">
        <result property="id"    column="id"    />
        <result property="patid"    column="patid"    />
        <result property="filtertype"    column="filtertype"    />
        <result property="filterdesc"    column="filterdesc"    />
        <result property="filternotes"    column="filternotes"    />
        <result property="applyTime"    column="apply_time"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="checkBy"    column="check_by"    />
        <result property="checkFlag"    column="check_flag"    />
        <result property="checkTime"    column="check_time"    />
        <result property="checkdesc"    column="checkdesc"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="isupload"    column="isupload"    />
        <result property="uploadTime"    column="upload_time"    />
        <result property="orgid"    column="orgid"    />
        <result property="pid"    column="pid"    />
        <result property="guid"    column="guid"    />
    </resultMap>

    <sql id="selectPatFilterlistVo">
        select id, patid, filtertype, filterdesc, filternotes, apply_time, del_flag, check_by, check_flag, check_time, checkdesc, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid from pat_filterlist
    </sql>

    <select id="selectPatFilterlistList" parameterType="com.smartor.domain.PatFilterlist" resultMap="PatFilterlistResult">
        <include refid="selectPatFilterlistVo"/>
        <where>
            <if test="patid != null "> and patid = #{patid}</if>
            <if test="filtertype != null  and filtertype != ''"> and filtertype = #{filtertype}</if>
            <if test="filterdesc != null  and filterdesc != ''"> and filterdesc = #{filterdesc}</if>
            <if test="filternotes != null  and filternotes != ''"> and filternotes = #{filternotes}</if>
            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
            <if test="checkBy != null "> and check_by = #{checkBy}</if>
            <if test="checkFlag != null  and checkFlag != ''"> and check_flag = #{checkFlag}</if>
            <if test="checkTime != null "> and check_time = #{checkTime}</if>
            <if test="checkdesc != null  and checkdesc != ''"> and checkdesc = #{checkdesc}</if>
            <if test="isupload != null "> and isupload = #{isupload}</if>
            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
            <if test="pid != null "> and pid = #{pid}</if>
            <if test="guid != null  and guid != ''"> and guid = #{guid}</if>
        </where>
    </select>

    <select id="selectPatFilterlistById" parameterType="Long" resultMap="PatFilterlistResult">
        <include refid="selectPatFilterlistVo"/>
        where id = #{id}
    </select>

    <insert id="insertPatFilterlist" parameterType="com.smartor.domain.PatFilterlist" useGeneratedKeys="true" keyProperty="id">
        insert into pat_filterlist
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="patid != null">patid,</if>
            <if test="filtertype != null">filtertype,</if>
            <if test="filterdesc != null">filterdesc,</if>
            <if test="filternotes != null">filternotes,</if>
            <if test="applyTime != null">apply_time,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="checkBy != null">check_by,</if>
            <if test="checkFlag != null">check_flag,</if>
            <if test="checkTime != null">check_time,</if>
            <if test="checkdesc != null">checkdesc,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="orgid != null">orgid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="patid != null">#{patid},</if>
            <if test="filtertype != null">#{filtertype},</if>
            <if test="filterdesc != null">#{filterdesc},</if>
            <if test="filternotes != null">#{filternotes},</if>
            <if test="applyTime != null">#{applyTime},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="checkBy != null">#{checkBy},</if>
            <if test="checkFlag != null">#{checkFlag},</if>
            <if test="checkTime != null">#{checkTime},</if>
            <if test="checkdesc != null">#{checkdesc},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
         </trim>
    </insert>

    <update id="updatePatFilterlist" parameterType="com.smartor.domain.PatFilterlist">
        update pat_filterlist
        <trim prefix="SET" suffixOverrides=",">
            <if test="patid != null">patid = #{patid},</if>
            <if test="filtertype != null">filtertype = #{filtertype},</if>
            <if test="filterdesc != null">filterdesc = #{filterdesc},</if>
            <if test="filternotes != null">filternotes = #{filternotes},</if>
            <if test="applyTime != null">apply_time = #{applyTime},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="checkBy != null">check_by = #{checkBy},</if>
            <if test="checkFlag != null">check_flag = #{checkFlag},</if>
            <if test="checkTime != null">check_time = #{checkTime},</if>
            <if test="checkdesc != null">checkdesc = #{checkdesc},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatFilterlistById" parameterType="Long">
        update pat_filterlist
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag =1,</if>
        </trim>
        where id = #{id}
    </update>

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

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

@@ -78,6 +78,7 @@
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="outhospno != null  and outhospno != ''">and outhospno = #{outhospno}</if>
        </where>
        order by update_time desc
    </select>

    <select id="selectPatMedOuthospById" parameterType="Long" resultMap="PatMedOuthospResult">

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,196 @@
<?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.PatMedRegistrationMapper">

    <resultMap type="com.smartor.domain.PatMedRegistration" id="PatMedRegistrationResult">
        <result property="registid" column="registid"/>
        <result property="serialnum" column="serialnum"/>
        <result property="patid" column="patid"/>
        <result property="hospitalname" column="hospitalname"/>
        <result property="hospitalcode" column="hospitalcode"/>
        <result property="deptcode" column="deptcode"/>
        <result property="deptname" column="deptname"/>
        <result property="deptid" column="deptid"/>
        <result property="state" column="state"/>
        <result property="appointmenttime" column="appointmenttime"/>
        <result property="appointmenttimetype" column="appointmenttimetype"/>
        <result property="appointmentcode" column="appointmentcode"/>
        <result property="appointmentbegintime" column="appointmentbegintime"/>
        <result property="appointmentendtime" column="appointmentendtime"/>
        <result property="orgid" column="orgid"/>
        <result property="delFlag" column="del_flag"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="isupload" column="isupload"/>
        <result property="uploadTime" column="upload_time"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
    </resultMap>

    <sql id="selectPatMedRegistrationVo">
        select registid,
               serialnum,
               patid,
               hospitalname,
               hospitalcode,
               deptcode,
               deptname,
               deptid,
               state,
               appointmenttime,
               appointmenttimetype,
               appointmentcode,
               appointmentbegintime,
               appointmentendtime,
               orgid,
               del_flag,
               update_by,
               update_time,
               create_by,
               create_time,
               isupload,
               upload_time,
               pid,
               guid
        from pat_med_registration
    </sql>

    <select id="selectPatMedRegistrationList" parameterType="com.smartor.domain.PatMedRegistration"
            resultMap="PatMedRegistrationResult">
        <include refid="selectPatMedRegistrationVo"/>
        <where>
            <if test="serialnum != null  and serialnum != ''">and serialnum = #{serialnum}</if>
            <if test="patid != null ">and patid = #{patid}</if>
            <if test="hospitalname != null  and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
                '%')
            </if>
            <if test="hospitalcode != null  and hospitalcode != ''">and hospitalcode = #{hospitalcode}</if>
            <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
            <if test="deptname != null  and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if>
            <if test="deptid != null ">and deptid = #{deptid}</if>
            <if test="state != null ">and state = #{state}</if>
            <if test="appointmenttime != null ">and appointmenttime = #{appointmenttime}</if>
            <if test="appointmenttimetype != null ">and appointmenttimetype = #{appointmenttimetype}</if>
            <if test="appointmentcode != null  and appointmentcode != ''">and appointmentcode = #{appointmentcode}</if>
            <if test="appointmentbegintime != null ">and appointmentbegintime = #{appointmentbegintime}</if>
            <if test="appointmentendtime != null ">and appointmentendtime = #{appointmentendtime}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
        </where>
    </select>

    <select id="selectPatMedRegistrationByRegistid" parameterType="Long" resultMap="PatMedRegistrationResult">
        <include refid="selectPatMedRegistrationVo"/>
        where registid = #{registid}
    </select>

    <insert id="insertPatMedRegistration" parameterType="com.smartor.domain.PatMedRegistration">
        insert into pat_med_registration
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="registid != null">registid,</if>
            <if test="serialnum != null">serialnum,</if>
            <if test="patid != null">patid,</if>
            <if test="hospitalname != null">hospitalname,</if>
            <if test="hospitalcode != null">hospitalcode,</if>
            <if test="deptcode != null">deptcode,</if>
            <if test="deptname != null">deptname,</if>
            <if test="deptid != null">deptid,</if>
            <if test="state != null">state,</if>
            <if test="appointmenttime != null">appointmenttime,</if>
            <if test="appointmenttimetype != null">appointmenttimetype,</if>
            <if test="appointmentcode != null">appointmentcode,</if>
            <if test="appointmentbegintime != null">appointmentbegintime,</if>
            <if test="appointmentendtime != null">appointmentendtime,</if>
            <if test="orgid != null">orgid,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="registid != null">#{registid},</if>
            <if test="serialnum != null">#{serialnum},</if>
            <if test="patid != null">#{patid},</if>
            <if test="hospitalname != null">#{hospitalname},</if>
            <if test="hospitalcode != null">#{hospitalcode},</if>
            <if test="deptcode != null">#{deptcode},</if>
            <if test="deptname != null">#{deptname},</if>
            <if test="deptid != null">#{deptid},</if>
            <if test="state != null">#{state},</if>
            <if test="appointmenttime != null">#{appointmenttime},</if>
            <if test="appointmenttimetype != null">#{appointmenttimetype},</if>
            <if test="appointmentcode != null">#{appointmentcode},</if>
            <if test="appointmentbegintime != null">#{appointmentbegintime},</if>
            <if test="appointmentendtime != null">#{appointmentendtime},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
        </trim>
    </insert>

    <update id="updatePatMedRegistration" parameterType="com.smartor.domain.PatMedRegistration">
        update pat_med_registration
        <trim prefix="SET" suffixOverrides=",">
            <if test="serialnum != null">serialnum = #{serialnum},</if>
            <if test="patid != null">patid = #{patid},</if>
            <if test="hospitalname != null">hospitalname = #{hospitalname},</if>
            <if test="hospitalcode != null">hospitalcode = #{hospitalcode},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="deptname != null">deptname = #{deptname},</if>
            <if test="deptid != null">deptid = #{deptid},</if>
            <if test="state != null">state = #{state},</if>
            <if test="appointmenttime != null">appointmenttime = #{appointmenttime},</if>
            <if test="appointmenttimetype != null">appointmenttimetype = #{appointmenttimetype},</if>
            <if test="appointmentcode != null">appointmentcode = #{appointmentcode},</if>
            <if test="appointmentbegintime != null">appointmentbegintime = #{appointmentbegintime},</if>
            <if test="appointmentendtime != null">appointmentendtime = #{appointmentendtime},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
        </trim>
        where registid = #{registid}
    </update>

    <delete id="deletePatMedRegistrationByRegistid" parameterType="Long">
        delete
        from pat_med_registration
        where registid = #{registid}
    </delete>

    <update id="deletePatMedRegistrationByRegistids" parameterType="Long">
        update pat_med_registration
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where registid in
        <foreach item="registid" collection="array" open="(" separator="," close=")">
            #{registid}
        </foreach>
    </update>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
<?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.PatSpeciallistMapper">

    <resultMap type="com.smartor.domain.PatSpeciallist" id="PatSpeciallistResult">
        <result property="id"    column="id"    />
        <result property="patid"    column="patid"    />
        <result property="sdtype"    column="sdtype"    />
        <result property="sddesc"    column="sddesc"    />
        <result property="sdnotes"    column="sdnotes"    />
        <result property="applyTime"    column="apply_time"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="checkBy"    column="check_by"    />
        <result property="checkFlag"    column="check_flag"    />
        <result property="checkTime"    column="check_time"    />
        <result property="checkdesc"    column="checkdesc"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="uploadFlag"    column="upload_flag"    />
        <result property="uploadTime"    column="upload_time"    />
        <result property="orgid"    column="orgid"    />
        <result property="pid"    column="pid"    />
        <result property="guid"    column="guid"    />
    </resultMap>

    <sql id="selectPatSpeciallistVo">
        select id, patid, sdtype, sddesc, sdnotes, apply_time, del_flag, check_by, check_flag, check_time, checkdesc, update_by, update_time, create_by, create_time, upload_flag, upload_time, orgid, pid, guid from pat_speciallist
    </sql>

    <select id="selectPatSpeciallistList" parameterType="com.smartor.domain.PatSpeciallist" resultMap="PatSpeciallistResult">
        <include refid="selectPatSpeciallistVo"/>
        <where>
            <if test="patid != null "> and patid = #{patid}</if>
            <if test="sdtype != null  and sdtype != ''"> and sdtype = #{sdtype}</if>
            <if test="sddesc != null  and sddesc != ''"> and sddesc = #{sddesc}</if>
            <if test="sdnotes != null  and sdnotes != ''"> and sdnotes = #{sdnotes}</if>
            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
            <if test="checkBy != null "> and check_by = #{checkBy}</if>
            <if test="checkFlag != null  and checkFlag != ''"> and check_flag = #{checkFlag}</if>
            <if test="checkTime != null "> and check_time = #{checkTime}</if>
            <if test="checkdesc != null  and checkdesc != ''"> and checkdesc = #{checkdesc}</if>
            <if test="uploadFlag != null "> and upload_flag = #{uploadFlag}</if>
            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
            <if test="pid != null "> and pid = #{pid}</if>
            <if test="guid != null  and guid != ''"> and guid = #{guid}</if>
        </where>
    </select>

    <select id="selectPatSpeciallistById" parameterType="Long" resultMap="PatSpeciallistResult">
        <include refid="selectPatSpeciallistVo"/>
        where id = #{id}
    </select>

    <insert id="insertPatSpeciallist" parameterType="com.smartor.domain.PatSpeciallist" useGeneratedKeys="true" keyProperty="id">
        insert into pat_speciallist
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="patid != null">patid,</if>
            <if test="sdtype != null">sdtype,</if>
            <if test="sddesc != null">sddesc,</if>
            <if test="sdnotes != null">sdnotes,</if>
            <if test="applyTime != null">apply_time,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="checkBy != null">check_by,</if>
            <if test="checkFlag != null">check_flag,</if>
            <if test="checkTime != null">check_time,</if>
            <if test="checkdesc != null">checkdesc,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="uploadFlag != null">upload_flag,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="orgid != null">orgid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="patid != null">#{patid},</if>
            <if test="sdtype != null">#{sdtype},</if>
            <if test="sddesc != null">#{sddesc},</if>
            <if test="sdnotes != null">#{sdnotes},</if>
            <if test="applyTime != null">#{applyTime},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="checkBy != null">#{checkBy},</if>
            <if test="checkFlag != null">#{checkFlag},</if>
            <if test="checkTime != null">#{checkTime},</if>
            <if test="checkdesc != null">#{checkdesc},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="uploadFlag != null">#{uploadFlag},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
         </trim>
    </insert>

    <update id="updatePatSpeciallist" parameterType="com.smartor.domain.PatSpeciallist">
        update pat_speciallist
        <trim prefix="SET" suffixOverrides=",">
            <if test="patid != null">patid = #{patid},</if>
            <if test="sdtype != null">sdtype = #{sdtype},</if>
            <if test="sddesc != null">sddesc = #{sddesc},</if>
            <if test="sdnotes != null">sdnotes = #{sdnotes},</if>
            <if test="applyTime != null">apply_time = #{applyTime},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="checkBy != null">check_by = #{checkBy},</if>
            <if test="checkFlag != null">check_flag = #{checkFlag},</if>
            <if test="checkTime != null">check_time = #{checkTime},</if>
            <if test="checkdesc != null">checkdesc = #{checkdesc},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="uploadFlag != null">upload_flag = #{uploadFlag},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deletePatSpeciallistById" parameterType="Long">
        update pat_speciallist
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag =1,</if>
        </trim>
        where id = #{id}
    </delete>

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

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

@@ -112,6 +112,11 @@
            <if test="checktime != null ">and checktime = #{checktime}</if>
            <if test="type != null  and type != ''">and type = #{type}</if>
            <if test="typename != null  and typename != ''">and typename like concat('%', #{typename}, '%')</if>
            <if test="bgeinTime != null ">and date_format(update_time,'%y%m%d') &gt;= date_format(#{endTime},'%y%m%d')
            </if>
            <if test="endTime != null ">and date_format(update_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
            </if>

            <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
@@ -119,6 +124,8 @@
            <if test="hospType != null  and hospType != ''">and hosp_type = #{hospType}</if>
            <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
            <if test="libtemplatename != null  and libtemplatename != ''">and libtemplatename = #{libtemplatename}</if>
            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
            <if test="sendState != null  ">and send_state = #{sendState}</if>
        </where>
        order by update_time desc,taskid desc
    </select>

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

@@ -113,7 +113,7 @@
            <if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
            <if test="svyid != null ">and a.svyid = #{svyid}</if>
            <if test="svyname != null  and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>
            <if test="description != null  and description != ''">and a.icdname like concat('%', #{description}, '%')
            <if test="description != null  and description != ''">and  b.icd10name like concat('%', #{description}, '%')
            </if>
        </where>
        order by a.create_time desc