Merge remote-tracking branch 'origin/master' into smartor_ls_261008

liusheng

2026-10-10 87b79ea739ec32bd7d0e493a6ea8525212f6c763

Merge remote-tracking branch 'origin/master' into smartor_ls_261008

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

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

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

import com.ruoyi.common.annotation.AddOrgId;
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.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatChildArchive;
import com.smartor.service.IPatChildArchiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * å„¿ç§‘档案Controller
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Api(description = "儿科档案")
@RestController
@RequestMapping("/smartor/childArchive")
public class PatChildArchiveController extends BaseController {
    @Autowired
    private IPatChildArchiveService patChildArchiveService;

    @ApiOperation("查询儿科档案列表")
    //@PreAuthorize("@ss.hasPermi('system:childArchive:list')")
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/selectPatChildArchiveList")
    public TableDataInfo selectPatChildArchiveList(@RequestBody PatChildArchive patChildArchive) {
        PageUtils.startPageByPost(patChildArchive.getPageNum(), patChildArchive.getPageSize());
        List<PatChildArchive> list = patChildArchiveService.selectPatChildArchiveList(patChildArchive);
        return getDataTable(list);
    }

    @ApiOperation("导出儿科档案列表")
    //@PreAuthorize("@ss.hasPermi('system:childArchive:export')")
    @Log(title = "儿科档案", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatChildArchive patChildArchive) {
        List<PatChildArchive> list = patChildArchiveService.selectPatChildArchiveList(patChildArchive);
        ExcelUtil<PatChildArchive> util = new ExcelUtil<PatChildArchive>(PatChildArchive.class);
        util.exportExcel(response, list, "儿科档案数据");
    }

    @ApiOperation("获取儿科档案详细信息")
    //@PreAuthorize("@ss.hasPermi('system:childArchive:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(patChildArchiveService.selectPatChildArchiveById(id));
    }

    @ApiOperation("新增儿科档案")
    //@PreAuthorize("@ss.hasPermi('system:childArchive:add')")
    @Log(title = "儿科档案", businessType = BusinessType.INSERT)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PatChildArchive patChildArchive) {
        SysUser user = getLoginUser().getUser();
        patChildArchive.setOrgid(user.getOrgid());
        return toAjax(patChildArchiveService.insertPatChildArchive(patChildArchive));
    }

    @ApiOperation("修改儿科档案")
    //@PreAuthorize("@ss.hasPermi('system:childArchive:edit')")
    @Log(title = "儿科档案", businessType = BusinessType.UPDATE)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody PatChildArchive patChildArchive) {
        return toAjax(patChildArchiveService.updatePatChildArchive(patChildArchive));
    }

    @ApiOperation("删除儿科档案")
    //@PreAuthorize("@ss.hasPermi('system:childArchive:remove')")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(patChildArchiveService.deletePatChildArchiveByIds(ids));
    }
}

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

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

import com.ruoyi.common.annotation.AddOrgId;
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.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatChildArchiveDetail;
import com.smartor.service.IPatChildArchiveDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * å„¿ç§‘档案详情Controller
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Api(description = "儿科档案详情")
@RestController
@RequestMapping("/smartor/childArchiveDetail")
public class PatChildArchiveDetailController extends BaseController {
    @Autowired
    private IPatChildArchiveDetailService patChildArchiveDetailService;

    @ApiOperation("查询儿科档案详情列表")
    //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:list')")
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/selectPatChildArchiveDetailList")
    public TableDataInfo selectPatChildArchiveDetailList(@RequestBody PatChildArchiveDetail patChildArchiveDetail) {
        PageUtils.startPageByPost(patChildArchiveDetail.getPageNum(), patChildArchiveDetail.getPageSize());
        List<PatChildArchiveDetail> list = patChildArchiveDetailService.selectPatChildArchiveDetailList(patChildArchiveDetail);
        return getDataTable(list);
    }

    @ApiOperation("导出儿科档案详情列表")
    //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:export')")
    @Log(title = "儿科档案详情", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatChildArchiveDetail patChildArchiveDetail) {
        List<PatChildArchiveDetail> list = patChildArchiveDetailService.selectPatChildArchiveDetailList(patChildArchiveDetail);
        ExcelUtil<PatChildArchiveDetail> util = new ExcelUtil<PatChildArchiveDetail>(PatChildArchiveDetail.class);
        util.exportExcel(response, list, "儿科档案详情数据");
    }

    @ApiOperation("获取儿科档案详情详细信息")
    //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(patChildArchiveDetailService.selectPatChildArchiveDetailById(id));
    }

    @ApiOperation("新增儿科档案详情")
    //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:add')")
    @Log(title = "儿科档案详情", businessType = BusinessType.INSERT)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PatChildArchiveDetail patChildArchiveDetail) {
        SysUser user = getLoginUser().getUser();
        patChildArchiveDetail.setOrgid(user.getOrgid());
        return toAjax(patChildArchiveDetailService.insertPatChildArchiveDetail(patChildArchiveDetail));
    }

    @ApiOperation("修改儿科档案详情")
    //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:edit')")
    @Log(title = "儿科档案详情", businessType = BusinessType.UPDATE)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody PatChildArchiveDetail patChildArchiveDetail) {
        return toAjax(patChildArchiveDetailService.updatePatChildArchiveDetail(patChildArchiveDetail));
    }

    @ApiOperation("删除儿科档案详情")
    //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:remove')")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(patChildArchiveDetailService.deletePatChildArchiveDetailByIds(ids));
    }
}

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

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

import com.ruoyi.common.annotation.AddOrgId;
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.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatMaternityArchive;
import com.smartor.service.IPatMaternityArchiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * å¦‡ç§‘档案Controller
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Api(description = "妇科档案")
@RestController
@RequestMapping("/smartor/maternityArchive")
public class PatMaternityArchiveController extends BaseController {
    @Autowired
    private IPatMaternityArchiveService patMaternityArchiveService;

    @ApiOperation("查询妇科档案列表")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchive:list')")
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/selectPatMaternityArchiveList")
    public TableDataInfo selectPatMaternityArchiveList(@RequestBody PatMaternityArchive patMaternityArchive) {
        PageUtils.startPageByPost(patMaternityArchive.getPageNum(), patMaternityArchive.getPageSize());
        List<PatMaternityArchive> list = patMaternityArchiveService.selectPatMaternityArchiveList(patMaternityArchive);
        return getDataTable(list);
    }

    @ApiOperation("导出妇科档案列表")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchive:export')")
    @Log(title = "妇科档案", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatMaternityArchive patMaternityArchive) {
        List<PatMaternityArchive> list = patMaternityArchiveService.selectPatMaternityArchiveList(patMaternityArchive);
        ExcelUtil<PatMaternityArchive> util = new ExcelUtil<PatMaternityArchive>(PatMaternityArchive.class);
        util.exportExcel(response, list, "妇科档案数据");
    }

    @ApiOperation("获取妇科档案详细信息")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchive:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(patMaternityArchiveService.selectPatMaternityArchiveById(id));
    }

    @ApiOperation("新增妇科档案")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchive:add')")
    @Log(title = "妇科档案", businessType = BusinessType.INSERT)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PatMaternityArchive patMaternityArchive) {
        SysUser user = getLoginUser().getUser();
        patMaternityArchive.setOrgid(user.getOrgid());
        return toAjax(patMaternityArchiveService.insertPatMaternityArchive(patMaternityArchive));
    }

    @ApiOperation("修改妇科档案")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchive:edit')")
    @Log(title = "妇科档案", businessType = BusinessType.UPDATE)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody PatMaternityArchive patMaternityArchive) {
        return toAjax(patMaternityArchiveService.updatePatMaternityArchive(patMaternityArchive));
    }

    @ApiOperation("删除妇科档案")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchive:remove')")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(patMaternityArchiveService.deletePatMaternityArchiveByIds(ids));
    }
}

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

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

import com.ruoyi.common.annotation.AddOrgId;
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.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatMaternityArchiveDetail;
import com.smartor.service.IPatMaternityArchiveDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * å¦‡ç§‘档案详情Controller
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Api(description = "妇科档案详情")
@RestController
@RequestMapping("/smartor/maternityArchiveDetail")
public class PatMaternityArchiveDetailController extends BaseController {
    @Autowired
    private IPatMaternityArchiveDetailService patMaternityArchiveDetailService;

    @ApiOperation("查询妇科档案详情列表")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:list')")
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/selectPatMaternityArchiveDetailList")
    public TableDataInfo selectPatMaternityArchiveDetailList(@RequestBody PatMaternityArchiveDetail patMaternityArchiveDetail) {
        PageUtils.startPageByPost(patMaternityArchiveDetail.getPageNum(), patMaternityArchiveDetail.getPageSize());
        List<PatMaternityArchiveDetail> list = patMaternityArchiveDetailService.selectPatMaternityArchiveDetailList(patMaternityArchiveDetail);
        return getDataTable(list);
    }

    @ApiOperation("导出妇科档案详情列表")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:export')")
    @Log(title = "妇科档案详情", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatMaternityArchiveDetail patMaternityArchiveDetail) {
        List<PatMaternityArchiveDetail> list = patMaternityArchiveDetailService.selectPatMaternityArchiveDetailList(patMaternityArchiveDetail);
        ExcelUtil<PatMaternityArchiveDetail> util = new ExcelUtil<PatMaternityArchiveDetail>(PatMaternityArchiveDetail.class);
        util.exportExcel(response, list, "妇科档案详情数据");
    }

    @ApiOperation("获取妇科档案详情详细信息")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(patMaternityArchiveDetailService.selectPatMaternityArchiveDetailById(id));
    }

    @ApiOperation("新增妇科档案详情")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:add')")
    @Log(title = "妇科档案详情", businessType = BusinessType.INSERT)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/add")
    public AjaxResult add(@RequestBody PatMaternityArchiveDetail patMaternityArchiveDetail) {
        SysUser user = getLoginUser().getUser();
        patMaternityArchiveDetail.setOrgid(user.getOrgid());
        return toAjax(patMaternityArchiveDetailService.insertPatMaternityArchiveDetail(patMaternityArchiveDetail));
    }

    @ApiOperation("修改妇科档案详情")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:edit')")
    @Log(title = "妇科档案详情", businessType = BusinessType.UPDATE)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody PatMaternityArchiveDetail patMaternityArchiveDetail) {
        return toAjax(patMaternityArchiveDetailService.updatePatMaternityArchiveDetail(patMaternityArchiveDetail));
    }

    @ApiOperation("删除妇科档案详情")
    //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:remove')")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(patMaternityArchiveDetailService.deletePatMaternityArchiveDetailByIds(ids));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -4,6 +4,7 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.RuoYiConfig;
@@ -28,6 +29,7 @@
 * @author ruoyi
 */
@Configuration
@ConditionalOnProperty(name = "swagger.enabled", havingValue = "true")
public class SwaggerConfig
{
    /** ç³»ç»ŸåŸºç¡€é…ç½® */
@@ -35,11 +37,11 @@
    private RuoYiConfig ruoyiConfig;

    /** æ˜¯å¦å¼€å¯swagger */
    @Value("${swagger.enabled}")
    @Value("${swagger.enabled:false}")
    private boolean enabled;

    /** è®¾ç½®è¯·æ±‚的统一前缀 */
    @Value("${swagger.pathMapping}")
    @Value("${swagger.pathMapping:/}")
    private String pathMapping;

    /**

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -2056,6 +2056,7 @@
                PatMedInhosp patMedInhospVo = new PatMedInhosp();
                patMedInhospVo.setOrgid(serviceSubtask.getOrgid());
                patMedInhospVo.setInhospid(serviceSubtask.getInhospid());
                patMedInhospVo.setCry(1);
                List<PatMedInhosp> patMedInhospList = iPatMedInhospService.selectPatMedInhospList(patMedInhospVo);
                PatMedInhosp patMedInhosp = new PatMedInhosp();
                if (!patMedInhospList.isEmpty()) {

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,179 @@
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 com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * å„¿ç§‘档案对象 pat_child_archive
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Data
@ApiModel(value = "儿科档案对象")
public class PatChildArchive extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** å„¿ç§‘档案主键ID */
    @ApiModelProperty(value = "儿科档案主键ID")
    private Long id;

    /** å„¿ç§‘档案类型: 1 è¥å…»æ€§ç–¾ç—…2 å­¦ä¹ å›°éš¾3 é«˜å±å„¿ä¸“案 */
    @Excel(name = "档案类型")
    @ApiModelProperty(value = "儿科档案类型: 1 è¥å…»æ€§ç–¾ç—…2 å­¦ä¹ å›°éš¾3 é«˜å±å„¿ä¸“案")
    private String archiveType;

    /** é—¨è¯Šç¼–号 */
    @Excel(name = "门诊编号")
    @ApiModelProperty(value = "门诊编号")
    private String outhospno;

    /** ä½é™¢ç¼–号 */
    @Excel(name = "住院编号")
    @ApiModelProperty(value = "住院编号")
    private String inhospno;

    /** æµæ°´å· */
    @Excel(name = "流水号")
    @ApiModelProperty(value = "流水号")
    private String serialnum;

    /** æ‚£è€…ID */
    @Excel(name = "患者ID")
    @ApiModelProperty(value = "患者ID")
    private Long patid;

    /** æ‚£è€…姓名 */
    @Excel(name = "患者姓名")
    @ApiModelProperty(value = "患者姓名")
    private String patname;

    /** å®¶é•¿å§“名 */
    @Excel(name = "家长姓名")
    @ApiModelProperty(value = "家长姓名")
    private String parentname;

    /** å‡ºç”Ÿæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "出生日期")
    private Date birthdate;

    /** è¯ä»¶å·ç  */
    @Excel(name = "证件号码")
    @ApiModelProperty(value = "证件号码")
    private String idcardno;

    /** è”系电话 */
    @Excel(name = "联系电话")
    @ApiModelProperty(value = "联系电话")
    private String phone;

    /** è¯Šæ–­æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "诊断时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "诊断时间")
    private Date diagTime;

    /** å»ºæ¡£æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "建档时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "建档时间")
    private Date archiveTime;

    /** æ‹Ÿéšè®¿æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "拟随访时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "拟随访时间")
    private Date plannedFollowTime;

    /** éšè®¿å‘¨æœŸ(次数) */
    @Excel(name = "随访周期(次数)")
    @ApiModelProperty(value = "随访周期(次数)")
    private String followupCycleTimes;

    /** æ€§åˆ« 1:男 2:女 */
    @Excel(name = "性别")
    @ApiModelProperty(value = "性别 1:男 2:女")
    private Long sex;

    /** ä¸»æ²»åŒ»ç”Ÿ */
    @Excel(name = "主治医生")
    @ApiModelProperty(value = "主治医生")
    private String doctorCode;

    /** ä¸»æ²»åŒ»ç”Ÿå§“名 */
    @Excel(name = "主治医生姓名")
    @ApiModelProperty(value = "主治医生姓名")
    private String doctorName;

    /** ç»ç®¡åŒ»ç”Ÿ */
    @Excel(name = "经管医生")
    @ApiModelProperty(value = "经管医生")
    private String managementDoctorCode;

    /** ç»ç®¡åŒ»ç”Ÿå§“名 */
    @Excel(name = "经管医生姓名")
    @ApiModelProperty(value = "经管医生姓名")
    private String managementDoctorName;

    /** ç§‘室编号 */
    @Excel(name = "科室编号")
    @ApiModelProperty(value = "科室编号")
    private String deptcode;

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

    /** ç—…区编号 */
    @Excel(name = "病区编号")
    @ApiModelProperty(value = "病区编号")
    private String wardcode;

    /** ç—…区名称 */
    @Excel(name = "病区名称")
    @ApiModelProperty(value = "病区名称")
    private String wardname;

    /** è¯Šæ–­ID */
    @Excel(name = "诊断ID")
    @ApiModelProperty(value = "诊断ID")
    private String icd10code;

    /** è¯Šæ–­åç§° */
    @Excel(name = "诊断名称")
    @ApiModelProperty(value = "诊断名称")
    private String diagname;

    /** ç»“案状态 */
    @Excel(name = "结案状态")
    @ApiModelProperty(value = "结案状态")
    private String closeStatus;

    /** ç™»è®°äººå‘˜ */
    @Excel(name = "登记人员")
    @ApiModelProperty(value = "登记人员")
    private String registerUser;

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

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

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

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

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

import java.math.BigDecimal;
import java.util.Date;

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

/**
 * å„¿ç§‘档案详情对象 pat_child_archive_detail
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Data
@ApiModel(value = "儿科档案详情对象")
public class PatChildArchiveDetail extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** å„¿ç§‘档案详情主键ID */
    @ApiModelProperty(value = "儿科档案详情主键ID")
    private Long id;

    /** å„¿ç§‘档案主键ID å¯¹åº” pat_child_archive.id */
    @Excel(name = "档案ID")
    @ApiModelProperty(value = "儿科档案主键ID å¯¹åº” pat_child_archive.id")
    private Long archiveid;

    /** æ¡£æ¡ˆç±»åž‹: 1 è¥å…»æ€§ç–¾ç—…2 å­¦ä¹ å›°éš¾3 é«˜å±å„¿ä¸“案 */
    @Excel(name = "档案类型")
    @ApiModelProperty(value = "档案类型: 1 è¥å…»æ€§ç–¾ç—…2 å­¦ä¹ å›°éš¾3 é«˜å±å„¿ä¸“案")
    private String archiveType;

    /** æ¥æºç±»åž‹: 1 é—¨è¯Šè®°å½• */
    @Excel(name = "来源类型")
    @ApiModelProperty(value = "来源类型: 1 é—¨è¯Šè®°å½•")
    private String sourceType;

    /** é—¨è¯Šç¼–号 */
    @Excel(name = "门诊编号")
    @ApiModelProperty(value = "门诊编号")
    private String outhospno;

    /** ä½é™¢ç¼–号 */
    @Excel(name = "住院编号")
    @ApiModelProperty(value = "住院编号")
    private String inhospno;

    /** æµæ°´å· */
    @Excel(name = "流水号")
    @ApiModelProperty(value = "流水号")
    private String serialnum;

    /** æ‚£è€…ID */
    @Excel(name = "患者ID")
    @ApiModelProperty(value = "患者ID")
    private Long patid;

    /** æ‚£è€…姓名 */
    @Excel(name = "患者姓名")
    @ApiModelProperty(value = "患者姓名")
    private String patname;

    /** å®¶é•¿å§“名 */
    @Excel(name = "家长姓名")
    @ApiModelProperty(value = "家长姓名")
    private String parentname;

    /** å®¶é•¿ä¸Žå„¿ç«¥å…³ç³» */
    @Excel(name = "家长与儿童关系")
    @ApiModelProperty(value = "家长与儿童关系")
    private String parentRelation;

    /** å®¶é•¿è”系电话 */
    @Excel(name = "家长联系电话")
    @ApiModelProperty(value = "家长联系电话")
    private String parentPhone;

    /** å®¶é•¿è¯ä»¶å·ç  */
    @Excel(name = "家长证件号码")
    @ApiModelProperty(value = "家长证件号码")
    private String parentIdcardno;

    /** å®¶é•¿è”系地址 */
    @Excel(name = "家长联系地址")
    @ApiModelProperty(value = "家长联系地址")
    private String parentAddress;

    /** å‡ºç”Ÿæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "出生日期")
    private Date birthdate;

    /** è¯ä»¶å·ç  */
    @Excel(name = "证件号码")
    @ApiModelProperty(value = "证件号码")
    private String idcardno;

    /** è”系电话 */
    @Excel(name = "联系电话")
    @ApiModelProperty(value = "联系电话")
    private String phone;

    /** è¯Šæ–­æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "诊断时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "诊断时间")
    private Date diagTime;

    /** å»ºæ¡£æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "建档时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "建档时间")
    private Date archiveTime;

    /** æ€§åˆ« 1:男 2:女 */
    @Excel(name = "性别")
    @ApiModelProperty(value = "性别 1:男 2:女")
    private Long sex;

    /** ä¸»æ²»åŒ»ç”Ÿ */
    @Excel(name = "主治医生")
    @ApiModelProperty(value = "主治医生")
    private String doctorCode;

    /** ä¸»æ²»åŒ»ç”Ÿå§“名 */
    @Excel(name = "主治医生姓名")
    @ApiModelProperty(value = "主治医生姓名")
    private String doctorName;

    /** ç»ç®¡åŒ»ç”Ÿ */
    @Excel(name = "经管医生")
    @ApiModelProperty(value = "经管医生")
    private String managementDoctorCode;

    /** ç»ç®¡åŒ»ç”Ÿå§“名 */
    @Excel(name = "经管医生姓名")
    @ApiModelProperty(value = "经管医生姓名")
    private String managementDoctorName;

    /** ç§‘室编号 */
    @Excel(name = "科室编号")
    @ApiModelProperty(value = "科室编号")
    private String deptcode;

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

    /** ç—…区编号 */
    @Excel(name = "病区编号")
    @ApiModelProperty(value = "病区编号")
    private String wardcode;

    /** ç—…区名称 */
    @Excel(name = "病区名称")
    @ApiModelProperty(value = "病区名称")
    private String wardname;

    /** è¯Šæ–­ID */
    @Excel(name = "诊断ID")
    @ApiModelProperty(value = "诊断ID")
    private String icd10code;

    /** è¯Šæ–­åç§° */
    @Excel(name = "诊断名称")
    @ApiModelProperty(value = "诊断名称")
    private String diagname;

    /** è¥å…»æ€§ç–¾ç—…ID */
    @Excel(name = "营养性疾病ID")
    @ApiModelProperty(value = "营养性疾病ID")
    private String nutritionIcd10Code;

    /** è¥å…»æ€§ç–¾ç—…名称 */
    @Excel(name = "营养性疾病名称")
    @ApiModelProperty(value = "营养性疾病名称")
    private String nutritionDiagName;

    /** è¥å…»æ€§ç–¾ç—…-体格测量 */
    @ApiModelProperty(value = "营养性疾病-体格测量")
    private String ndPhysicalMeasurements;

    /** è¥å…»æ€§ç–¾ç—…-膳食评估 */
    @ApiModelProperty(value = "营养性疾病-膳食评估")
    private String ndDietaryAssessment;

    /** è¥å…»æ€§ç–¾ç—…-干预方案 */
    @ApiModelProperty(value = "营养性疾病-干预方案")
    private String ndInterventionProgram;

    /** å­¦ä¹ å›°éš¾-预约情况 */
    @ApiModelProperty(value = "学习困难-预约情况")
    private String appointmentSituation;

    /** å­¦ä¹ å›°éš¾-学习能力评估 */
    @ApiModelProperty(value = "学习困难-学习能力评估")
    private String ldLearningAbilityAssessment;

    /** å­¦ä¹ å›°éš¾-行为评估 */
    @ApiModelProperty(value = "学习困难-行为评估")
    private String ldBehavioralAssessment;

    /** å­¦ä¹ å›°éš¾-干预训练记录 */
    @ApiModelProperty(value = "学习困难-干预训练记录")
    private String ldInterventionTrainingRecord;

    /** é«˜å±å„¿ä¸“案-高危儿分类 */
    @Excel(name = "高危儿分类")
    @ApiModelProperty(value = "高危儿专案-高危儿分类")
    private String highRiskChildType;

    /** é«˜å±å„¿ä¸“案-高危儿名称 */
    @Excel(name = "高危儿名称")
    @ApiModelProperty(value = "高危儿专案-高危儿名称")
    private String highRiskChildName;

    /** é«˜å±å„¿ä¸“案-拟随访时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "拟随访时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "高危儿专案-拟随访时间")
    private Date plannedFollowTime;

    /** é«˜å±å„¿ä¸“案-生长发育检测 */
    @ApiModelProperty(value = "高危儿专案-生长发育检测")
    private String hrcGrowthDevelopmentMonitoring;

    /** é«˜å±å„¿ä¸“案-神经系统评估 */
    @ApiModelProperty(value = "高危儿专案-神经系统评估")
    private String hrcNeurologicalEvaluation;

    /** é«˜å±å„¿ä¸“案-干预记录 */
    @ApiModelProperty(value = "高危儿专案-干预记录")
    private String hrcInterventionRecords;

    /** ç»“案状态 */
    @Excel(name = "结案状态")
    @ApiModelProperty(value = "结案状态")
    private String closeStatus;

    /** å‡ºç”Ÿå­•å‘¨ */
    @Excel(name = "出生孕周")
    @ApiModelProperty(value = "出生孕周")
    private BigDecimal gestationalWeek;

    /** å‡ºç”Ÿä½“重(kg) */
    @Excel(name = "出生体重(kg)")
    @ApiModelProperty(value = "出生体重(kg)")
    private BigDecimal birthWeight;

    /** ç™»è®°äººå‘˜ */
    @Excel(name = "登记人员")
    @ApiModelProperty(value = "登记人员")
    private String registerUser;

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

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

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

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,184 @@
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 com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * å¦‡ç§‘档案对象 pat_maternity_archive
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Data
@ApiModel(value = "妇科档案对象")
public class PatMaternityArchive extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** å¦‡ç§‘档案主键ID */
    @ApiModelProperty(value = "妇科档案主键ID")
    private Long id;

    /** å¦‡å¹¼æ¡£æ¡ˆç±»åž‹: 1 æ—©å­•å…³çˆ±2 å›´ç»ç»æœŸMHI */
    @Excel(name = "档案类型")
    @ApiModelProperty(value = "妇幼档案类型: 1 æ—©å­•å…³çˆ±2 å›´ç»ç»æœŸMHI")
    private String archiveType;

    /** é—¨è¯Šç¼–号 */
    @Excel(name = "门诊编号")
    @ApiModelProperty(value = "门诊编号")
    private String outhospno;

    /** ä½é™¢ç¼–号 */
    @Excel(name = "住院编号")
    @ApiModelProperty(value = "住院编号")
    private String inhospno;

    /** æµæ°´å· */
    @Excel(name = "流水号")
    @ApiModelProperty(value = "流水号")
    private String serialnum;

    /** æ‚£è€…ID */
    @Excel(name = "患者ID")
    @ApiModelProperty(value = "患者ID")
    private Long patid;

    /** æ‚£è€…姓名 */
    @Excel(name = "患者姓名")
    @ApiModelProperty(value = "患者姓名")
    private String patname;

    /** å®¶é•¿å§“名 */
    @Excel(name = "家长姓名")
    @ApiModelProperty(value = "家长姓名")
    private String parentname;

    /** å‡ºç”Ÿæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "出生日期")
    private Date birthdate;

    /** è¯ä»¶å·ç  */
    @Excel(name = "证件号码")
    @ApiModelProperty(value = "证件号码")
    private String idcardno;

    /** è”系电话 */
    @Excel(name = "联系电话")
    @ApiModelProperty(value = "联系电话")
    private String phone;

    /** è¯Šæ–­æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "诊断时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "诊断时间")
    private Date diagTime;

    /** å»ºæ¡£æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "建档时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "建档时间")
    private Date archiveTime;

    /** æ‹Ÿéšè®¿æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "拟随访时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "拟随访时间")
    private Date plannedFollowTime;

    /** éšè®¿å‘¨æœŸ(次数) */
    @Excel(name = "随访周期(次数)")
    @ApiModelProperty(value = "随访周期(次数)")
    private String followupCycleTimes;

    /** æ€§åˆ« 1:男 2:女 */
    @Excel(name = "性别")
    @ApiModelProperty(value = "性别 1:男 2:女")
    private Long sex;

    /** ä¸»æ²»åŒ»ç”Ÿ */
    @Excel(name = "主治医生")
    @ApiModelProperty(value = "主治医生")
    private String doctorCode;

    /** ä¸»æ²»åŒ»ç”Ÿå§“名 */
    @Excel(name = "主治医生姓名")
    @ApiModelProperty(value = "主治医生姓名")
    private String doctorName;

    /** ç»ç®¡åŒ»ç”Ÿ */
    @Excel(name = "经管医生")
    @ApiModelProperty(value = "经管医生")
    private String managementDoctorCode;

    /** ç»ç®¡åŒ»ç”Ÿå§“名 */
    @Excel(name = "经管医生姓名")
    @ApiModelProperty(value = "经管医生姓名")
    private String managementDoctorName;

    /** ç§‘室编号 */
    @Excel(name = "科室编号")
    @ApiModelProperty(value = "科室编号")
    private String deptcode;

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

    /** ç—…区编号 */
    @Excel(name = "病区编号")
    @ApiModelProperty(value = "病区编号")
    private String wardcode;

    /** ç—…区名称 */
    @Excel(name = "病区名称")
    @ApiModelProperty(value = "病区名称")
    private String wardname;

    /** è¯Šæ–­ID */
    @Excel(name = "诊断ID")
    @ApiModelProperty(value = "诊断ID")
    private String icd10code;

    /** è¯Šæ–­åç§° */
    @Excel(name = "诊断名称")
    @ApiModelProperty(value = "诊断名称")
    private String diagname;

    /** å¦Šå¨ æƒ…况 */
    @Excel(name = "妊娠情况")
    @ApiModelProperty(value = "妊娠情况")
    private String pregnancySituation;

    /** ç»“案状态 */
    @Excel(name = "结案状态")
    @ApiModelProperty(value = "结案状态")
    private String closeStatus;

    /** ç™»è®°äººå‘˜ */
    @Excel(name = "登记人员")
    @ApiModelProperty(value = "登记人员")
    private String registerUser;

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

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

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

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,234 @@
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 com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * å¦‡ç§‘档案详情对象 pat_maternity_archive_detail
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Data
@ApiModel(value = "妇科档案详情对象")
public class PatMaternityArchiveDetail extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** å¦‡ç§‘档案详情主键ID */
    @ApiModelProperty(value = "妇科档案详情主键ID")
    private Long id;

    /** å¦‡ç§‘档案主键ID å¯¹åº” pat_maternity_archive.id */
    @Excel(name = "档案ID")
    @ApiModelProperty(value = "妇科档案主键ID å¯¹åº” pat_maternity_archive.id")
    private Long archiveid;

    /** æ¡£æ¡ˆç±»åž‹: 1 æ—©å­•å…³çˆ±2 å›´ç»ç»æœŸMHI */
    @Excel(name = "档案类型")
    @ApiModelProperty(value = "档案类型: 1 æ—©å­•å…³çˆ±2 å›´ç»ç»æœŸMHI")
    private String archiveType;

    /** æ¥æºç±»åž‹: 1 é—¨è¯Šè®°å½• */
    @Excel(name = "来源类型")
    @ApiModelProperty(value = "来源类型: 1 é—¨è¯Šè®°å½•")
    private String sourceType;

    /** é—¨è¯Šç¼–号 */
    @Excel(name = "门诊编号")
    @ApiModelProperty(value = "门诊编号")
    private String outhospno;

    /** ä½é™¢ç¼–号 */
    @Excel(name = "住院编号")
    @ApiModelProperty(value = "住院编号")
    private String inhospno;

    /** æµæ°´å· */
    @Excel(name = "流水号")
    @ApiModelProperty(value = "流水号")
    private String serialnum;

    /** æ‚£è€…ID */
    @Excel(name = "患者ID")
    @ApiModelProperty(value = "患者ID")
    private Long patid;

    /** æ‚£è€…姓名 */
    @Excel(name = "患者姓名")
    @ApiModelProperty(value = "患者姓名")
    private String patname;

    /** å‡ºç”Ÿæ—¥æœŸ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "出生日期")
    private Date birthdate;

    /** è¯ä»¶å·ç  */
    @Excel(name = "证件号码")
    @ApiModelProperty(value = "证件号码")
    private String idcardno;

    /** è”系电话 */
    @Excel(name = "联系电话")
    @ApiModelProperty(value = "联系电话")
    private String phone;

    /** è¯Šæ–­æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "诊断时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "诊断时间")
    private Date diagTime;

    /** å»ºæ¡£æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "建档时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "建档时间")
    private Date archiveTime;

    /** æ‹Ÿéšè®¿æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "拟随访时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "拟随访时间")
    private Date plannedFollowTime;

    /** æ€§åˆ« 1:男 2:女 */
    @Excel(name = "性别")
    @ApiModelProperty(value = "性别 1:男 2:女")
    private Long sex;

    /** ä¸»æ²»åŒ»ç”Ÿ */
    @Excel(name = "主治医生")
    @ApiModelProperty(value = "主治医生")
    private String doctorCode;

    /** ä¸»æ²»åŒ»ç”Ÿå§“名 */
    @Excel(name = "主治医生姓名")
    @ApiModelProperty(value = "主治医生姓名")
    private String doctorName;

    /** ç»ç®¡åŒ»ç”Ÿ */
    @Excel(name = "经管医生")
    @ApiModelProperty(value = "经管医生")
    private String managementDoctorCode;

    /** ç»ç®¡åŒ»ç”Ÿå§“名 */
    @Excel(name = "经管医生姓名")
    @ApiModelProperty(value = "经管医生姓名")
    private String managementDoctorName;

    /** ç§‘室编号 */
    @Excel(name = "科室编号")
    @ApiModelProperty(value = "科室编号")
    private String deptcode;

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

    /** ç—…区编号 */
    @Excel(name = "病区编号")
    @ApiModelProperty(value = "病区编号")
    private String wardcode;

    /** ç—…区名称 */
    @Excel(name = "病区名称")
    @ApiModelProperty(value = "病区名称")
    private String wardname;

    /** è¯Šæ–­ID */
    @Excel(name = "诊断ID")
    @ApiModelProperty(value = "诊断ID")
    private String icd10code;

    /** è¯Šæ–­åç§° */
    @Excel(name = "诊断名称")
    @ApiModelProperty(value = "诊断名称")
    private String diagname;

    /** å¦Šå¨ æƒ…况 */
    @ApiModelProperty(value = "妊娠情况")
    private String pregnancySituation;

    /** å…·ä½“情况 */
    @ApiModelProperty(value = "具体情况")
    private String specificSituation;

    /** å¤„理建议 */
    @ApiModelProperty(value = "处理建议")
    private String handleSuggestion;

    /** ç»“案状态 */
    @Excel(name = "结案状态")
    @ApiModelProperty(value = "结案状态")
    private String closeStatus;

    /** æ˜¯å¦å»ºå†Œ 0-否 1-是 */
    @Excel(name = "是否建册")
    @ApiModelProperty(value = "是否建册 0-否 1-是")
    private String isRecordEstablished;

    /** é¢„产期 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "预产期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "预产期")
    private Date dueDate;

    /** ç™»è®°äººå‘˜ */
    @Excel(name = "登记人员")
    @ApiModelProperty(value = "登记人员")
    private String registerUser;

    /** éšè®¿å‘¨æœŸ */
    @ApiModelProperty(value = "随访周期")
    private String followupPeriod;

    /** æ—©å­•å…³çˆ±-早孕随访表 */
    @ApiModelProperty(value = "早孕关爱-早孕随访表")
    private String epEarlyPregnancyFollowupForm;

    /** å›´ç»ç»æœŸMHI-更年期随访系统问题表 */
    @ApiModelProperty(value = "围绝经期MHI-更年期随访系统问题表")
    private String mhiMenopauseFollowupSystemIssuesForm;

    /** å›´ç»ç»æœŸMHI-MHT首诊病历表 */
    @ApiModelProperty(value = "围绝经期MHI-MHT首诊病历表")
    private String mhiMhtInitialVisitMedicalRecordForm;

    /** å›´ç»ç»æœŸMHI-MHT复诊病历表 */
    @ApiModelProperty(value = "围绝经期MHI-MHT复诊病历表")
    private String mhiMhtFollowUpMedicalRecordForm;

    /** å›´ç»ç»æœŸMHI-改良 Kupperman评分标准表 */
    @ApiModelProperty(value = "围绝经期MHI-改良 Kupperman评分标准表")
    private String mhiModifiedKuppermanScoringScaleForm;

    /** å›´ç»ç»æœŸMHI-更年期评定量表（MRS） */
    @ApiModelProperty(value = "围绝经期MHI-更年期评定量表（MRS）")
    private String mhiMenopauseRatingScaleForm;

    /** å›´ç»ç»æœŸMHI-匹兹堡睡眠质量指数量表（PSQI） */
    @ApiModelProperty(value = "围绝经期MHI-匹兹堡睡眠质量指数量表（PSQI）")
    private String mhiPittsburghSleepQualityIndexForm;

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

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

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

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

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

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

import java.util.List;

/**
 * å„¿ç§‘档案详情Mapper接口
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Mapper
public interface PatChildArchiveDetailMapper
{
    public PatChildArchiveDetail selectPatChildArchiveDetailById(Long id);

    public List<PatChildArchiveDetail> selectPatChildArchiveDetailList(PatChildArchiveDetail patChildArchiveDetail);

    public int insertPatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail);

    public int updatePatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail);

    public int deletePatChildArchiveDetailById(Long id);

    public int deletePatChildArchiveDetailByIds(Long[] ids);
}

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

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

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

import java.util.List;

/**
 * å„¿ç§‘档案Mapper接口
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Mapper
public interface PatChildArchiveMapper
{
    public PatChildArchive selectPatChildArchiveById(Long id);

    public List<PatChildArchive> selectPatChildArchiveList(PatChildArchive patChildArchive);

    public int insertPatChildArchive(PatChildArchive patChildArchive);

    public int updatePatChildArchive(PatChildArchive patChildArchive);

    public int deletePatChildArchiveById(Long id);

    public int deletePatChildArchiveByIds(Long[] ids);
}

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

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

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

import java.util.List;

/**
 * å¦‡ç§‘档案详情Mapper接口
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Mapper
public interface PatMaternityArchiveDetailMapper
{
    public PatMaternityArchiveDetail selectPatMaternityArchiveDetailById(Long id);

    public List<PatMaternityArchiveDetail> selectPatMaternityArchiveDetailList(PatMaternityArchiveDetail patMaternityArchiveDetail);

    public int insertPatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail);

    public int updatePatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail);

    public int deletePatMaternityArchiveDetailById(Long id);

    public int deletePatMaternityArchiveDetailByIds(Long[] ids);
}

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

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

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

import java.util.List;

/**
 * å¦‡ç§‘档案Mapper接口
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Mapper
public interface PatMaternityArchiveMapper
{
    public PatMaternityArchive selectPatMaternityArchiveById(Long id);

    public List<PatMaternityArchive> selectPatMaternityArchiveList(PatMaternityArchive patMaternityArchive);

    public int insertPatMaternityArchive(PatMaternityArchive patMaternityArchive);

    public int updatePatMaternityArchive(PatMaternityArchive patMaternityArchive);

    public int deletePatMaternityArchiveById(Long id);

    public int deletePatMaternityArchiveByIds(Long[] ids);
}

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

@@ -108,4 +108,12 @@
     */
    public List<PatMedOperationItem> selectOperationItemList(PatMedOperationItem patMedOperationItem);

    /**
     * æŸ¥è¯¢æ‚£è€…检查检验记录子列表（同一opid下只取oplevelcode最大的记录）
     *
     * @param patMedOperationItem æ‚£è€…检查检验记录子
     * @return æ‚£è€…检查检验记录子集合
     */
    public List<PatMedOperationItem> selectOperationItemListMaxLevel(PatMedOperationItem patMedOperationItem);

}

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

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

import com.smartor.domain.PatChildArchiveDetail;

import java.util.List;

/**
 * å„¿ç§‘档案详情Service接口
 *
 * @author ruoyi
 * @date 2026-10-09
 */
public interface IPatChildArchiveDetailService
{
    public PatChildArchiveDetail selectPatChildArchiveDetailById(Long id);

    public List<PatChildArchiveDetail> selectPatChildArchiveDetailList(PatChildArchiveDetail patChildArchiveDetail);

    public int insertPatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail);

    public int updatePatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail);

    public int deletePatChildArchiveDetailByIds(Long[] ids);

    public int deletePatChildArchiveDetailById(Long id);
}

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

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

import com.smartor.domain.PatChildArchive;

import java.util.List;

/**
 * å„¿ç§‘档案Service接口
 *
 * @author ruoyi
 * @date 2026-10-09
 */
public interface IPatChildArchiveService
{
    public PatChildArchive selectPatChildArchiveById(Long id);

    public List<PatChildArchive> selectPatChildArchiveList(PatChildArchive patChildArchive);

    public int insertPatChildArchive(PatChildArchive patChildArchive);

    public int updatePatChildArchive(PatChildArchive patChildArchive);

    public int deletePatChildArchiveByIds(Long[] ids);

    public int deletePatChildArchiveById(Long id);
}

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

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

import com.smartor.domain.PatMaternityArchiveDetail;

import java.util.List;

/**
 * å¦‡ç§‘档案详情Service接口
 *
 * @author ruoyi
 * @date 2026-10-09
 */
public interface IPatMaternityArchiveDetailService
{
    public PatMaternityArchiveDetail selectPatMaternityArchiveDetailById(Long id);

    public List<PatMaternityArchiveDetail> selectPatMaternityArchiveDetailList(PatMaternityArchiveDetail patMaternityArchiveDetail);

    public int insertPatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail);

    public int updatePatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail);

    public int deletePatMaternityArchiveDetailByIds(Long[] ids);

    public int deletePatMaternityArchiveDetailById(Long id);
}

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

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

import com.smartor.domain.PatMaternityArchive;

import java.util.List;

/**
 * å¦‡ç§‘档案Service接口
 *
 * @author ruoyi
 * @date 2026-10-09
 */
public interface IPatMaternityArchiveService
{
    public PatMaternityArchive selectPatMaternityArchiveById(Long id);

    public List<PatMaternityArchive> selectPatMaternityArchiveList(PatMaternityArchive patMaternityArchive);

    public int insertPatMaternityArchive(PatMaternityArchive patMaternityArchive);

    public int updatePatMaternityArchive(PatMaternityArchive patMaternityArchive);

    public int deletePatMaternityArchiveByIds(Long[] ids);

    public int deletePatMaternityArchiveById(Long id);
}

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatChildArchiveDetail;
import com.smartor.mapper.PatChildArchiveDetailMapper;
import com.smartor.service.IPatChildArchiveDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * å„¿ç§‘档案详情Service业务层处理
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Service
public class PatChildArchiveDetailServiceImpl implements IPatChildArchiveDetailService
{
    @Autowired
    private PatChildArchiveDetailMapper patChildArchiveDetailMapper;

    @Override
    public PatChildArchiveDetail selectPatChildArchiveDetailById(Long id)
    {
        return patChildArchiveDetailMapper.selectPatChildArchiveDetailById(id);
    }

    @Override
    public List<PatChildArchiveDetail> selectPatChildArchiveDetailList(PatChildArchiveDetail patChildArchiveDetail)
    {
        return patChildArchiveDetailMapper.selectPatChildArchiveDetailList(patChildArchiveDetail);
    }

    @Override
    public int insertPatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail)
    {
        patChildArchiveDetail.setCreateTime(DateUtils.getNowDate());
        return patChildArchiveDetailMapper.insertPatChildArchiveDetail(patChildArchiveDetail);
    }

    @Override
    public int updatePatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail)
    {
        patChildArchiveDetail.setUpdateTime(DateUtils.getNowDate());
        return patChildArchiveDetailMapper.updatePatChildArchiveDetail(patChildArchiveDetail);
    }

    @Override
    public int deletePatChildArchiveDetailByIds(Long[] ids)
    {
        return patChildArchiveDetailMapper.deletePatChildArchiveDetailByIds(ids);
    }

    @Override
    public int deletePatChildArchiveDetailById(Long id)
    {
        return patChildArchiveDetailMapper.deletePatChildArchiveDetailById(id);
    }
}

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatChildArchive;
import com.smartor.mapper.PatChildArchiveMapper;
import com.smartor.service.IPatChildArchiveService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * å„¿ç§‘档案Service业务层处理
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Service
public class PatChildArchiveServiceImpl implements IPatChildArchiveService
{
    @Autowired
    private PatChildArchiveMapper patChildArchiveMapper;

    @Override
    public PatChildArchive selectPatChildArchiveById(Long id)
    {
        return patChildArchiveMapper.selectPatChildArchiveById(id);
    }

    @Override
    public List<PatChildArchive> selectPatChildArchiveList(PatChildArchive patChildArchive)
    {
        return patChildArchiveMapper.selectPatChildArchiveList(patChildArchive);
    }

    @Override
    public int insertPatChildArchive(PatChildArchive patChildArchive)
    {
        patChildArchive.setCreateTime(DateUtils.getNowDate());
        return patChildArchiveMapper.insertPatChildArchive(patChildArchive);
    }

    @Override
    public int updatePatChildArchive(PatChildArchive patChildArchive)
    {
        patChildArchive.setUpdateTime(DateUtils.getNowDate());
        return patChildArchiveMapper.updatePatChildArchive(patChildArchive);
    }

    @Override
    public int deletePatChildArchiveByIds(Long[] ids)
    {
        return patChildArchiveMapper.deletePatChildArchiveByIds(ids);
    }

    @Override
    public int deletePatChildArchiveById(Long id)
    {
        return patChildArchiveMapper.deletePatChildArchiveById(id);
    }
}

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatMaternityArchiveDetail;
import com.smartor.mapper.PatMaternityArchiveDetailMapper;
import com.smartor.service.IPatMaternityArchiveDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * å¦‡ç§‘档案详情Service业务层处理
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Service
public class PatMaternityArchiveDetailServiceImpl implements IPatMaternityArchiveDetailService
{
    @Autowired
    private PatMaternityArchiveDetailMapper patMaternityArchiveDetailMapper;

    @Override
    public PatMaternityArchiveDetail selectPatMaternityArchiveDetailById(Long id)
    {
        return patMaternityArchiveDetailMapper.selectPatMaternityArchiveDetailById(id);
    }

    @Override
    public List<PatMaternityArchiveDetail> selectPatMaternityArchiveDetailList(PatMaternityArchiveDetail patMaternityArchiveDetail)
    {
        return patMaternityArchiveDetailMapper.selectPatMaternityArchiveDetailList(patMaternityArchiveDetail);
    }

    @Override
    public int insertPatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail)
    {
        patMaternityArchiveDetail.setCreateTime(DateUtils.getNowDate());
        return patMaternityArchiveDetailMapper.insertPatMaternityArchiveDetail(patMaternityArchiveDetail);
    }

    @Override
    public int updatePatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail)
    {
        patMaternityArchiveDetail.setUpdateTime(DateUtils.getNowDate());
        return patMaternityArchiveDetailMapper.updatePatMaternityArchiveDetail(patMaternityArchiveDetail);
    }

    @Override
    public int deletePatMaternityArchiveDetailByIds(Long[] ids)
    {
        return patMaternityArchiveDetailMapper.deletePatMaternityArchiveDetailByIds(ids);
    }

    @Override
    public int deletePatMaternityArchiveDetailById(Long id)
    {
        return patMaternityArchiveDetailMapper.deletePatMaternityArchiveDetailById(id);
    }
}

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatMaternityArchive;
import com.smartor.mapper.PatMaternityArchiveMapper;
import com.smartor.service.IPatMaternityArchiveService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * å¦‡ç§‘档案Service业务层处理
 *
 * @author ruoyi
 * @date 2026-10-09
 */
@Service
public class PatMaternityArchiveServiceImpl implements IPatMaternityArchiveService
{
    @Autowired
    private PatMaternityArchiveMapper patMaternityArchiveMapper;

    @Override
    public PatMaternityArchive selectPatMaternityArchiveById(Long id)
    {
        return patMaternityArchiveMapper.selectPatMaternityArchiveById(id);
    }

    @Override
    public List<PatMaternityArchive> selectPatMaternityArchiveList(PatMaternityArchive patMaternityArchive)
    {
        return patMaternityArchiveMapper.selectPatMaternityArchiveList(patMaternityArchive);
    }

    @Override
    public int insertPatMaternityArchive(PatMaternityArchive patMaternityArchive)
    {
        patMaternityArchive.setCreateTime(DateUtils.getNowDate());
        return patMaternityArchiveMapper.insertPatMaternityArchive(patMaternityArchive);
    }

    @Override
    public int updatePatMaternityArchive(PatMaternityArchive patMaternityArchive)
    {
        patMaternityArchive.setUpdateTime(DateUtils.getNowDate());
        return patMaternityArchiveMapper.updatePatMaternityArchive(patMaternityArchive);
    }

    @Override
    public int deletePatMaternityArchiveByIds(Long[] ids)
    {
        return patMaternityArchiveMapper.deletePatMaternityArchiveByIds(ids);
    }

    @Override
    public int deletePatMaternityArchiveById(Long id)
    {
        return patMaternityArchiveMapper.deletePatMaternityArchiveById(id);
    }
}

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

@@ -566,7 +566,9 @@
                                pmoi.setDeptCodes(deptCodeList);
                                pmoi.setWardCodes(wardCodeList);
                                pmoi.setOpLevelCodes(opLevelCodeList);
                                List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemList(pmoi);

                                //每次查询只查最大的手术等级记录
                                List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemListMaxLevel(pmoi);
                                for (PatMedOperationItem patMedOperationItem : patMedOperationItems) {
                                    PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperationItem.getPatid());
                                    if (Objects.isNull(patArchive)) {
@@ -1367,7 +1369,8 @@
        pmoi.setOpercheckFlag("0");
        pmoi.setMainFlag("1");

        List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemList(pmoi);
        //每次查询只查最大的手术等级记录
        List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectOperationItemListMaxLevel(pmoi);
        log.info("dealOutHospInfo需要处理的出院手术患者信息：{}", CollectionUtils.isNotEmpty(patMedOperationItems) ? patMedOperationItems.size() : null);

        for (PatMedOperationItem opItem : patMedOperationItems) {

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

@@ -1842,6 +1842,7 @@
        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        Map<String, Object> JianChaSQ = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaSQ") : null;
        Map<String, Object> JianChaBG = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaBG") : null;
        List<HashMap<String, Object>> JianChaBWList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("JianChaBWList") : null;
        List<HashMap<String, Object>> ZhenDuanList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("ZhenDuanList") : null;
        List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(BingRenXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null;
@@ -1936,6 +1937,9 @@
                }
            }
        }
        if (ObjectUtils.isNotEmpty(JianChaBG)) {
            patMedInspection.setAppliyid(ObjectUtils.isNotEmpty(JianChaBG.get("ShenQingDID")) ? JianChaBG.get("ShenQingDID").toString() : null);
        }
        if (CollectionUtils.isNotEmpty(JianChaBWList)) {
            List<ExternalInspectionJC> externalInspectionJC = JianChaBWList.stream().map(map -> {
                ExternalInspectionJC info = new ExternalInspectionJC();

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

@@ -2941,7 +2941,7 @@
     * @return
     */
    @Override
    @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
//    @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
    public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
        log.info("getSfStatistics的入参为：{}", serviceSubtaskCountReq);
        String drcode = "drcode";
@@ -3063,6 +3063,8 @@
        ssRate.setOrgid(serviceSubtaskCountReq.getOrgid());
        ssRate.setStarttime(serviceSubtaskCountReq.getStartTime());
        ssRate.setEndtime(serviceSubtaskCountReq.getEndTime());
        ssRate.setStartOutHospTime(serviceSubtaskCountReq.getHospitalStartTime());
        ssRate.setEndOutHospTime(serviceSubtaskCountReq.getHospitalEndTime());
        ssRate.setVisitCount(serviceSubtaskCountReq.getVisitCount());
        ssRate.setServiceTypeList(serviceSubtaskCountReq.getServiceType());
        if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
@@ -3154,6 +3156,8 @@
            if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
                ss.setEndtime(new Date());
            }
            ss.setStartOutHospTime(serviceSubtaskCountReq.getHospitalStartTime());
            ss.setEndOutHospTime(serviceSubtaskCountReq.getHospitalEndTime());
            Double jsRate = serviceSubtaskMapper.selectTimelyRate(ss);
            statistic.setRate(jsRate);
            if (ObjectUtils.isNotEmpty(statistic)) {
@@ -6218,6 +6222,8 @@
        String voiceText = phoneCallReqYQVO.getAsrtext();
        String questionText = StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrtext()) ? ivrTaskTemplateScriptVO.getIvrtext() : ivrTaskTemplateScriptVO.getScriptContent();
        Integer matched = -1;
        log.info("AI匹配:url = {},questionText = {},voiceText = {},options = {},uuid ={}",
                url,questionText,voiceText,options,uuid);
        matched = matchOptionIndex(url, questionText, voiceText, options, uuid);
        //说明匹配正确了
        if (matched != null && matched >= 0) {
@@ -6311,7 +6317,8 @@
                phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask.getJsy());
                //记录状态
                setFailPreachForm(serviceSubtask, "3", "电话拨打已完成", "9");
                return phoneCallBackYQVO;
                back = phoneCallBackYQVO;
                return back;
            }

            flag = 1;
@@ -6319,9 +6326,10 @@
            redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "PlayEventCallbackPlaystop");
//                        //获取下一题
            log.error("获取下一题的信息：{}", ivrTaskTemplateScriptVO);
            if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1") || ivrTaskTemplateScriptVO.getBranchFlag().equals("0") && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
            //branchFlag为null时按分支0处理，避免NPE
            if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag()) || "0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
                Long nextQuestion = null;
                if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1")) {
                if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag())) {
                    nextQuestion = chosenOption.getNextQuestion();
                    //更新分数
                    double score = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
@@ -6354,15 +6362,9 @@
                    redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
                    phoneCallBackYQVO.setType("text");
                    phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask.getJsy());
                    //将结果写进detail表
                    ServiceSubTaskDetailReq ssdReq = new ServiceSubTaskDetailReq();
                    List<ServiceSubtaskDetail> serviceSubtaskDetailList2 = new ArrayList<>();
                    serviceSubtaskDetailList.add(getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate));
                    serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList2);
                    ssdReq.setGuid(phoneCallReqYQVO.getGuid());
                    ssdReq.setOrgid(phoneCallReqYQVO.getOrgid());
                    saveQuestionAnswerPhone(ssdReq);
                    return phoneCallBackYQVO;
                    //明细在本题匹配成功时已落库（见上方 saveQuestionAnswerPhone），这里不再重复保存
                    back = phoneCallBackYQVO;
                    return back;
                }

                for (IvrTaskTemplateScript script : ivrTaskTemplateScripts) {
@@ -6379,6 +6381,15 @@
                        redisCache.deleteObject(phoneCallReqYQVO.getTaskid().trim() + "&&" + "mate" + "&&" + phoneCallReqYQVO.getUuid());
                    }
                }
                //下一题脚本没找到时，兜底重问当前题，避免调用方误判为未处理而退回正则识别
                if (StringUtils.isEmpty(phoneCallBackYQVO.getValue())) {
                    log.error("下一题脚本未找到，重问当前题，nextQuestion：{}", nextQuestion);
                    phoneCallBackYQVO.setType("text");
                    phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
                    phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + getObject(serviceSubtask, questionText));
                }
                back = phoneCallBackYQVO;
                return back;
            } else if (ivrTaskTemplateScriptVO.getNextScriptno() == null || ivrTaskTemplateScriptVO.getNextScriptno() == 0) {
                ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
                phoneCallBackYQVO.setType("text");
@@ -6407,33 +6418,101 @@
                //在redis中保存一下结束语，在调用挂电话的方法时删除
                ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
                redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
//                                return phoneCallBackYQVO;
                //结束语已拼进返回值，挂机由平台按返回值执行
                back = phoneCallBackYQVO;
                return back;

            }
        } else {
            log.info("没有匹配上----------------------------");
            //flag=0,说明没 åŒ¹é…ä¸Šï¼Œä¹Ÿè¦æŠŠæ‚£è€…说的话记录下来
            if (matched == ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().size() - 1 && flag == 0) {
                ServiceSubTaskDetailReq serviceSubTaskDetailReq = new ServiceSubTaskDetailReq();
                List<ServiceSubtaskDetail> serviceSubtaskDetailList = new ArrayList<>();
                ServiceSubtaskDetail serviceSubtaskDetail = getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate);
                //修改一下语音路径（改成前端可以访问的，存到数据库中）
                if (StringUtils.isNotEmpty(serviceSubtaskDetail.getQuestionvoice())) {
                    String questionvoice = serviceSubtaskDetail.getQuestionvoice();
                    String[] split = questionvoice.split("\\\\");
                    if (split.length > 0) {
                        String lastPart = split[split.length - 1];
                        serviceSubtaskDetail.setQuestionvoice(voicePathPrefix + lastPart);
            //AI没有匹配上：由AI分支自己按"没问清就重问"的次数处理，不再退回正则识别
            log.info("ai没有匹配上----------------------------");
            //没匹配上也要把患者说的话记录下来（matchedtext置空，与正则路径口径一致）
            ServiceSubTaskDetailReq serviceSubTaskDetailReq = new ServiceSubTaskDetailReq();
            List<ServiceSubtaskDetail> serviceSubtaskDetailList = new ArrayList<>();
            ServiceSubtaskDetail serviceSubtaskDetail = getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate);
            //修改一下语音路径（改成前端可以访问的，存到数据库中）
            if (StringUtils.isNotEmpty(serviceSubtaskDetail.getQuestionvoice())) {
                String questionvoice = serviceSubtaskDetail.getQuestionvoice();
                String[] split = questionvoice.split("\\\\");
                if (split.length > 0) {
                    String lastPart = split[split.length - 1];
                    serviceSubtaskDetail.setQuestionvoice(voicePathPrefix + lastPart);
                }
            }
            serviceSubtaskDetailList.add(serviceSubtaskDetail);
            //如果没有 åŒ¹é…ä¸Šï¼Œè¿™ä¸ªå¿…须为null
            serviceSubtaskDetailList.get(0).setMatchedtext("");
            serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList);
            serviceSubTaskDetailReq.setGuid(phoneCallReqYQVO.getGuid());
            serviceSubTaskDetailReq.setOrgid(phoneCallReqYQVO.getOrgid());
            saveQuestionAnswerPhone(serviceSubTaskDetailReq);

            String mateKey = phoneCallReqYQVO.getTaskid().trim() + "&&" + "mate" + "&&" + phoneCallReqYQVO.getUuid();
            Integer count = null;
            Object countObj = redisCache.getCacheObject(mateKey);
            if (ObjectUtils.isNotEmpty(countObj)) count = (Integer) countObj;
            if (count != null && count >= ivrTaskTemplate.getMateNum()) {
                //没匹配次数已经用满，不能再重问了
                boolean noNextQuestion = ("0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) || "1".equals(ivrTaskTemplateScriptVO.getBranchFlag()))
                        && (ivrTaskTemplateScriptVO.getNextScriptno() == null || ivrTaskTemplateScriptVO.getNextScriptno() == 0);
                if (noNextQuestion) {
                    //已经是最后一题，直接挂机
                    ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
                    phoneCallBackYQVO.setType("text");
                    phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
                    phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask1.getJsy());
                    //更新一下分数
                    Double score = null;
                    Object scoreObj = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
                    if (ObjectUtils.isNotEmpty(scoreObj)) score = (Double) scoreObj;
                    serviceSubtask.setScore(String.valueOf(score));
                    serviceSubtask.setFinishtime(new Date());
                    serviceSubtask.setSendstate(6L);
                    serviceSubtask.setRemark("电话拨打已完成");
                    serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                    //记录状态
                    setFailPreachForm(serviceSubtask, "3", "电话拨打已完成", "9");
                    //在redis中保存一下结束语，在调用挂电话的方法时删除
                    ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
                    redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
                    //去redis中，把该子任务ID删除
                    Long id = serviceSubtask.getId();
                    Map<String, String> map = delRedisValue(null, id.toString());
                    if (ObjectUtils.isNotEmpty(map)) {
                        redisCache.setCacheObject(map.get("cacheName"), map.get("val"));
                        redisCache.deleteObject(serviceSubtask.getId() + "-" + serviceSubtask.getPhone());
                        redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "SCORE");
                    }
                } else {
                    //还有下一题，按nextScriptno继续提问
                    for (IvrTaskTemplateScript script : ivrTaskTemplateScripts) {
                        if (script.getSort() == ivrTaskTemplateScriptVO.getNextScriptno().intValue()) {
                            phoneCallBackYQVO.setType("text");
                            phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
                            String scriptContent = StringUtils.isNotEmpty(script.getIvrtext()) ? script.getIvrtext() : script.getScriptContent();
                            phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + getObject(serviceSubtask, scriptContent));
                            //将该患者的Redis中的题目ID，进行修改
                            redisCache.setCacheObject(phoneCallReqYQVO.getTaskid().trim() + "-" + phoneCallReqYQVO.getPhone().trim(), script.getId().toString(), 120, TimeUnit.MINUTES);
                            //更新一下分数
                            Double score = null;
                            Object scoreObj = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
                            if (ObjectUtils.isNotEmpty(scoreObj)) score = (Double) scoreObj;
                            score = BigDecimal.valueOf(score).add(new BigDecimal(script.getScore())).doubleValue();
                            redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "SCORE", score, 120, TimeUnit.MINUTES);
                            //换题成功，没匹配次数清零
                            redisCache.deleteObject(mateKey);
                        }
                    }
                }
                serviceSubtaskDetailList.add(serviceSubtaskDetail);
                //如果没有 åŒ¹é…ä¸Šï¼Œè¿™ä¸ªå¿…须为null
                serviceSubtaskDetailList.get(0).setMatchedtext("");
                serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList);
                serviceSubTaskDetailReq.setGuid(phoneCallReqYQVO.getGuid());
                serviceSubTaskDetailReq.setOrgid(phoneCallReqYQVO.getOrgid());
                saveQuestionAnswerPhone(serviceSubTaskDetailReq);
            } else {
                //还没问满次数，用noMatchText引导患者重答
                redisCache.setCacheObject(mateKey, count == null ? 1 : count + 1, 120, TimeUnit.MINUTES);
                phoneCallBackYQVO.setType("text");
                phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
                phoneCallBackYQVO.setValue(ivrTaskTemplateScriptVO.getNoMatchText() + getObject(serviceSubtask, StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrtext()) ? ivrTaskTemplateScriptVO.getIvrtext() : ivrTaskTemplateScriptVO.getScriptContent()));
            }
            back = phoneCallBackYQVO;
            return back;
        }
        return back;
    }

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

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

    <resultMap type="com.smartor.domain.PatChildArchiveDetail" id="PatChildArchiveDetailResult">
        <result property="id" column="id"/>
        <result property="archiveid" column="archiveid"/>
        <result property="archiveType" column="archive_type"/>
        <result property="sourceType" column="source_type"/>
        <result property="outhospno" column="outhospno"/>
        <result property="inhospno" column="inhospno"/>
        <result property="serialnum" column="serialnum"/>
        <result property="patid" column="patid"/>
        <result property="patname" column="patname"/>
        <result property="parentname" column="parentname"/>
        <result property="parentRelation" column="parent_relation"/>
        <result property="parentPhone" column="parent_phone"/>
        <result property="parentIdcardno" column="parent_idcardno"/>
        <result property="parentAddress" column="parent_address"/>
        <result property="birthdate" column="birthdate"/>
        <result property="idcardno" column="idcardno"/>
        <result property="phone" column="phone"/>
        <result property="diagTime" column="diag_time"/>
        <result property="archiveTime" column="archive_time"/>
        <result property="sex" column="sex"/>
        <result property="doctorCode" column="doctor_code"/>
        <result property="doctorName" column="doctor_name"/>
        <result property="managementDoctorCode" column="management_doctor_code"/>
        <result property="managementDoctorName" column="management_doctor_name"/>
        <result property="deptcode" column="deptcode"/>
        <result property="deptname" column="deptname"/>
        <result property="wardcode" column="wardcode"/>
        <result property="wardname" column="wardname"/>
        <result property="icd10code" column="icd10code"/>
        <result property="diagname" column="diagname"/>
        <result property="nutritionIcd10Code" column="nutrition_icd10_code"/>
        <result property="nutritionDiagName" column="nutrition_diag_name"/>
        <result property="ndPhysicalMeasurements" column="nd_physical_measurements"/>
        <result property="ndDietaryAssessment" column="nd_dietary_assessment"/>
        <result property="ndInterventionProgram" column="nd_intervention_program"/>
        <result property="appointmentSituation" column="appointment_situation"/>
        <result property="ldLearningAbilityAssessment" column="ld_learning_ability_assessment"/>
        <result property="ldBehavioralAssessment" column="ld_behavioral_assessment"/>
        <result property="ldInterventionTrainingRecord" column="ld_intervention_training_record"/>
        <result property="highRiskChildType" column="high_risk_child_type"/>
        <result property="highRiskChildName" column="high_risk_child_name"/>
        <result property="plannedFollowTime" column="planned_follow_time"/>
        <result property="hrcGrowthDevelopmentMonitoring" column="hrc_growth_development_monitoring"/>
        <result property="hrcNeurologicalEvaluation" column="hrc_neurological_evaluation"/>
        <result property="hrcInterventionRecords" column="hrc_intervention_records"/>
        <result property="closeStatus" column="close_status"/>
        <result property="gestationalWeek" column="gestational_week"/>
        <result property="birthWeight" column="birth_weight"/>
        <result property="registerUser" column="register_user"/>
        <result property="remark" column="remark"/>
        <result property="orgid" column="orgid"/>
        <result property="campusid" column="campusid"/>
        <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="delFlag" column="del_flag"/>
    </resultMap>

    <sql id="selectPatChildArchiveDetailVo">
        select id,
               archiveid,
               archive_type,
               source_type,
               outhospno,
               inhospno,
               serialnum,
               patid,
               patname,
               parentname,
               parent_relation,
               parent_phone,
               parent_idcardno,
               parent_address,
               birthdate,
               idcardno,
               phone,
               diag_time,
               archive_time,
               sex,
               doctor_code,
               doctor_name,
               management_doctor_code,
               management_doctor_name,
               deptcode,
               deptname,
               wardcode,
               wardname,
               icd10code,
               diagname,
               nutrition_icd10_code,
               nutrition_diag_name,
               nd_physical_measurements,
               nd_dietary_assessment,
               nd_intervention_program,
               appointment_situation,
               ld_learning_ability_assessment,
               ld_behavioral_assessment,
               ld_intervention_training_record,
               high_risk_child_type,
               high_risk_child_name,
               planned_follow_time,
               hrc_growth_development_monitoring,
               hrc_neurological_evaluation,
               hrc_intervention_records,
               close_status,
               gestational_week,
               birth_weight,
               register_user,
               remark,
               orgid,
               campusid,
               update_by,
               update_time,
               create_by,
               create_time,
               del_flag
        from pat_child_archive_detail
    </sql>

    <select id="selectPatChildArchiveDetailList" parameterType="com.smartor.domain.PatChildArchiveDetail"
            resultMap="PatChildArchiveDetailResult">
        <include refid="selectPatChildArchiveDetailVo"/>
        where 1=1
            and del_flag = '0'
            <if test="archiveid != null">and archiveid = #{archiveid}</if>
            <if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
            <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
            <if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
            <if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
            <if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
            <if test="patid != null">and patid = #{patid}</if>
            <if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
            <if test="parentname != null and parentname != ''">and parentname like concat('%', #{parentname}, '%')</if>
            <if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
            <if test="phone != null and phone != ''">and phone = #{phone}</if>
            <if test="diagTime != null">and diag_time = #{diagTime}</if>
            <if test="sex != null">and sex = #{sex}</if>
            <if test="doctorCode != null and doctorCode != ''">and doctor_code = #{doctorCode}</if>
            <if test="doctorName != null and doctorName != ''">and doctor_name like concat('%', #{doctorName}, '%')</if>
            <if test="managementDoctorCode != null and managementDoctorCode != ''">and management_doctor_code = #{managementDoctorCode}</if>
            <if test="managementDoctorName != null and managementDoctorName != ''">and management_doctor_name like concat('%', #{managementDoctorName}, '%')</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="wardcode != null and wardcode != ''">and wardcode = #{wardcode}</if>
            <if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
            <if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
            <if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
            <if test="nutritionIcd10Code != null and nutritionIcd10Code != ''">and nutrition_icd10_code = #{nutritionIcd10Code}</if>
            <if test="nutritionDiagName != null and nutritionDiagName != ''">and nutrition_diag_name like concat('%', #{nutritionDiagName}, '%')</if>
            <if test="highRiskChildType != null and highRiskChildType != ''">and high_risk_child_type = #{highRiskChildType}</if>
            <if test="highRiskChildName != null and highRiskChildName != ''">and high_risk_child_name like concat('%', #{highRiskChildName}, '%')</if>
            <if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
            <if test="gestationalWeek != null">and gestational_week = #{gestationalWeek}</if>
            <if test="birthWeight != null">and birth_weight = #{birthWeight}</if>
            <if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
            <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
            <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
            <if test="params.beginTime != null and params.beginTime != ''">
                and date_format(archive_time, '%y%m%d') &gt;= date_format(#{params.beginTime}, '%y%m%d')
            </if>
            <if test="params.endTime != null and params.endTime != ''">
                and date_format(archive_time, '%y%m%d') &lt;= date_format(#{params.endTime}, '%y%m%d')
            </if>
    </select>

    <select id="selectPatChildArchiveDetailById" parameterType="Long" resultMap="PatChildArchiveDetailResult">
        <include refid="selectPatChildArchiveDetailVo"/>
        where id = #{id}
    </select>

    <insert id="insertPatChildArchiveDetail" parameterType="com.smartor.domain.PatChildArchiveDetail"
            useGeneratedKeys="true" keyProperty="id">
        insert into pat_child_archive_detail
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="archiveid != null">archiveid,</if>
            <if test="archiveType != null">archive_type,</if>
            <if test="sourceType != null">source_type,</if>
            <if test="outhospno != null">outhospno,</if>
            <if test="inhospno != null">inhospno,</if>
            <if test="serialnum != null">serialnum,</if>
            <if test="patid != null">patid,</if>
            <if test="patname != null">patname,</if>
            <if test="parentname != null">parentname,</if>
            <if test="parentRelation != null">parent_relation,</if>
            <if test="parentPhone != null">parent_phone,</if>
            <if test="parentIdcardno != null">parent_idcardno,</if>
            <if test="parentAddress != null">parent_address,</if>
            <if test="birthdate != null">birthdate,</if>
            <if test="idcardno != null">idcardno,</if>
            <if test="phone != null">phone,</if>
            <if test="diagTime != null">diag_time,</if>
            <if test="archiveTime != null">archive_time,</if>
            <if test="sex != null">sex,</if>
            <if test="doctorCode != null">doctor_code,</if>
            <if test="doctorName != null">doctor_name,</if>
            <if test="managementDoctorCode != null">management_doctor_code,</if>
            <if test="managementDoctorName != null">management_doctor_name,</if>
            <if test="deptcode != null">deptcode,</if>
            <if test="deptname != null">deptname,</if>
            <if test="wardcode != null">wardcode,</if>
            <if test="wardname != null">wardname,</if>
            <if test="icd10code != null">icd10code,</if>
            <if test="diagname != null">diagname,</if>
            <if test="nutritionIcd10Code != null">nutrition_icd10_code,</if>
            <if test="nutritionDiagName != null">nutrition_diag_name,</if>
            <if test="ndPhysicalMeasurements != null">nd_physical_measurements,</if>
            <if test="ndDietaryAssessment != null">nd_dietary_assessment,</if>
            <if test="ndInterventionProgram != null">nd_intervention_program,</if>
            <if test="appointmentSituation != null">appointment_situation,</if>
            <if test="ldLearningAbilityAssessment != null">ld_learning_ability_assessment,</if>
            <if test="ldBehavioralAssessment != null">ld_behavioral_assessment,</if>
            <if test="ldInterventionTrainingRecord != null">ld_intervention_training_record,</if>
            <if test="highRiskChildType != null">high_risk_child_type,</if>
            <if test="highRiskChildName != null">high_risk_child_name,</if>
            <if test="plannedFollowTime != null">planned_follow_time,</if>
            <if test="hrcGrowthDevelopmentMonitoring != null">hrc_growth_development_monitoring,</if>
            <if test="hrcNeurologicalEvaluation != null">hrc_neurological_evaluation,</if>
            <if test="hrcInterventionRecords != null">hrc_intervention_records,</if>
            <if test="closeStatus != null">close_status,</if>
            <if test="gestationalWeek != null">gestational_week,</if>
            <if test="birthWeight != null">birth_weight,</if>
            <if test="registerUser != null">register_user,</if>
            <if test="remark != null">remark,</if>
            <if test="orgid != null">orgid,</if>
            <if test="campusid != null">campusid,</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="delFlag != null and delFlag != ''">del_flag,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="archiveid != null">#{archiveid},</if>
            <if test="archiveType != null">#{archiveType},</if>
            <if test="sourceType != null">#{sourceType},</if>
            <if test="outhospno != null">#{outhospno},</if>
            <if test="inhospno != null">#{inhospno},</if>
            <if test="serialnum != null">#{serialnum},</if>
            <if test="patid != null">#{patid},</if>
            <if test="patname != null">#{patname},</if>
            <if test="parentname != null">#{parentname},</if>
            <if test="parentRelation != null">#{parentRelation},</if>
            <if test="parentPhone != null">#{parentPhone},</if>
            <if test="parentIdcardno != null">#{parentIdcardno},</if>
            <if test="parentAddress != null">#{parentAddress},</if>
            <if test="birthdate != null">#{birthdate},</if>
            <if test="idcardno != null">#{idcardno},</if>
            <if test="phone != null">#{phone},</if>
            <if test="diagTime != null">#{diagTime},</if>
            <if test="archiveTime != null">#{archiveTime},</if>
            <if test="sex != null">#{sex},</if>
            <if test="doctorCode != null">#{doctorCode},</if>
            <if test="doctorName != null">#{doctorName},</if>
            <if test="managementDoctorCode != null">#{managementDoctorCode},</if>
            <if test="managementDoctorName != null">#{managementDoctorName},</if>
            <if test="deptcode != null">#{deptcode},</if>
            <if test="deptname != null">#{deptname},</if>
            <if test="wardcode != null">#{wardcode},</if>
            <if test="wardname != null">#{wardname},</if>
            <if test="icd10code != null">#{icd10code},</if>
            <if test="diagname != null">#{diagname},</if>
            <if test="nutritionIcd10Code != null">#{nutritionIcd10Code},</if>
            <if test="nutritionDiagName != null">#{nutritionDiagName},</if>
            <if test="ndPhysicalMeasurements != null">#{ndPhysicalMeasurements},</if>
            <if test="ndDietaryAssessment != null">#{ndDietaryAssessment},</if>
            <if test="ndInterventionProgram != null">#{ndInterventionProgram},</if>
            <if test="appointmentSituation != null">#{appointmentSituation},</if>
            <if test="ldLearningAbilityAssessment != null">#{ldLearningAbilityAssessment},</if>
            <if test="ldBehavioralAssessment != null">#{ldBehavioralAssessment},</if>
            <if test="ldInterventionTrainingRecord != null">#{ldInterventionTrainingRecord},</if>
            <if test="highRiskChildType != null">#{highRiskChildType},</if>
            <if test="highRiskChildName != null">#{highRiskChildName},</if>
            <if test="plannedFollowTime != null">#{plannedFollowTime},</if>
            <if test="hrcGrowthDevelopmentMonitoring != null">#{hrcGrowthDevelopmentMonitoring},</if>
            <if test="hrcNeurologicalEvaluation != null">#{hrcNeurologicalEvaluation},</if>
            <if test="hrcInterventionRecords != null">#{hrcInterventionRecords},</if>
            <if test="closeStatus != null">#{closeStatus},</if>
            <if test="gestationalWeek != null">#{gestationalWeek},</if>
            <if test="birthWeight != null">#{birthWeight},</if>
            <if test="registerUser != null">#{registerUser},</if>
            <if test="remark != null">#{remark},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="campusid != null">#{campusid},</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="delFlag != null and delFlag != ''">#{delFlag},</if>
        </trim>
    </insert>

    <update id="updatePatChildArchiveDetail" parameterType="com.smartor.domain.PatChildArchiveDetail">
        update pat_child_archive_detail
        <trim prefix="SET" suffixOverrides=",">
            <if test="archiveid != null">archiveid = #{archiveid},</if>
            <if test="archiveType != null">archive_type = #{archiveType},</if>
            <if test="sourceType != null">source_type = #{sourceType},</if>
            <if test="outhospno != null">outhospno = #{outhospno},</if>
            <if test="inhospno != null">inhospno = #{inhospno},</if>
            <if test="serialnum != null">serialnum = #{serialnum},</if>
            <if test="patid != null">patid = #{patid},</if>
            <if test="patname != null">patname = #{patname},</if>
            <if test="parentname != null">parentname = #{parentname},</if>
            <if test="parentRelation != null">parent_relation = #{parentRelation},</if>
            <if test="parentPhone != null">parent_phone = #{parentPhone},</if>
            <if test="parentIdcardno != null">parent_idcardno = #{parentIdcardno},</if>
            <if test="parentAddress != null">parent_address = #{parentAddress},</if>
            <if test="birthdate != null">birthdate = #{birthdate},</if>
            <if test="idcardno != null">idcardno = #{idcardno},</if>
            <if test="phone != null">phone = #{phone},</if>
            <if test="diagTime != null">diag_time = #{diagTime},</if>
            <if test="archiveTime != null">archive_time = #{archiveTime},</if>
            <if test="sex != null">sex = #{sex},</if>
            <if test="doctorCode != null">doctor_code = #{doctorCode},</if>
            <if test="doctorName != null">doctor_name = #{doctorName},</if>
            <if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
            <if test="managementDoctorName != null">management_doctor_name = #{managementDoctorName},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="deptname != null">deptname = #{deptname},</if>
            <if test="wardcode != null">wardcode = #{wardcode},</if>
            <if test="wardname != null">wardname = #{wardname},</if>
            <if test="icd10code != null">icd10code = #{icd10code},</if>
            <if test="diagname != null">diagname = #{diagname},</if>
            <if test="nutritionIcd10Code != null">nutrition_icd10_code = #{nutritionIcd10Code},</if>
            <if test="nutritionDiagName != null">nutrition_diag_name = #{nutritionDiagName},</if>
            <if test="ndPhysicalMeasurements != null">nd_physical_measurements = #{ndPhysicalMeasurements},</if>
            <if test="ndDietaryAssessment != null">nd_dietary_assessment = #{ndDietaryAssessment},</if>
            <if test="ndInterventionProgram != null">nd_intervention_program = #{ndInterventionProgram},</if>
            <if test="appointmentSituation != null">appointment_situation = #{appointmentSituation},</if>
            <if test="ldLearningAbilityAssessment != null">ld_learning_ability_assessment = #{ldLearningAbilityAssessment},</if>
            <if test="ldBehavioralAssessment != null">ld_behavioral_assessment = #{ldBehavioralAssessment},</if>
            <if test="ldInterventionTrainingRecord != null">ld_intervention_training_record = #{ldInterventionTrainingRecord},</if>
            <if test="highRiskChildType != null">high_risk_child_type = #{highRiskChildType},</if>
            <if test="highRiskChildName != null">high_risk_child_name = #{highRiskChildName},</if>
            <if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
            <if test="hrcGrowthDevelopmentMonitoring != null">hrc_growth_development_monitoring = #{hrcGrowthDevelopmentMonitoring},</if>
            <if test="hrcNeurologicalEvaluation != null">hrc_neurological_evaluation = #{hrcNeurologicalEvaluation},</if>
            <if test="hrcInterventionRecords != null">hrc_intervention_records = #{hrcInterventionRecords},</if>
            <if test="closeStatus != null">close_status = #{closeStatus},</if>
            <if test="gestationalWeek != null">gestational_week = #{gestationalWeek},</if>
            <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
            <if test="registerUser != null">register_user = #{registerUser},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="campusid != null">campusid = #{campusid},</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="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatChildArchiveDetailById" parameterType="Long">
        update pat_child_archive_detail
        <trim prefix="SET" suffixOverrides=",">
            del_flag = '1'
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatChildArchiveDetailByIds" parameterType="String">
        update pat_child_archive_detail set del_flag = '1' where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
</mapper>

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

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

    <resultMap type="com.smartor.domain.PatChildArchive" id="PatChildArchiveResult">
        <result property="id" column="id"/>
        <result property="archiveType" column="archive_type"/>
        <result property="outhospno" column="outhospno"/>
        <result property="inhospno" column="inhospno"/>
        <result property="serialnum" column="serialnum"/>
        <result property="patid" column="patid"/>
        <result property="patname" column="patname"/>
        <result property="parentname" column="parentname"/>
        <result property="birthdate" column="birthdate"/>
        <result property="idcardno" column="idcardno"/>
        <result property="phone" column="phone"/>
        <result property="diagTime" column="diag_time"/>
        <result property="archiveTime" column="archive_time"/>
        <result property="plannedFollowTime" column="planned_follow_time"/>
        <result property="followupCycleTimes" column="followup_cycle_times"/>
        <result property="sex" column="sex"/>
        <result property="doctorCode" column="doctor_code"/>
        <result property="doctorName" column="doctor_name"/>
        <result property="managementDoctorCode" column="management_doctor_code"/>
        <result property="managementDoctorName" column="management_doctor_name"/>
        <result property="deptcode" column="deptcode"/>
        <result property="deptname" column="deptname"/>
        <result property="wardcode" column="wardcode"/>
        <result property="wardname" column="wardname"/>
        <result property="icd10code" column="icd10code"/>
        <result property="diagname" column="diagname"/>
        <result property="closeStatus" column="close_status"/>
        <result property="registerUser" column="register_user"/>
        <result property="remark" column="remark"/>
        <result property="orgid" column="orgid"/>
        <result property="campusid" column="campusid"/>
        <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="delFlag" column="del_flag"/>
    </resultMap>

    <sql id="selectPatChildArchiveVo">
        select id,
               archive_type,
               outhospno,
               inhospno,
               serialnum,
               patid,
               patname,
               parentname,
               birthdate,
               idcardno,
               phone,
               diag_time,
               archive_time,
               planned_follow_time,
               followup_cycle_times,
               sex,
               doctor_code,
               doctor_name,
               management_doctor_code,
               management_doctor_name,
               deptcode,
               deptname,
               wardcode,
               wardname,
               icd10code,
               diagname,
               close_status,
               register_user,
               remark,
               orgid,
               campusid,
               update_by,
               update_time,
               create_by,
               create_time,
               del_flag
        from pat_child_archive
    </sql>

    <select id="selectPatChildArchiveList" parameterType="com.smartor.domain.PatChildArchive"
            resultMap="PatChildArchiveResult">
        <include refid="selectPatChildArchiveVo"/>
        where 1=1
            and del_flag = '0'
            <if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
            <if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
            <if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
            <if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
            <if test="patid != null">and patid = #{patid}</if>
            <if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
            <if test="parentname != null and parentname != ''">and parentname like concat('%', #{parentname}, '%')</if>
            <if test="birthdate != null">and birthdate = #{birthdate}</if>
            <if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
            <if test="phone != null and phone != ''">and phone = #{phone}</if>
            <if test="diagTime != null">and diag_time = #{diagTime}</if>
            <if test="plannedFollowTime != null">and planned_follow_time = #{plannedFollowTime}</if>
            <if test="followupCycleTimes != null and followupCycleTimes != ''">and followup_cycle_times = #{followupCycleTimes}</if>
            <if test="sex != null">and sex = #{sex}</if>
            <if test="doctorCode != null and doctorCode != ''">and doctor_code = #{doctorCode}</if>
            <if test="doctorName != null and doctorName != ''">and doctor_name like concat('%', #{doctorName}, '%')</if>
            <if test="managementDoctorCode != null and managementDoctorCode != ''">and management_doctor_code = #{managementDoctorCode}</if>
            <if test="managementDoctorName != null and managementDoctorName != ''">and management_doctor_name like concat('%', #{managementDoctorName}, '%')</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="wardcode != null and wardcode != ''">and wardcode = #{wardcode}</if>
            <if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
            <if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
            <if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
            <if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
            <if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
            <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
            <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
            <if test="params.beginTime != null and params.beginTime != ''">
                and date_format(archive_time, '%y%m%d') &gt;= date_format(#{params.beginTime}, '%y%m%d')
            </if>
            <if test="params.endTime != null and params.endTime != ''">
                and date_format(archive_time, '%y%m%d') &lt;= date_format(#{params.endTime}, '%y%m%d')
            </if>
    </select>

    <select id="selectPatChildArchiveById" parameterType="Long" resultMap="PatChildArchiveResult">
        <include refid="selectPatChildArchiveVo"/>
        where id = #{id}
    </select>

    <insert id="insertPatChildArchive" parameterType="com.smartor.domain.PatChildArchive"
            useGeneratedKeys="true" keyProperty="id">
        insert into pat_child_archive
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="archiveType != null">archive_type,</if>
            <if test="outhospno != null">outhospno,</if>
            <if test="inhospno != null">inhospno,</if>
            <if test="serialnum != null">serialnum,</if>
            <if test="patid != null">patid,</if>
            <if test="patname != null">patname,</if>
            <if test="parentname != null">parentname,</if>
            <if test="birthdate != null">birthdate,</if>
            <if test="idcardno != null">idcardno,</if>
            <if test="phone != null">phone,</if>
            <if test="diagTime != null">diag_time,</if>
            <if test="archiveTime != null">archive_time,</if>
            <if test="plannedFollowTime != null">planned_follow_time,</if>
            <if test="followupCycleTimes != null">followup_cycle_times,</if>
            <if test="sex != null">sex,</if>
            <if test="doctorCode != null">doctor_code,</if>
            <if test="doctorName != null">doctor_name,</if>
            <if test="managementDoctorCode != null">management_doctor_code,</if>
            <if test="managementDoctorName != null">management_doctor_name,</if>
            <if test="deptcode != null">deptcode,</if>
            <if test="deptname != null">deptname,</if>
            <if test="wardcode != null">wardcode,</if>
            <if test="wardname != null">wardname,</if>
            <if test="icd10code != null">icd10code,</if>
            <if test="diagname != null">diagname,</if>
            <if test="closeStatus != null">close_status,</if>
            <if test="registerUser != null">register_user,</if>
            <if test="remark != null">remark,</if>
            <if test="orgid != null">orgid,</if>
            <if test="campusid != null">campusid,</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="delFlag != null and delFlag != ''">del_flag,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="archiveType != null">#{archiveType},</if>
            <if test="outhospno != null">#{outhospno},</if>
            <if test="inhospno != null">#{inhospno},</if>
            <if test="serialnum != null">#{serialnum},</if>
            <if test="patid != null">#{patid},</if>
            <if test="patname != null">#{patname},</if>
            <if test="parentname != null">#{parentname},</if>
            <if test="birthdate != null">#{birthdate},</if>
            <if test="idcardno != null">#{idcardno},</if>
            <if test="phone != null">#{phone},</if>
            <if test="diagTime != null">#{diagTime},</if>
            <if test="archiveTime != null">#{archiveTime},</if>
            <if test="plannedFollowTime != null">#{plannedFollowTime},</if>
            <if test="followupCycleTimes != null">#{followupCycleTimes},</if>
            <if test="sex != null">#{sex},</if>
            <if test="doctorCode != null">#{doctorCode},</if>
            <if test="doctorName != null">#{doctorName},</if>
            <if test="managementDoctorCode != null">#{managementDoctorCode},</if>
            <if test="managementDoctorName != null">#{managementDoctorName},</if>
            <if test="deptcode != null">#{deptcode},</if>
            <if test="deptname != null">#{deptname},</if>
            <if test="wardcode != null">#{wardcode},</if>
            <if test="wardname != null">#{wardname},</if>
            <if test="icd10code != null">#{icd10code},</if>
            <if test="diagname != null">#{diagname},</if>
            <if test="closeStatus != null">#{closeStatus},</if>
            <if test="registerUser != null">#{registerUser},</if>
            <if test="remark != null">#{remark},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="campusid != null">#{campusid},</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="delFlag != null and delFlag != ''">#{delFlag},</if>
        </trim>
    </insert>

    <update id="updatePatChildArchive" parameterType="com.smartor.domain.PatChildArchive">
        update pat_child_archive
        <trim prefix="SET" suffixOverrides=",">
            <if test="archiveType != null">archive_type = #{archiveType},</if>
            <if test="outhospno != null">outhospno = #{outhospno},</if>
            <if test="inhospno != null">inhospno = #{inhospno},</if>
            <if test="serialnum != null">serialnum = #{serialnum},</if>
            <if test="patid != null">patid = #{patid},</if>
            <if test="patname != null">patname = #{patname},</if>
            <if test="parentname != null">parentname = #{parentname},</if>
            <if test="birthdate != null">birthdate = #{birthdate},</if>
            <if test="idcardno != null">idcardno = #{idcardno},</if>
            <if test="phone != null">phone = #{phone},</if>
            <if test="diagTime != null">diag_time = #{diagTime},</if>
            <if test="archiveTime != null">archive_time = #{archiveTime},</if>
            <if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
            <if test="followupCycleTimes != null">followup_cycle_times = #{followupCycleTimes},</if>
            <if test="sex != null">sex = #{sex},</if>
            <if test="doctorCode != null">doctor_code = #{doctorCode},</if>
            <if test="doctorName != null">doctor_name = #{doctorName},</if>
            <if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
            <if test="managementDoctorName != null">management_doctor_name = #{managementDoctorName},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="deptname != null">deptname = #{deptname},</if>
            <if test="wardcode != null">wardcode = #{wardcode},</if>
            <if test="wardname != null">wardname = #{wardname},</if>
            <if test="icd10code != null">icd10code = #{icd10code},</if>
            <if test="diagname != null">diagname = #{diagname},</if>
            <if test="closeStatus != null">close_status = #{closeStatus},</if>
            <if test="registerUser != null">register_user = #{registerUser},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="campusid != null">campusid = #{campusid},</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="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatChildArchiveById" parameterType="Long">
        update pat_child_archive
        <trim prefix="SET" suffixOverrides=",">
            del_flag = '1'
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatChildArchiveByIds" parameterType="String">
        update pat_child_archive set del_flag = '1' where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
</mapper>

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

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

    <resultMap type="com.smartor.domain.PatMaternityArchiveDetail" id="PatMaternityArchiveDetailResult">
        <result property="id" column="id"/>
        <result property="archiveid" column="archiveid"/>
        <result property="archiveType" column="archive_type"/>
        <result property="sourceType" column="source_type"/>
        <result property="outhospno" column="outhospno"/>
        <result property="inhospno" column="inhospno"/>
        <result property="serialnum" column="serialnum"/>
        <result property="patid" column="patid"/>
        <result property="patname" column="patname"/>
        <result property="birthdate" column="birthdate"/>
        <result property="idcardno" column="idcardno"/>
        <result property="phone" column="phone"/>
        <result property="diagTime" column="diag_time"/>
        <result property="archiveTime" column="archive_time"/>
        <result property="plannedFollowTime" column="planned_follow_time"/>
        <result property="sex" column="sex"/>
        <result property="doctorCode" column="doctor_code"/>
        <result property="doctorName" column="doctor_name"/>
        <result property="managementDoctorCode" column="management_doctor_code"/>
        <result property="managementDoctorName" column="management_doctor_name"/>
        <result property="deptcode" column="deptcode"/>
        <result property="deptname" column="deptname"/>
        <result property="wardcode" column="wardcode"/>
        <result property="wardname" column="wardname"/>
        <result property="icd10code" column="icd10code"/>
        <result property="diagname" column="diagname"/>
        <result property="pregnancySituation" column="pregnancy_situation"/>
        <result property="specificSituation" column="specific_situation"/>
        <result property="handleSuggestion" column="handle_suggestion"/>
        <result property="closeStatus" column="close_status"/>
        <result property="isRecordEstablished" column="is_record_established"/>
        <result property="dueDate" column="due_date"/>
        <result property="registerUser" column="register_user"/>
        <result property="followupPeriod" column="followup_period"/>
        <result property="epEarlyPregnancyFollowupForm" column="ep_early_pregnancy_followup_form"/>
        <result property="mhiMenopauseFollowupSystemIssuesForm" column="mhi_menopause_followup_system_issues_form"/>
        <result property="mhiMhtInitialVisitMedicalRecordForm" column="mhi_mht_initial_visit_medical_record_form"/>
        <result property="mhiMhtFollowUpMedicalRecordForm" column="mhi_mht_follow_up_medical_record_form"/>
        <result property="mhiModifiedKuppermanScoringScaleForm" column="mhi_modified_kupperman_scoring_scale_form"/>
        <result property="mhiMenopauseRatingScaleForm" column="mhi_menopause_rating_scale_form"/>
        <result property="mhiPittsburghSleepQualityIndexForm" column="mhi_pittsburgh_sleep_quality_index_form"/>
        <result property="remark" column="remark"/>
        <result property="orgid" column="orgid"/>
        <result property="campusid" column="campusid"/>
        <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="delFlag" column="del_flag"/>
    </resultMap>

    <sql id="selectPatMaternityArchiveDetailVo">
        select id,
               archiveid,
               archive_type,
               source_type,
               outhospno,
               inhospno,
               serialnum,
               patid,
               patname,
               birthdate,
               idcardno,
               phone,
               diag_time,
               archive_time,
               planned_follow_time,
               sex,
               doctor_code,
               doctor_name,
               management_doctor_code,
               management_doctor_name,
               deptcode,
               deptname,
               wardcode,
               wardname,
               icd10code,
               diagname,
               pregnancy_situation,
               specific_situation,
               handle_suggestion,
               close_status,
               is_record_established,
               due_date,
               register_user,
               followup_period,
               ep_early_pregnancy_followup_form,
               mhi_menopause_followup_system_issues_form,
               mhi_mht_initial_visit_medical_record_form,
               mhi_mht_follow_up_medical_record_form,
               mhi_modified_kupperman_scoring_scale_form,
               mhi_menopause_rating_scale_form,
               mhi_pittsburgh_sleep_quality_index_form,
               remark,
               orgid,
               campusid,
               update_by,
               update_time,
               create_by,
               create_time,
               del_flag
        from pat_maternity_archive_detail
    </sql>

    <select id="selectPatMaternityArchiveDetailList" parameterType="com.smartor.domain.PatMaternityArchiveDetail"
            resultMap="PatMaternityArchiveDetailResult">
        <include refid="selectPatMaternityArchiveDetailVo"/>
        where 1=1
            and del_flag = '0'
            <if test="archiveid != null">and archiveid = #{archiveid}</if>
            <if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
            <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
            <if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
            <if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
            <if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
            <if test="patid != null">and patid = #{patid}</if>
            <if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
            <if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
            <if test="phone != null and phone != ''">and phone = #{phone}</if>
            <if test="diagTime != null">and diag_time = #{diagTime}</if>
            <if test="sex != null">and sex = #{sex}</if>
            <if test="doctorCode != null and doctorCode != ''">and doctor_code = #{doctorCode}</if>
            <if test="doctorName != null and doctorName != ''">and doctor_name like concat('%', #{doctorName}, '%')</if>
            <if test="managementDoctorCode != null and managementDoctorCode != ''">and management_doctor_code = #{managementDoctorCode}</if>
            <if test="managementDoctorName != null and managementDoctorName != ''">and management_doctor_name like concat('%', #{managementDoctorName}, '%')</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="wardcode != null and wardcode != ''">and wardcode = #{wardcode}</if>
            <if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
            <if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
            <if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
            <if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
            <if test="isRecordEstablished != null and isRecordEstablished != ''">and is_record_established = #{isRecordEstablished}</if>
            <if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
            <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
            <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
            <if test="params.beginTime != null and params.beginTime != ''">
                and date_format(archive_time, '%y%m%d') &gt;= date_format(#{params.beginTime}, '%y%m%d')
            </if>
            <if test="params.endTime != null and params.endTime != ''">
                and date_format(archive_time, '%y%m%d') &lt;= date_format(#{params.endTime}, '%y%m%d')
            </if>
    </select>

    <select id="selectPatMaternityArchiveDetailById" parameterType="Long" resultMap="PatMaternityArchiveDetailResult">
        <include refid="selectPatMaternityArchiveDetailVo"/>
        where id = #{id}
    </select>

    <insert id="insertPatMaternityArchiveDetail" parameterType="com.smartor.domain.PatMaternityArchiveDetail"
            useGeneratedKeys="true" keyProperty="id">
        insert into pat_maternity_archive_detail
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="archiveid != null">archiveid,</if>
            <if test="archiveType != null">archive_type,</if>
            <if test="sourceType != null">source_type,</if>
            <if test="outhospno != null">outhospno,</if>
            <if test="inhospno != null">inhospno,</if>
            <if test="serialnum != null">serialnum,</if>
            <if test="patid != null">patid,</if>
            <if test="patname != null">patname,</if>
            <if test="birthdate != null">birthdate,</if>
            <if test="idcardno != null">idcardno,</if>
            <if test="phone != null">phone,</if>
            <if test="diagTime != null">diag_time,</if>
            <if test="archiveTime != null">archive_time,</if>
            <if test="plannedFollowTime != null">planned_follow_time,</if>
            <if test="sex != null">sex,</if>
            <if test="doctorCode != null">doctor_code,</if>
            <if test="doctorName != null">doctor_name,</if>
            <if test="managementDoctorCode != null">management_doctor_code,</if>
            <if test="managementDoctorName != null">management_doctor_name,</if>
            <if test="deptcode != null">deptcode,</if>
            <if test="deptname != null">deptname,</if>
            <if test="wardcode != null">wardcode,</if>
            <if test="wardname != null">wardname,</if>
            <if test="icd10code != null">icd10code,</if>
            <if test="diagname != null">diagname,</if>
            <if test="pregnancySituation != null">pregnancy_situation,</if>
            <if test="specificSituation != null">specific_situation,</if>
            <if test="handleSuggestion != null">handle_suggestion,</if>
            <if test="closeStatus != null">close_status,</if>
            <if test="isRecordEstablished != null">is_record_established,</if>
            <if test="dueDate != null">due_date,</if>
            <if test="registerUser != null">register_user,</if>
            <if test="followupPeriod != null">followup_period,</if>
            <if test="epEarlyPregnancyFollowupForm != null">ep_early_pregnancy_followup_form,</if>
            <if test="mhiMenopauseFollowupSystemIssuesForm != null">mhi_menopause_followup_system_issues_form,</if>
            <if test="mhiMhtInitialVisitMedicalRecordForm != null">mhi_mht_initial_visit_medical_record_form,</if>
            <if test="mhiMhtFollowUpMedicalRecordForm != null">mhi_mht_follow_up_medical_record_form,</if>
            <if test="mhiModifiedKuppermanScoringScaleForm != null">mhi_modified_kupperman_scoring_scale_form,</if>
            <if test="mhiMenopauseRatingScaleForm != null">mhi_menopause_rating_scale_form,</if>
            <if test="mhiPittsburghSleepQualityIndexForm != null">mhi_pittsburgh_sleep_quality_index_form,</if>
            <if test="remark != null">remark,</if>
            <if test="orgid != null">orgid,</if>
            <if test="campusid != null">campusid,</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="delFlag != null and delFlag != ''">del_flag,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="archiveid != null">#{archiveid},</if>
            <if test="archiveType != null">#{archiveType},</if>
            <if test="sourceType != null">#{sourceType},</if>
            <if test="outhospno != null">#{outhospno},</if>
            <if test="inhospno != null">#{inhospno},</if>
            <if test="serialnum != null">#{serialnum},</if>
            <if test="patid != null">#{patid},</if>
            <if test="patname != null">#{patname},</if>
            <if test="birthdate != null">#{birthdate},</if>
            <if test="idcardno != null">#{idcardno},</if>
            <if test="phone != null">#{phone},</if>
            <if test="diagTime != null">#{diagTime},</if>
            <if test="archiveTime != null">#{archiveTime},</if>
            <if test="plannedFollowTime != null">#{plannedFollowTime},</if>
            <if test="sex != null">#{sex},</if>
            <if test="doctorCode != null">#{doctorCode},</if>
            <if test="doctorName != null">#{doctorName},</if>
            <if test="managementDoctorCode != null">#{managementDoctorCode},</if>
            <if test="managementDoctorName != null">#{managementDoctorName},</if>
            <if test="deptcode != null">#{deptcode},</if>
            <if test="deptname != null">#{deptname},</if>
            <if test="wardcode != null">#{wardcode},</if>
            <if test="wardname != null">#{wardname},</if>
            <if test="icd10code != null">#{icd10code},</if>
            <if test="diagname != null">#{diagname},</if>
            <if test="pregnancySituation != null">#{pregnancySituation},</if>
            <if test="specificSituation != null">#{specificSituation},</if>
            <if test="handleSuggestion != null">#{handleSuggestion},</if>
            <if test="closeStatus != null">#{closeStatus},</if>
            <if test="isRecordEstablished != null">#{isRecordEstablished},</if>
            <if test="dueDate != null">#{dueDate},</if>
            <if test="registerUser != null">#{registerUser},</if>
            <if test="followupPeriod != null">#{followupPeriod},</if>
            <if test="epEarlyPregnancyFollowupForm != null">#{epEarlyPregnancyFollowupForm},</if>
            <if test="mhiMenopauseFollowupSystemIssuesForm != null">#{mhiMenopauseFollowupSystemIssuesForm},</if>
            <if test="mhiMhtInitialVisitMedicalRecordForm != null">#{mhiMhtInitialVisitMedicalRecordForm},</if>
            <if test="mhiMhtFollowUpMedicalRecordForm != null">#{mhiMhtFollowUpMedicalRecordForm},</if>
            <if test="mhiModifiedKuppermanScoringScaleForm != null">#{mhiModifiedKuppermanScoringScaleForm},</if>
            <if test="mhiMenopauseRatingScaleForm != null">#{mhiMenopauseRatingScaleForm},</if>
            <if test="mhiPittsburghSleepQualityIndexForm != null">#{mhiPittsburghSleepQualityIndexForm},</if>
            <if test="remark != null">#{remark},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="campusid != null">#{campusid},</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="delFlag != null and delFlag != ''">#{delFlag},</if>
        </trim>
    </insert>

    <update id="updatePatMaternityArchiveDetail" parameterType="com.smartor.domain.PatMaternityArchiveDetail">
        update pat_maternity_archive_detail
        <trim prefix="SET" suffixOverrides=",">
            <if test="archiveid != null">archiveid = #{archiveid},</if>
            <if test="archiveType != null">archive_type = #{archiveType},</if>
            <if test="sourceType != null">source_type = #{sourceType},</if>
            <if test="outhospno != null">outhospno = #{outhospno},</if>
            <if test="inhospno != null">inhospno = #{inhospno},</if>
            <if test="serialnum != null">serialnum = #{serialnum},</if>
            <if test="patid != null">patid = #{patid},</if>
            <if test="patname != null">patname = #{patname},</if>
            <if test="birthdate != null">birthdate = #{birthdate},</if>
            <if test="idcardno != null">idcardno = #{idcardno},</if>
            <if test="phone != null">phone = #{phone},</if>
            <if test="diagTime != null">diag_time = #{diagTime},</if>
            <if test="archiveTime != null">archive_time = #{archiveTime},</if>
            <if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
            <if test="sex != null">sex = #{sex},</if>
            <if test="doctorCode != null">doctor_code = #{doctorCode},</if>
            <if test="doctorName != null">doctor_name = #{doctorName},</if>
            <if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
            <if test="managementDoctorName != null">management_doctor_name = #{managementDoctorName},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="deptname != null">deptname = #{deptname},</if>
            <if test="wardcode != null">wardcode = #{wardcode},</if>
            <if test="wardname != null">wardname = #{wardname},</if>
            <if test="icd10code != null">icd10code = #{icd10code},</if>
            <if test="diagname != null">diagname = #{diagname},</if>
            <if test="pregnancySituation != null">pregnancy_situation = #{pregnancySituation},</if>
            <if test="specificSituation != null">specific_situation = #{specificSituation},</if>
            <if test="handleSuggestion != null">handle_suggestion = #{handleSuggestion},</if>
            <if test="closeStatus != null">close_status = #{closeStatus},</if>
            <if test="isRecordEstablished != null">is_record_established = #{isRecordEstablished},</if>
            <if test="dueDate != null">due_date = #{dueDate},</if>
            <if test="registerUser != null">register_user = #{registerUser},</if>
            <if test="followupPeriod != null">followup_period = #{followupPeriod},</if>
            <if test="epEarlyPregnancyFollowupForm != null">ep_early_pregnancy_followup_form = #{epEarlyPregnancyFollowupForm},</if>
            <if test="mhiMenopauseFollowupSystemIssuesForm != null">mhi_menopause_followup_system_issues_form = #{mhiMenopauseFollowupSystemIssuesForm},</if>
            <if test="mhiMhtInitialVisitMedicalRecordForm != null">mhi_mht_initial_visit_medical_record_form = #{mhiMhtInitialVisitMedicalRecordForm},</if>
            <if test="mhiMhtFollowUpMedicalRecordForm != null">mhi_mht_follow_up_medical_record_form = #{mhiMhtFollowUpMedicalRecordForm},</if>
            <if test="mhiModifiedKuppermanScoringScaleForm != null">mhi_modified_kupperman_scoring_scale_form = #{mhiModifiedKuppermanScoringScaleForm},</if>
            <if test="mhiMenopauseRatingScaleForm != null">mhi_menopause_rating_scale_form = #{mhiMenopauseRatingScaleForm},</if>
            <if test="mhiPittsburghSleepQualityIndexForm != null">mhi_pittsburgh_sleep_quality_index_form = #{mhiPittsburghSleepQualityIndexForm},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="campusid != null">campusid = #{campusid},</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="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatMaternityArchiveDetailById" parameterType="Long">
        update pat_maternity_archive_detail
        <trim prefix="SET" suffixOverrides=",">
            del_flag = '1'
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatMaternityArchiveDetailByIds" parameterType="String">
        update pat_maternity_archive_detail set del_flag = '1' where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
</mapper>

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

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

    <resultMap type="com.smartor.domain.PatMaternityArchive" id="PatMaternityArchiveResult">
        <result property="id" column="id"/>
        <result property="archiveType" column="archive_type"/>
        <result property="outhospno" column="outhospno"/>
        <result property="inhospno" column="inhospno"/>
        <result property="serialnum" column="serialnum"/>
        <result property="patid" column="patid"/>
        <result property="patname" column="patname"/>
        <result property="parentname" column="parentname"/>
        <result property="birthdate" column="birthdate"/>
        <result property="idcardno" column="idcardno"/>
        <result property="phone" column="phone"/>
        <result property="diagTime" column="diag_time"/>
        <result property="archiveTime" column="archive_time"/>
        <result property="plannedFollowTime" column="planned_follow_time"/>
        <result property="followupCycleTimes" column="followup_cycle_times"/>
        <result property="sex" column="sex"/>
        <result property="doctorCode" column="doctor_code"/>
        <result property="doctorName" column="doctor_name"/>
        <result property="managementDoctorCode" column="management_doctor_code"/>
        <result property="managementDoctorName" column="management_doctor_name"/>
        <result property="deptcode" column="deptcode"/>
        <result property="deptname" column="deptname"/>
        <result property="wardcode" column="wardcode"/>
        <result property="wardname" column="wardname"/>
        <result property="icd10code" column="icd10code"/>
        <result property="diagname" column="diagname"/>
        <result property="pregnancySituation" column="pregnancy_situation"/>
        <result property="closeStatus" column="close_status"/>
        <result property="registerUser" column="register_user"/>
        <result property="remark" column="remark"/>
        <result property="orgid" column="orgid"/>
        <result property="campusid" column="campusid"/>
        <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="delFlag" column="del_flag"/>
    </resultMap>

    <sql id="selectPatMaternityArchiveVo">
        select id,
               archive_type,
               outhospno,
               inhospno,
               serialnum,
               patid,
               patname,
               parentname,
               birthdate,
               idcardno,
               phone,
               diag_time,
               archive_time,
               planned_follow_time,
               followup_cycle_times,
               sex,
               doctor_code,
               doctor_name,
               management_doctor_code,
               management_doctor_name,
               deptcode,
               deptname,
               wardcode,
               wardname,
               icd10code,
               diagname,
               pregnancy_situation,
               close_status,
               register_user,
               remark,
               orgid,
               campusid,
               update_by,
               update_time,
               create_by,
               create_time,
               del_flag
        from pat_maternity_archive
    </sql>

    <select id="selectPatMaternityArchiveList" parameterType="com.smartor.domain.PatMaternityArchive"
            resultMap="PatMaternityArchiveResult">
        <include refid="selectPatMaternityArchiveVo"/>
        where 1=1
            and del_flag = '0'
            <if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
            <if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
            <if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
            <if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
            <if test="patid != null">and patid = #{patid}</if>
            <if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
            <if test="parentname != null and parentname != ''">and parentname like concat('%', #{parentname}, '%')</if>
            <if test="birthdate != null">and birthdate = #{birthdate}</if>
            <if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
            <if test="phone != null and phone != ''">and phone = #{phone}</if>
            <if test="diagTime != null">and diag_time = #{diagTime}</if>
            <if test="plannedFollowTime != null">and planned_follow_time = #{plannedFollowTime}</if>
            <if test="followupCycleTimes != null and followupCycleTimes != ''">and followup_cycle_times = #{followupCycleTimes}</if>
            <if test="sex != null">and sex = #{sex}</if>
            <if test="doctorCode != null and doctorCode != ''">and doctor_code = #{doctorCode}</if>
            <if test="doctorName != null and doctorName != ''">and doctor_name like concat('%', #{doctorName}, '%')</if>
            <if test="managementDoctorCode != null and managementDoctorCode != ''">and management_doctor_code = #{managementDoctorCode}</if>
            <if test="managementDoctorName != null and managementDoctorName != ''">and management_doctor_name like concat('%', #{managementDoctorName}, '%')</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="wardcode != null and wardcode != ''">and wardcode = #{wardcode}</if>
            <if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
            <if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
            <if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
            <if test="pregnancySituation != null and pregnancySituation != ''">and pregnancy_situation = #{pregnancySituation}</if>
            <if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
            <if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
            <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
            <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
            <if test="params.beginTime != null and params.beginTime != ''">
                and date_format(archive_time, '%y%m%d') &gt;= date_format(#{params.beginTime}, '%y%m%d')
            </if>
            <if test="params.endTime != null and params.endTime != ''">
                and date_format(archive_time, '%y%m%d') &lt;= date_format(#{params.endTime}, '%y%m%d')
            </if>
    </select>

    <select id="selectPatMaternityArchiveById" parameterType="Long" resultMap="PatMaternityArchiveResult">
        <include refid="selectPatMaternityArchiveVo"/>
        where id = #{id}
    </select>

    <insert id="insertPatMaternityArchive" parameterType="com.smartor.domain.PatMaternityArchive"
            useGeneratedKeys="true" keyProperty="id">
        insert into pat_maternity_archive
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="archiveType != null">archive_type,</if>
            <if test="outhospno != null">outhospno,</if>
            <if test="inhospno != null">inhospno,</if>
            <if test="serialnum != null">serialnum,</if>
            <if test="patid != null">patid,</if>
            <if test="patname != null">patname,</if>
            <if test="parentname != null">parentname,</if>
            <if test="birthdate != null">birthdate,</if>
            <if test="idcardno != null">idcardno,</if>
            <if test="phone != null">phone,</if>
            <if test="diagTime != null">diag_time,</if>
            <if test="archiveTime != null">archive_time,</if>
            <if test="plannedFollowTime != null">planned_follow_time,</if>
            <if test="followupCycleTimes != null">followup_cycle_times,</if>
            <if test="sex != null">sex,</if>
            <if test="doctorCode != null">doctor_code,</if>
            <if test="doctorName != null">doctor_name,</if>
            <if test="managementDoctorCode != null">management_doctor_code,</if>
            <if test="managementDoctorName != null">management_doctor_name,</if>
            <if test="deptcode != null">deptcode,</if>
            <if test="deptname != null">deptname,</if>
            <if test="wardcode != null">wardcode,</if>
            <if test="wardname != null">wardname,</if>
            <if test="icd10code != null">icd10code,</if>
            <if test="diagname != null">diagname,</if>
            <if test="pregnancySituation != null">pregnancy_situation,</if>
            <if test="closeStatus != null">close_status,</if>
            <if test="registerUser != null">register_user,</if>
            <if test="remark != null">remark,</if>
            <if test="orgid != null">orgid,</if>
            <if test="campusid != null">campusid,</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="delFlag != null and delFlag != ''">del_flag,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="archiveType != null">#{archiveType},</if>
            <if test="outhospno != null">#{outhospno},</if>
            <if test="inhospno != null">#{inhospno},</if>
            <if test="serialnum != null">#{serialnum},</if>
            <if test="patid != null">#{patid},</if>
            <if test="patname != null">#{patname},</if>
            <if test="parentname != null">#{parentname},</if>
            <if test="birthdate != null">#{birthdate},</if>
            <if test="idcardno != null">#{idcardno},</if>
            <if test="phone != null">#{phone},</if>
            <if test="diagTime != null">#{diagTime},</if>
            <if test="archiveTime != null">#{archiveTime},</if>
            <if test="plannedFollowTime != null">#{plannedFollowTime},</if>
            <if test="followupCycleTimes != null">#{followupCycleTimes},</if>
            <if test="sex != null">#{sex},</if>
            <if test="doctorCode != null">#{doctorCode},</if>
            <if test="doctorName != null">#{doctorName},</if>
            <if test="managementDoctorCode != null">#{managementDoctorCode},</if>
            <if test="managementDoctorName != null">#{managementDoctorName},</if>
            <if test="deptcode != null">#{deptcode},</if>
            <if test="deptname != null">#{deptname},</if>
            <if test="wardcode != null">#{wardcode},</if>
            <if test="wardname != null">#{wardname},</if>
            <if test="icd10code != null">#{icd10code},</if>
            <if test="diagname != null">#{diagname},</if>
            <if test="pregnancySituation != null">#{pregnancySituation},</if>
            <if test="closeStatus != null">#{closeStatus},</if>
            <if test="registerUser != null">#{registerUser},</if>
            <if test="remark != null">#{remark},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="campusid != null">#{campusid},</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="delFlag != null and delFlag != ''">#{delFlag},</if>
        </trim>
    </insert>

    <update id="updatePatMaternityArchive" parameterType="com.smartor.domain.PatMaternityArchive">
        update pat_maternity_archive
        <trim prefix="SET" suffixOverrides=",">
            <if test="archiveType != null">archive_type = #{archiveType},</if>
            <if test="outhospno != null">outhospno = #{outhospno},</if>
            <if test="inhospno != null">inhospno = #{inhospno},</if>
            <if test="serialnum != null">serialnum = #{serialnum},</if>
            <if test="patid != null">patid = #{patid},</if>
            <if test="patname != null">patname = #{patname},</if>
            <if test="parentname != null">parentname = #{parentname},</if>
            <if test="birthdate != null">birthdate = #{birthdate},</if>
            <if test="idcardno != null">idcardno = #{idcardno},</if>
            <if test="phone != null">phone = #{phone},</if>
            <if test="diagTime != null">diag_time = #{diagTime},</if>
            <if test="archiveTime != null">archive_time = #{archiveTime},</if>
            <if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
            <if test="followupCycleTimes != null">followup_cycle_times = #{followupCycleTimes},</if>
            <if test="sex != null">sex = #{sex},</if>
            <if test="doctorCode != null">doctor_code = #{doctorCode},</if>
            <if test="doctorName != null">doctor_name = #{doctorName},</if>
            <if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
            <if test="managementDoctorName != null">management_doctor_name = #{managementDoctorName},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="deptname != null">deptname = #{deptname},</if>
            <if test="wardcode != null">wardcode = #{wardcode},</if>
            <if test="wardname != null">wardname = #{wardname},</if>
            <if test="icd10code != null">icd10code = #{icd10code},</if>
            <if test="diagname != null">diagname = #{diagname},</if>
            <if test="pregnancySituation != null">pregnancy_situation = #{pregnancySituation},</if>
            <if test="closeStatus != null">close_status = #{closeStatus},</if>
            <if test="registerUser != null">register_user = #{registerUser},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="campusid != null">campusid = #{campusid},</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="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatMaternityArchiveById" parameterType="Long">
        update pat_maternity_archive
        <trim prefix="SET" suffixOverrides=",">
            del_flag = '1'
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatMaternityArchiveByIds" parameterType="String">
        update pat_maternity_archive set del_flag = '1' where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
</mapper>

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

@@ -660,4 +660,133 @@
        </if>
    </select>

    <select id="selectOperationItemListMaxLevel" parameterType="com.smartor.domain.PatMedOperationItem"
            resultMap="PatMedOperationItemResult">
        select pmoi.id, pmoi.operationid, pmoi.opid, pmoi.opcode, pmoi.opdesc, pmoi.main_flag, pmoi.incitypecode,
        pmoi.incitypedesc, pmoi.oplevelcode, pmoi.opleveldesc, pmoi.opposition, pmoi.del_flag, pmoi.update_by,
        pmoi.update_time, pmoi.create_by, pmoi.create_time, pmoi.isupload, pmoi.upload_time, pmoi.orgid,
        pmoi.pguid, pmoi.guid, pmoi.pid, pmoi.opercheck_flag, pmoi.long_task_reason,
        pmo.deptcode, pmo.deptname, pmo.hospitaldistrictcode, pmo.hospitaldistrictname,
        pmo.leaveldeptcode, pmo.leaveldeptname, pmo.leavehospitaldistrictcode, pmo.leavehospitaldistrictname, pmo.patid,
        pmo.drcode, pmo.drname, pmo.nurse_id, pmo.nurse_name,
        pmo.serialnum, pmi.inhospstate
        from pat_med_operation pmo
        join pat_med_operation_item pmoi
        on pmoi.opid = pmo.opid
        join (
            select opid, max(oplevelcode) as max_oplevelcode
            from pat_med_operation_item
            where del_flag = '0'
              and opid is not null
              and oplevelcode is not null
            group by opid
        ) pmoi_max
        on pmoi_max.opid = pmoi.opid
        and (pmoi.oplevelcode = pmoi_max.max_oplevelcode
             or (pmoi.oplevelcode is null and pmoi_max.max_oplevelcode is null))
        join pat_med_inhosp pmi
        on pmo.serialnum = pmi.serialnum
        where
        pmo.del_flag = '0'
        and pmoi.del_flag = '0'
        and pmo.opid is not null
        and pmoi.opid is not null
        <if test="operationid != null ">
            and pmoi.operationid = #{operationid}
        </if>
        <if test="opid != null ">
            and pmoi.opid = #{opid}
        </if>
        <if test="opcode != null  and opcode != ''">
            and pmoi.opcode = #{opcode}
        </if>
        <if test="opdesc != null  and opdesc != ''">
            and pmoi.opdesc = #{opdesc}
        </if>
        <if test="mainFlag != null  and mainFlag != ''">
            and pmoi.main_flag = #{mainFlag}
        </if>
        <if test="incitypecode != null  and incitypecode != ''">
            and pmoi.incitypecode = #{incitypecode}
        </if>
        <if test="incitypedesc != null  and incitypedesc != ''">
            and pmoi.incitypedesc = #{incitypedesc}
        </if>
        <if test="oplevelcode != null  and oplevelcode != ''">
            and pmoi.oplevelcode = #{oplevelcode}
        </if>
        <if test="opleveldesc != null  and opleveldesc != ''">
            and pmoi.opleveldesc = #{opleveldesc}
        </if>
        <if test="opposition != null  and opposition != ''">
            and pmoi.opposition = #{opposition}
        </if>
        <if test="isupload != null ">
            and pmoi.isupload = #{isupload}
        </if>
        <if test="uploadTime != null ">
            and pmoi.upload_time = #{uploadTime}
        </if>
        <if test="orgid != null  and orgid != ''">
            and pmoi.orgid = #{orgid}
        </if>
        <if test="pguid != null  and pguid != ''">
            and pmoi.pguid = #{pguid}
        </if>
        <if test="guid != null  and guid != ''">
            and pmoi.guid = #{guid}
        </if>
        <if test="pid != null ">
            and pmoi.pid = #{pid}
        </if>
        <if test="inhospstate != null and inhospstate != ''">
            and pmi.inhospstate = #{inhospstate}
            <if test="inhospstate == '1'">
                and pmi.endtime is not null
            </if>
        </if>
        <if test="serialnum != null and serialnum != ''">
            and pmo.serialnum = #{serialnum}
        </if>
        <if test="deptcode != null and deptcode != ''">
            and pmo.deptcode = #{deptcode}
        </if>
        <if test="deptname != null and deptname != ''">
            and pmo.deptname = #{deptname}
        </if>
        <if test="hospitaldistrictcode != null and hospitaldistrictcode != ''">
            and pmo.hospitaldistrictcode = #{hospitaldistrictcode}
        </if>
        <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
            and pmo.hospitaldistrictname = #{hospitaldistrictname}
        </if>
        <if test="patid != null">
            and pmo.patid = #{patid}
        </if>
        <if test="deptCodes != null and deptCodes.size()>0">
            AND pmo.deptcode IN
            <foreach collection="deptCodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
            </foreach>
        </if>
        <if test="wardCodes != null and wardCodes.size()>0">
            AND pmo.hospitaldistrictcode IN
            <foreach collection="wardCodes" item="wardCode" open="(" separator=","
                     close=")">
                #{wardCode}
            </foreach>
        </if>
        <if test="opLevelCodes != null and opLevelCodes.size()>0">
            AND pmoi.oplevelcode IN
            <foreach collection="opLevelCodes" item="levelCode" open="(" separator=","
                     close=")">
                #{levelCode}
            </foreach>
        </if>
        <if test="opercheckFlag != null">
            and pmoi.opercheck_flag = #{opercheckFlag}
        </if>
    </select>

</mapper>

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

@@ -775,6 +775,12 @@
        </if>
        <if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
        <if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
        <if test="startOutHospTime != null">
            AND date_format(endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
        </if>
        <if test="endOutHospTime != null">
            AND date_format(endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
        </if>
        ) a
    </select>

@@ -807,6 +813,7 @@
        </if>
        WHERE ss.del_flag = 0
        AND ss.visit_time IS NOT NULL
        AND ss.sendstate != 4
        <if test="starttime == null and endtime==null">
            AND DATE(ss.visit_time) &lt; DATE(NOW())
        </if>
@@ -840,6 +847,12 @@
                #{serviceType}
            </foreach>
        </if>
        <if test="startOutHospTime != null">
            AND date_format(ss.endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
        </if>
        <if test="endOutHospTime != null">
            AND date_format(ss.endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
        </if>
        <if test="groupKey != null and groupKey != ''">
            AND ss.${groupKey} IN
            <foreach collection="groupKeyList" item="key" open="(" separator=","