From 52a0bf7637b725f0b6bf18a03962b0636f7074fb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 十二月 2023 18:14:40 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/IPatArchivetagService.java                                  |    8 
 smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java                                   |   14 
 smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java                          |   12 
 smartor/src/main/java/com/smartor/domain/Icd10.java                                                   |   96 
 smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java                                   |   56 
 smartor/src/main/java/com/smartor/domain/IvrLibaScriptTag.java                                        |   91 
 smartor/src/main/java/com/smartor/mapper/IvrLibaScriptMapper.java                                     |   60 
 smartor/src/main/java/com/smartor/service/IIcd10Service.java                                          |   62 
 smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml                               |    7 
 smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java                                         |  254 +
 smartor/src/main/java/com/smartor/domain/PatArchiveVO.java                                            |    9 
 smartor/src/main/java/com/smartor/service/IPatArchiveService.java                                     |    6 
 smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java                                      |  100 
 smartor/src/main/java/com/smartor/domain/IvrLibaTemplatescript.java                                   |  307 --
 smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java                                           |   64 
 smartor/src/main/java/com/smartor/domain/PatArchivetag.java                                           |   27 
 smartor/src/main/java/com/smartor/domain/SvyLibTopicRes.java                                          |   32 
 smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml                                     |   17 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetAssortController.java |  100 
 smartor/src/main/java/com/smartor/service/IIvrLibaScriptService.java                                  |   66 
 smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTagMapper.java                                  |   64 
 smartor/src/main/java/com/smartor/domain/PatArchiveReq.java                                           |    4 
 smartor/src/main/java/com/smartor/domain/SvyLibTopicAndOptionRes.java                                 |   14 
 smartor/src/main/java/com/smartor/domain/PatArchivetagAndPatientInfo.java                             |   18 
 ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserInfo.java                                  |    8 
 smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java                             |   87 
 smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java                          |  234 +
 smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java                                         |  195 +
 smartor/src/main/java/com/smartor/mapper/IvrLibaOutIcd10Mapper.java                                   |   63 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaOutIcd10Controller.java             |  101 
 smartor/src/main/java/com/smartor/domain/IvrLibaTargetIcd10.java                                      |  123 
 smartor/src/main/java/com/smartor/domain/MedicalHistory.java                                          |    4 
 smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml                                  |  142 +
 smartor/src/main/java/com/smartor/mapper/Icd10Mapper.java                                             |   63 
 smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetServiceImpl.java                    |   84 
 smartor/src/main/java/com/smartor/service/IIvrLibaTargetTagService.java                               |   62 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java                      |    2 
 smartor/src/main/java/com/smartor/mapper/IvrLibaScriptAssortMapper.java                               |   68 
 smartor/src/main/java/com/smartor/domain/PatMedBloodsugar.java                                        |   28 
 smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java                                  |   35 
 smartor/src/main/java/com/smartor/service/IIvrLibaOutIcd10Service.java                                |   62 
 smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java                                     |   50 
 smartor/src/main/resources/mapper/smartor/IvrLibaTemplatescriptMapper.xml                             |   16 
 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java                       |   14 
 smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml                                     |  234 +
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java         |   95 
 smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java                                     |    2 
 smartor/src/main/java/com/smartor/domain/BaseTag.java                                                 |    3 
 smartor/src/main/resources/mapper/smartor/IvrLibaOutIcd10Mapper.xml                                   |  138 
 smartor/src/main/java/com/smartor/domain/IvrLibaTemplatetargetAssort.java                             |   49 
 smartor/src/main/java/com/smartor/domain/TreeNode.java                                                |    4 
 smartor/src/main/java/com/smartor/service/IIvrLibaScriptTargetoptionService.java                      |   54 
 smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplatetargetAssortServiceImpl.java            |   90 
 smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml                                   |  171 
 smartor/src/main/java/com/smartor/domain/SvyTopicoption.java                                          |   54 
 smartor/src/main/java/com/smartor/domain/IvrLibaScript.java                                           |  540 +--
 smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetAssortMapper.xml                       |   82 
 smartor/src/main/java/com/smartor/domain/SvyTopic.java                                                |    2 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java            |   91 
 smartor/src/main/java/com/smartor/domain/HeCategoryVO.java                                            |   18 
 smartor/src/main/java/com/smartor/service/IIvrLibaScriptAssortService.java                            |   79 
 smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetoptionServiceImpl.java              |   86 
 smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java                                     |   12 
 smartor/src/main/java/com/smartor/mapper/IvrLibaTargetTagMapper.java                                  |   72 
 ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java                                     |    4 
 smartor/src/main/java/com/smartor/domain/PatMedWeight.java                                            |   26 
 smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml                                             |  106 
 smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTagServiceImpl.java                       |   93 
 smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml                                  |  140 +
 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml                                        |    4 
 smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetTagServiceImpl.java                       |   97 
 smartor/src/main/java/com/smartor/service/IIvrLibaScriptTagService.java                               |   62 
 smartor/src/main/java/com/smartor/domain/PatMedHypertension.java                                      |   30 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java               |  141 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java         |    9 
 smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml                         |  173 +
 smartor/src/main/java/com/smartor/service/IIvrLibaTemplatetargetAssortService.java                    |   62 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java                       |  101 
 smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetMapper.xml                             |  173 
 smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml                               |   81 
 smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java                                         |  463 --
 smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java                          |  152 
 smartor/src/main/java/com/smartor/domain/HeCategory.java                                              |   16 
 smartor/src/main/java/com/smartor/domain/PatArchive.java                                              |    9 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java               |   63 
 smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTargetoptionMapper.java                         |   56 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java                     |    2 
 smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java                               |    1 
 smartor/src/main/java/com/smartor/domain/SvyTopicReq.java                                             |    6 
 smartor/src/main/java/com/smartor/service/impl/IvrLibaOutIcd10ServiceImpl.java                        |   97 
 smartor/src/main/java/com/smartor/domain/IvrLibaScriptTargetoption.java                               |  170 +
 smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java                                     |    3 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java            |   91 
 smartor/src/main/java/com/smartor/service/impl/Icd10ServiceImpl.java                                  |   97 
 smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml                                     |  234 
 /dev/null                                                                                             |  153 -
 smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java                                     |   47 
 smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java                    |  127 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java         |    9 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java                  |   78 
 smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java                                        |   94 
 smartor/src/main/java/com/smartor/domain/SvyLibTopicoption.java                                       |   54 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java   |   91 
 smartor/src/main/java/com/smartor/domain/PatArchivecontact.java                                       |    4 
 smartor/src/main/java/com/smartor/mapper/IvrLibaTemplatetargetAssortMapper.java                       |   64 
 105 files changed, 6,262 insertions(+), 2,026 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
index ed2d911..b51a332 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
@@ -48,7 +48,7 @@
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody BaseTag baseTag) {
         PageUtils.startPageByPost(baseTag.getPageNum(), baseTag.getPageSize());
-        if (baseTag.getTagcategoryid() == 0) baseTag.setTagcategoryid(null);
+        if (baseTag.getTagcategoryid() == 0 || baseTag.getTagcategoryid() == null) baseTag.setTagcategoryid(null);
         List<BaseTag> list = baseTagService.selectBaseTagList(baseTag);
         return getDataTable(list);
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java
new file mode 100644
index 0000000..4c567cc
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java
@@ -0,0 +1,101 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.Icd10;
+import com.smartor.service.IIcd10Service;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鐤剧梾Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Api(description = "鐤剧梾瀛楀吀淇℃伅")
+@RestController
+@RequestMapping("/smartor/icd10")
+public class Icd10Controller extends BaseController {
+    @Autowired
+    private IIcd10Service icd10Service;
+
+    /**
+     * 鏌ヨ鐤剧梾鍒楄〃
+     */
+    @ApiOperation("鏌ヨ鐤剧梾鍒楄〃")
+    @PreAuthorize("@ss.hasPermi('system:icd10:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody Icd10 icd10) {
+        PageUtils.startPageByPost(icd10.getPageNum(),icd10.getPageSize());
+        List<Icd10> list = icd10Service.selectIcd10List(icd10);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭鐤剧梾鍒楄〃
+     */
+    @ApiOperation("瀵煎嚭鐤剧梾鍒楄〃")
+    @PreAuthorize("@ss.hasPermi('system:icd10:export')")
+    @Log(title = "鐤剧梾", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Icd10 icd10) {
+        List<Icd10> list = icd10Service.selectIcd10List(icd10);
+        ExcelUtil<Icd10> util = new ExcelUtil<Icd10>(Icd10.class);
+        util.exportExcel(response, list, "鐤剧梾鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇鐤剧梾璇︾粏淇℃伅
+     */
+    @ApiOperation("鑾峰彇鐤剧梾璇︾粏淇℃伅")
+    @PreAuthorize("@ss.hasPermi('system:icd10:query')")
+    @GetMapping(value = "/getInfo/{icdid}")
+    public AjaxResult getInfo(@PathVariable("icdid") Long icdid) {
+        return success(icd10Service.selectIcd10ByIcdid(icdid));
+    }
+
+    /**
+     * 鏂板鐤剧梾
+     */
+    @ApiOperation("鏂板鐤剧梾")
+    @PreAuthorize("@ss.hasPermi('system:icd10:add')")
+    @Log(title = "鐤剧梾", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Icd10 icd10) {
+        return toAjax(icd10Service.insertIcd10(icd10));
+    }
+
+    /**
+     * 淇敼鐤剧梾
+     */
+    @ApiOperation("淇敼鐤剧梾")
+    @PreAuthorize("@ss.hasPermi('system:icd10:edit')")
+    @Log(title = "鐤剧梾", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Icd10 icd10) {
+        return toAjax(icd10Service.updateIcd10(icd10));
+    }
+
+    /**
+     * 鍒犻櫎鐤剧梾
+     */
+    @ApiOperation("鍒犻櫎鐤剧梾")
+    @PreAuthorize("@ss.hasPermi('system:icd10:remove')")
+    @Log(title = "鐤剧梾", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{icdids}")
+    public AjaxResult remove(@PathVariable Long[] icdids) {
+        return toAjax(icd10Service.deleteIcd10ByIcdids(icdids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaOutIcd10Controller.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaOutIcd10Controller.java
new file mode 100644
index 0000000..ba2f949
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaOutIcd10Controller.java
@@ -0,0 +1,101 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaTargetIcd10;
+import com.smartor.service.IIvrLibaOutIcd10Service;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎸囨爣鐤剧梾Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-20
+ */
+@Api(description = "鎸囨爣鐤剧梾")
+@RestController
+@RequestMapping("/smartor/outicd10")
+public class IvrLibaOutIcd10Controller extends BaseController {
+    @Autowired
+    private IIvrLibaOutIcd10Service ivrLibaOutIcd10Service;
+
+    /**
+     * 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
+     */
+    @ApiOperation("鏌ヨ鎸囨爣鐤剧梾鍒楄〃")
+    @PreAuthorize("@ss.hasPermi('system:icd10:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
+        PageUtils.startPageByPost(ivrLibaTargetIcd10.getPageNum(), ivrLibaTargetIcd10.getPageSize());
+        List<IvrLibaTargetIcd10> list = ivrLibaOutIcd10Service.selectIvrLibaTargetIcd10List(ivrLibaTargetIcd10);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭鎸囨爣鐤剧梾鍒楄〃
+     */
+    @ApiOperation("瀵煎嚭鎸囨爣鐤剧梾鍒楄〃")
+    @PreAuthorize("@ss.hasPermi('system:icd10:export')")
+    @Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
+        List<IvrLibaTargetIcd10> list = ivrLibaOutIcd10Service.selectIvrLibaTargetIcd10List(ivrLibaTargetIcd10);
+        ExcelUtil<IvrLibaTargetIcd10> util = new ExcelUtil<IvrLibaTargetIcd10>(IvrLibaTargetIcd10.class);
+        util.exportExcel(response, list, "鎸囨爣鐤剧梾鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇鎸囨爣鐤剧梾璇︾粏淇℃伅
+     */
+    @ApiOperation("鑾峰彇鎸囨爣鐤剧梾璇︾粏淇℃伅")
+    @PreAuthorize("@ss.hasPermi('system:icd10:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(ivrLibaOutIcd10Service.selectIvrLibaTargetIcd10ById(id));
+    }
+
+    /**
+     * 鏂板鎸囨爣鐤剧梾
+     */
+    @ApiOperation("鏂板鎸囨爣鐤剧梾")
+    @PreAuthorize("@ss.hasPermi('system:icd10:add')")
+    @Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
+        return toAjax(ivrLibaOutIcd10Service.insertIvrLibaTargetIcd10(ivrLibaTargetIcd10));
+    }
+
+    /**
+     * 淇敼鎸囨爣鐤剧梾
+     */
+    @ApiOperation("淇敼鎸囨爣鐤剧梾")
+    @PreAuthorize("@ss.hasPermi('system:icd10:edit')")
+    @Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
+        return toAjax(ivrLibaOutIcd10Service.updateIvrLibaTargetIcd10(ivrLibaTargetIcd10));
+    }
+
+    /**
+     * 鍒犻櫎鎸囨爣鐤剧梾
+     */
+    @ApiOperation("鍒犻櫎鎸囨爣鐤剧梾")
+    @PreAuthorize("@ss.hasPermi('system:icd10:remove')")
+    @Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(ivrLibaOutIcd10Service.deleteIvrLibaTargetIcd10ByIds(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java
new file mode 100644
index 0000000..895e517
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptAssortController.java
@@ -0,0 +1,95 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaScriptAssort;
+import com.smartor.domain.IvrLibaScriptAssortVO;
+import com.smartor.service.IIvrLibaScriptAssortService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 闂璇濇湳鍒嗙被搴�
+ * Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@RestController
+@RequestMapping("/smartor/scriptassort")
+public class IvrLibaScriptAssortController extends BaseController {
+    @Autowired
+    private IIvrLibaScriptAssortService ivrLibaScriptAssortService;
+
+    /**
+     * 鏌ヨ闂璇濇湳鍒嗙被搴�(鏍戠姸)
+     * 鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('system:assort:list')")
+    @PostMapping("/selectIvrLibaScriptAssortList")
+    public TableDataInfo list(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
+        List<IvrLibaScriptAssortVO> list = ivrLibaScriptAssortService.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭闂璇濇湳鍒嗙被搴�
+     * 鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('system:assort:export')")
+    @Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, IvrLibaScriptAssort ivrLibaScriptAssort) {
+        List<IvrLibaScriptAssortVO> list = ivrLibaScriptAssortService.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
+        ExcelUtil<IvrLibaScriptAssortVO> util = new ExcelUtil<IvrLibaScriptAssortVO>(IvrLibaScriptAssortVO.class);
+        util.exportExcel(response, list, "闂璇濇湳鍒嗙被搴撴暟鎹�");
+    }
+
+    /**
+     * 鑾峰彇闂璇濇湳鍒嗙被搴�
+     * 璇︾粏淇℃伅
+     */
+    @PreAuthorize("@ss.hasPermi('system:assort:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(ivrLibaScriptAssortService.selectIvrLibaScriptAssortById(id));
+    }
+
+    /**
+     * 鏂板闂璇濇湳鍒嗙被搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:assort:add')")
+    @Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
+        return toAjax(ivrLibaScriptAssortService.insertIvrLibaScriptAssort(ivrLibaScriptAssort));
+    }
+
+    /**
+     * 淇敼闂璇濇湳鍒嗙被搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:assort:edit')")
+    @Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody IvrLibaScriptAssort ivrLibaScriptAssort) {
+        return toAjax(ivrLibaScriptAssortService.updateIvrLibaScriptAssort(ivrLibaScriptAssort));
+    }
+
+    /**
+     * 鍒犻櫎闂璇濇湳鍒嗙被搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:assort:remove')")
+    @Log(title = "闂璇濇湳鍒嗙被搴�", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(ivrLibaScriptAssortService.deleteIvrLibaScriptAssortByIds(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
index e2c3056..bce7146 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
@@ -1,104 +1,133 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.smartor.domain.IvrLibaScript;
-import com.smartor.service.IIvrLibaScriptService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaScript;
+import com.smartor.domain.IvrLibaScriptVO;
+import com.smartor.service.IIvrLibaScriptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
- * 璇濇湳搴揅ontroller
- * 
- * @author smartor
- * @date 2023-03-22
+ * 闂璇濇湳搴揅ontroller
+ *
+ * @author ruoyi
+ * @date 2023-12-21
  */
+@Api(description = "闂璇濇湳搴�")
 @RestController
-@RequestMapping("/smartor/ivrlibascript")
-public class IvrLibaScriptController extends BaseController
-{
+@RequestMapping("/smartor/script")
+public class IvrLibaScriptController extends BaseController {
     @Autowired
     private IIvrLibaScriptService ivrLibaScriptService;
 
     /**
-     * 鏌ヨ璇濇湳搴撳垪琛�
+     * 鏌ヨ闂璇濇湳搴撳垪琛�
      */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:list')")
-   @PostMapping("/list")
-    public TableDataInfo list(@RequestBody IvrLibaScript ivrLibaScript)
-    {
+    @ApiOperation("鏌ヨ闂璇濇湳搴撳垪琛�")
+    @PreAuthorize("@ss.hasPermi('system:script:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody IvrLibaScript ivrLibaScript) {
         startPage();
         List<IvrLibaScript> list = ivrLibaScriptService.selectIvrLibaScriptList(ivrLibaScript);
         return getDataTable(list);
     }
 
     /**
-     * 瀵煎嚭璇濇湳搴撳垪琛�
+     * 瀵煎嚭闂璇濇湳搴撳垪琛�
      */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:export')")
-    @Log(title = "璇濇湳搴�", businessType = BusinessType.EXPORT)
+    @ApiOperation("瀵煎嚭闂璇濇湳搴撳垪琛�")
+    @PreAuthorize("@ss.hasPermi('system:script:export')")
+    @Log(title = "闂璇濇湳搴�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, IvrLibaScript ivrLibaScript)
-    {
+    public void export(HttpServletResponse response, IvrLibaScript ivrLibaScript) {
         List<IvrLibaScript> list = ivrLibaScriptService.selectIvrLibaScriptList(ivrLibaScript);
         ExcelUtil<IvrLibaScript> util = new ExcelUtil<IvrLibaScript>(IvrLibaScript.class);
-        util.exportExcel(response, list, "璇濇湳搴撴暟鎹�");
+        util.exportExcel(response, list, "闂璇濇湳搴撴暟鎹�");
     }
 
     /**
-     * 鑾峰彇璇濇湳搴撹缁嗕俊鎭�
+     * 鑾峰彇闂璇濇湳搴撹缁嗕俊鎭�
      */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:query')")
-    @GetMapping(value = "/{questionid}")
-    public AjaxResult getInfo(@PathVariable("questionid") String questionid)
-    {
+    @ApiOperation("鑾峰彇闂璇濇湳搴撹缁嗕俊鎭�")
+    @PreAuthorize("@ss.hasPermi('system:script:query')")
+    @GetMapping(value = "/getInfo/{questionid}")
+    public AjaxResult getInfo(@PathVariable("questionid") String questionid) {
         return success(ivrLibaScriptService.selectIvrLibaScriptByQuestionid(questionid));
     }
 
     /**
-     * 鏂板璇濇湳搴�
+     * 鏂板闂璇濇湳搴�
      */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:add')")
-    @Log(title = "璇濇湳搴�", businessType = BusinessType.INSERT)
+    @ApiOperation("鏂板闂璇濇湳搴�")
+    @PreAuthorize("@ss.hasPermi('system:script:add')")
+    @Log(title = "闂璇濇湳搴�", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody IvrLibaScript ivrLibaScript)
-    {
+    public AjaxResult add(@RequestBody IvrLibaScript ivrLibaScript) {
         return toAjax(ivrLibaScriptService.insertIvrLibaScript(ivrLibaScript));
     }
 
     /**
-     * 淇敼璇濇湳搴�
+     * 淇敼闂璇濇湳搴�
      */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:edit')")
-    @Log(title = "璇濇湳搴�", businessType = BusinessType.UPDATE)
+    @ApiOperation("淇敼闂璇濇湳搴�")
+    @PreAuthorize("@ss.hasPermi('system:script:edit')")
+    @Log(title = "闂璇濇湳搴�", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody IvrLibaScript ivrLibaScript)
-    {
+    public AjaxResult edit(@RequestBody IvrLibaScript ivrLibaScript) {
         return toAjax(ivrLibaScriptService.updateIvrLibaScript(ivrLibaScript));
     }
 
     /**
-     * 鍒犻櫎璇濇湳搴�
+     * 鍒犻櫎闂璇濇湳搴�
      */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrlibascript:remove')")
-    @Log(title = "璇濇湳搴�", businessType = BusinessType.DELETE)
-	@GetMapping("/remove/{questionids}")
-    public AjaxResult remove(@PathVariable String[] questionids)
-    {
+    @ApiOperation("鍒犻櫎闂璇濇湳搴�")
+    @PreAuthorize("@ss.hasPermi('system:script:remove')")
+    @Log(title = "闂璇濇湳搴�", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{questionids}")
+    public AjaxResult remove(@PathVariable String[] questionids) {
         return toAjax(ivrLibaScriptService.deleteIvrLibaScriptByQuestionids(questionids));
     }
+
+
+    /**
+     * 鏌ヨ闂璇濇湳璇︽儏鏍规嵁鏉′欢
+     */
+    @ApiOperation("鏌ヨ闂璇濇湳璇︽儏鏍规嵁鏉′欢")
+    @PreAuthorize("@ss.hasPermi('system:script:list')")
+    @PostMapping("/selectInfoByCondition")
+    public AjaxResult selectInfoByCondition(@RequestBody IvrLibaScriptVO ivrLibaScriptVO) {
+        if (ObjectUtils.isEmpty(ivrLibaScriptVO)) {
+            throw new BaseException("鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
+        }
+        startPage();
+        IvrLibaScriptVO ivrLibaScriptVO1 = ivrLibaScriptService.selectInfoByCondition(ivrLibaScriptVO);
+        return success(ivrLibaScriptVO1);
+    }
+
+    /**
+     * 鏂板鎴栦慨鏀归棶棰樿鎯�
+     */
+    @ApiOperation("鏂板鎴栦慨鏀归棶棰樿鎯�")
+    @PreAuthorize("@ss.hasPermi('system:script:list')")
+    @PostMapping("/saveOrUpdateScript")
+    public AjaxResult saveOrUpdateScript(@RequestBody IvrLibaScriptVO ivrLibaScriptVO) {
+        if (ObjectUtils.isEmpty(ivrLibaScriptVO)) {
+            throw new BaseException("鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
+        }
+        return success(ivrLibaScriptService.saveOrUpdateScript(ivrLibaScriptVO));
+    }
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java
new file mode 100644
index 0000000..b3428a2
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTagController.java
@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaScriptTag;
+import com.smartor.service.IIvrLibaScriptTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 闂璇濇湳鏍囩搴揅ontroller
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@RestController
+@RequestMapping("/smartor/scripttag")
+public class IvrLibaScriptTagController extends BaseController {
+    @Autowired
+    private IIvrLibaScriptTagService ivrLibaScriptTagService;
+
+    /**
+     * 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
+        startPage();
+        List<IvrLibaScriptTag> list = ivrLibaScriptTagService.selectIvrLibaScriptTagList(ivrLibaScriptTag);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭闂璇濇湳鏍囩搴撳垪琛�
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:export')")
+    @Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, IvrLibaScriptTag ivrLibaScriptTag) {
+        List<IvrLibaScriptTag> list = ivrLibaScriptTagService.selectIvrLibaScriptTagList(ivrLibaScriptTag);
+        ExcelUtil<IvrLibaScriptTag> util = new ExcelUtil<IvrLibaScriptTag>(IvrLibaScriptTag.class);
+        util.exportExcel(response, list, "闂璇濇湳鏍囩搴撴暟鎹�");
+    }
+
+    /**
+     * 鑾峰彇闂璇濇湳鏍囩搴撹缁嗕俊鎭�
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(ivrLibaScriptTagService.selectIvrLibaScriptTagById(id));
+    }
+
+    /**
+     * 鏂板闂璇濇湳鏍囩搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:add')")
+    @Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
+        return toAjax(ivrLibaScriptTagService.insertIvrLibaScriptTag(ivrLibaScriptTag));
+    }
+
+    /**
+     * 淇敼闂璇濇湳鏍囩搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+    @Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody IvrLibaScriptTag ivrLibaScriptTag) {
+        return toAjax(ivrLibaScriptTagService.updateIvrLibaScriptTag(ivrLibaScriptTag));
+    }
+
+    /**
+     * 鍒犻櫎闂璇濇湳鏍囩搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+    @Log(title = "闂璇濇湳鏍囩搴�", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(ivrLibaScriptTagService.deleteIvrLibaScriptTagByIds(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java
new file mode 100644
index 0000000..3759809
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptTargetoptionController.java
@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaScriptTargetoption;
+import com.smartor.service.IIvrLibaScriptTargetoptionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 闂璇濇湳鎸囨爣閫夐」搴揅ontroller
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@RestController
+@RequestMapping("/smartor/scripttargetoption")
+public class IvrLibaScriptTargetoptionController extends BaseController {
+    @Autowired
+    private IIvrLibaScriptTargetoptionService ivrLibaScriptTargetoptionService;
+
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴撳垪琛�
+     */
+    @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
+        startPage();
+        List<IvrLibaScriptTargetoption> list = ivrLibaScriptTargetoptionService.selectIvrLibaScriptTargetoptionList(ivrLibaScriptTargetoption);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭闂璇濇湳鎸囨爣閫夐」搴撳垪琛�
+     */
+    @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
+    @Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
+        List<IvrLibaScriptTargetoption> list = ivrLibaScriptTargetoptionService.selectIvrLibaScriptTargetoptionList(ivrLibaScriptTargetoption);
+        ExcelUtil<IvrLibaScriptTargetoption> util = new ExcelUtil<IvrLibaScriptTargetoption>(IvrLibaScriptTargetoption.class);
+        util.exportExcel(response, list, "闂璇濇湳鎸囨爣閫夐」搴撴暟鎹�");
+    }
+
+    /**
+     * 鑾峰彇闂璇濇湳鎸囨爣閫夐」搴撹缁嗕俊鎭�
+     */
+    @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
+    @GetMapping(value = "/getInfo/{targetoptionid}")
+    public AjaxResult getInfo(@PathVariable("targetoptionid") String targetoptionid) {
+        return success(ivrLibaScriptTargetoptionService.selectIvrLibaScriptTargetoptionByTargetoptionid(targetoptionid));
+    }
+
+    /**
+     * 鏂板闂璇濇湳鎸囨爣閫夐」搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
+    @Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
+        return toAjax(ivrLibaScriptTargetoptionService.insertIvrLibaScriptTargetoption(ivrLibaScriptTargetoption));
+    }
+
+    /**
+     * 淇敼闂璇濇湳鎸囨爣閫夐」搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
+    @Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
+        return toAjax(ivrLibaScriptTargetoptionService.updateIvrLibaScriptTargetoption(ivrLibaScriptTargetoption));
+    }
+
+    /**
+     * 鍒犻櫎闂璇濇湳鎸囨爣閫夐」搴�
+     */
+    @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
+    @Log(title = "闂璇濇湳鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{targetoptionids}")
+    public AjaxResult remove(@PathVariable String[] targetoptionids) {
+        return toAjax(ivrLibaScriptTargetoptionService.deleteIvrLibaScriptTargetoptionByTargetoptionids(targetoptionids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScripttargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScripttargetController.java
deleted file mode 100644
index 4ab6bf3..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScripttargetController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.smartor.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.smartor.domain.IvrLibaScripttarget;
-import com.smartor.service.IIvrLibaScripttargetService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 璇濇湳搴撹瘽鏈寚鏍嘋ontroller
- * 
- * @author smartor
- * @date 2023-03-22
- */
-@RestController
-@RequestMapping("/smartor/ivrscripttarget")
-public class IvrLibaScripttargetController extends BaseController
-{
-    @Autowired
-    private IIvrLibaScripttargetService ivrLibaScripttargetService;
-
-    /**
-     * 鏌ヨ璇濇湳搴撹瘽鏈寚鏍囧垪琛�
-     */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:list')")
-   @PostMapping("/list")
-    public TableDataInfo list(@RequestBody IvrLibaScripttarget ivrLibaScripttarget)
-    {
-        startPage();
-        List<IvrLibaScripttarget> list = ivrLibaScripttargetService.selectIvrLibaScripttargetList(ivrLibaScripttarget);
-        return getDataTable(list);
-    }
-
-    /**
-     * 瀵煎嚭璇濇湳搴撹瘽鏈寚鏍囧垪琛�
-     */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:export')")
-    @Log(title = "璇濇湳搴撹瘽鏈寚鏍�", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, IvrLibaScripttarget ivrLibaScripttarget)
-    {
-        List<IvrLibaScripttarget> list = ivrLibaScripttargetService.selectIvrLibaScripttargetList(ivrLibaScripttarget);
-        ExcelUtil<IvrLibaScripttarget> util = new ExcelUtil<IvrLibaScripttarget>(IvrLibaScripttarget.class);
-        util.exportExcel(response, list, "璇濇湳搴撹瘽鏈寚鏍囨暟鎹�");
-    }
-
-    /**
-     * 鑾峰彇璇濇湳搴撹瘽鏈寚鏍囪缁嗕俊鎭�
-     */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:query')")
-    @GetMapping(value = "/{questionTargetID}")
-    public AjaxResult getInfo(@PathVariable("questionTargetID") String questionTargetID)
-    {
-        return success(ivrLibaScripttargetService.selectIvrLibaScripttargetByQuestionTargetID(questionTargetID));
-    }
-
-    /**
-     * 鏂板璇濇湳搴撹瘽鏈寚鏍�
-     */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:add')")
-    @Log(title = "璇濇湳搴撹瘽鏈寚鏍�", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody IvrLibaScripttarget ivrLibaScripttarget)
-    {
-        return toAjax(ivrLibaScripttargetService.insertIvrLibaScripttarget(ivrLibaScripttarget));
-    }
-
-    /**
-     * 淇敼璇濇湳搴撹瘽鏈寚鏍�
-     */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:edit')")
-    @Log(title = "璇濇湳搴撹瘽鏈寚鏍�", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody IvrLibaScripttarget ivrLibaScripttarget)
-    {
-        return toAjax(ivrLibaScripttargetService.updateIvrLibaScripttarget(ivrLibaScripttarget));
-    }
-
-    /**
-     * 鍒犻櫎璇濇湳搴撹瘽鏈寚鏍�
-     */
-    @PreAuthorize("@ss.hasPermi('smartor:ivrscripttarget:remove')")
-    @Log(title = "璇濇湳搴撹瘽鏈寚鏍�", businessType = BusinessType.DELETE)
-	@GetMapping("/remove/{questionTargetIDs}")
-    public AjaxResult remove(@PathVariable String[] questionTargetIDs)
-    {
-        return toAjax(ivrLibaScripttargetService.deleteIvrLibaScripttargetByQuestionTargetIDs(questionTargetIDs));
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java
index fabb1ba..9ffa85a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetAssortController.java
@@ -10,6 +10,8 @@
 import com.smartor.domain.IvrLibaTargetAssort;
 import com.smartor.domain.IvrLibaTargetAssortVO;
 import com.smartor.service.IIvrLibaTargetAssortService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +25,7 @@
  * @author ruoyi
  * @date 2023-12-14
  */
+@Api(description = "鎸囨爣鍒嗙被")
 @RestController
 @RequestMapping("/smartor/assort")
 public class IvrLibaTargetAssortController extends BaseController
@@ -33,6 +36,7 @@
     /**
      * 鏌ヨ鎸囨爣鍒嗙被鍒楄〃
      */
+    @ApiOperation("鏌ヨ鎸囨爣鍒嗙被鍒楄〃")
     @PreAuthorize("@ss.hasPermi('system:assort:list')")
     @PostMapping("/selectIvrLibaTargetAssortList")
     public TableDataInfo list(@RequestBody    IvrLibaTargetAssort ivrLibaTargetAssort)
@@ -45,6 +49,7 @@
     /**
      * 瀵煎嚭鎸囨爣鍒嗙被鍒楄〃
      */
+    @ApiOperation("瀵煎嚭鎸囨爣鍒嗙被鍒楄〃")
     @PreAuthorize("@ss.hasPermi('system:assort:export')")
     @Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -58,6 +63,7 @@
     /**
      * 鑾峰彇鎸囨爣鍒嗙被璇︾粏淇℃伅
      */
+    @ApiOperation("鑾峰彇鎸囨爣鍒嗙被璇︾粏淇℃伅")
     @PreAuthorize("@ss.hasPermi('system:assort:query')")
     @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -68,6 +74,7 @@
     /**
      * 鏂板鎸囨爣鍒嗙被
      */
+    @ApiOperation("鏂板鎸囨爣鍒嗙被")
     @PreAuthorize("@ss.hasPermi('system:assort:add')")
     @Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.INSERT)
     @PostMapping("/add")
@@ -79,6 +86,7 @@
     /**
      * 淇敼鎸囨爣鍒嗙被
      */
+    @ApiOperation("淇敼鎸囨爣鍒嗙被")
     @PreAuthorize("@ss.hasPermi('system:assort:edit')")
     @Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
@@ -90,6 +98,7 @@
     /**
      * 鍒犻櫎鎸囨爣鍒嗙被
      */
+    @ApiOperation("鍒犻櫎鎸囨爣鍒嗙被")
     @PreAuthorize("@ss.hasPermi('system:assort:remove')")
     @Log(title = "鎸囨爣鍒嗙被", businessType = BusinessType.DELETE)
 	@GetMapping("/remove/{ids}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
index c0ebcae..c0f7605 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
@@ -1,7 +1,8 @@
 package com.ruoyi.web.controller.smartor;
 
-import cn.hutool.db.Page;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -9,7 +10,11 @@
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.IvrLibaTarget;
+import com.smartor.domain.IvrLibaTargetAssort;
+import com.smartor.domain.IvrLibaTargetVO;
 import com.smartor.service.IIvrLibaTargetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +28,7 @@
  * @author ruoyi
  * @date 2023-12-14
  */
+@Api(description = "鎸囨爣搴�")
 @RestController
 @RequestMapping("/smartor/target")
 public class IvrLibaTargetController extends BaseController {
@@ -32,19 +38,21 @@
     /**
      * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
      */
+    @ApiOperation("鏌ヨ鎸囨爣鍒楄〃")
     @PreAuthorize("@ss.hasPermi('system:target:list')")
     @PostMapping("/list")
-    public TableDataInfo list(@RequestBody    IvrLibaTarget ivrLibaTarget) {
-        PageUtils.startPageByPost(ivrLibaTarget.getPageNum(),ivrLibaTarget.getPageSize());
+    public TableDataInfo list(@RequestBody IvrLibaTarget ivrLibaTarget) {
+        PageUtils.startPageByPost(ivrLibaTarget.getPageNum(), ivrLibaTarget.getPageSize());
         List<IvrLibaTarget> list = ivrLibaTargetService.selectIvrLibaTargetList(ivrLibaTarget);
         return getDataTable(list);
     }
 
     /**
-     * 瀵煎嚭鎸囨爣閫夐」搴撳垪琛�
+     * 瀵煎嚭鎸囨爣鍒楄〃
      */
     @PreAuthorize("@ss.hasPermi('system:target:export')")
-    @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
+    @Log(title = "鎸囨爣搴�", businessType = BusinessType.EXPORT)
+    @ApiOperation("瀵煎嚭鎸囨爣鍒楄〃")
     @PostMapping("/export")
     public void export(HttpServletResponse response, IvrLibaTarget ivrLibaTarget) {
         List<IvrLibaTarget> list = ivrLibaTargetService.selectIvrLibaTargetList(ivrLibaTarget);
@@ -53,8 +61,9 @@
     }
 
     /**
-     * 鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭�
+     * 鑾峰彇鎸囨爣淇℃伅閫氳繃targetID
      */
+    @ApiOperation("鑾峰彇鎸囨爣淇℃伅閫氳繃targetID")
     @PreAuthorize("@ss.hasPermi('system:target:query')")
     @GetMapping(value = "/getInfo/{targetID}")
     public AjaxResult getInfo(@PathVariable("targetID") Long targetID) {
@@ -62,32 +71,58 @@
     }
 
     /**
-     * 鏂板鎸囨爣閫夐」搴�
+     * 鏂板鎸囨爣
      */
     @PreAuthorize("@ss.hasPermi('system:target:add')")
     @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
+    @ApiOperation("鏂板鎸囨爣锛堣繖涓帴鍙f病鍟ョ敤浜嗭紝鐢ㄢ�濇柊澧炴垨淇敼鎸囨爣淇℃伅鈥滆繖涓帴鍙eソ涓�浜涳級")
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody IvrLibaTarget ivrLibaTarget) {
-        return toAjax(ivrLibaTargetService.insertIvrLibaTarget(ivrLibaTarget));
+    public AjaxResult add(@RequestBody IvrLibaTargetVO ivrLibaTargetVO) {
+        return toAjax(ivrLibaTargetService.insertIvrLibaTarget(ivrLibaTargetVO));
     }
 
     /**
-     * 淇敼鎸囨爣閫夐」搴�
+     * 鏂板鎴栦慨鏀规寚鏍囦俊鎭�
      */
+    @ApiOperation("鏂板鎴栦慨鏀规寚鏍囦俊鎭�")
     @PreAuthorize("@ss.hasPermi('system:target:edit')")
     @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody IvrLibaTarget ivrLibaTarget) {
-        return toAjax(ivrLibaTargetService.updateIvrLibaTarget(ivrLibaTarget));
+    @PostMapping("/saveOrupdateIvrLibaTarget")
+    public AjaxResult saveOrupdateIvrLibaTarget(@RequestBody IvrLibaTargetVO ivrLibaTargetVO) {
+        return toAjax(ivrLibaTargetService.saveOrupdateIvrLibaTarget(ivrLibaTargetVO));
     }
 
     /**
-     * 鍒犻櫎鎸囨爣閫夐」搴�
+     * 鍒犻櫎鎸囨爣
      */
+    @ApiOperation("鍒犻櫎鎸囨爣")
     @PreAuthorize("@ss.hasPermi('system:target:remove')")
     @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
     @GetMapping("/remove/{targetIDs}")
     public AjaxResult remove(@PathVariable Long[] targetIDs) {
         return toAjax(ivrLibaTargetService.deleteIvrLibaTargetByTargetIDs(targetIDs));
     }
+
+    /**
+     * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
+     */
+    @ApiOperation("鏌ヨ鎸囨爣鍜屽叧鑱旂殑鎸囨爣閫夐」")
+    @PreAuthorize("@ss.hasPermi('system:target:list')")
+    @PostMapping("/targetInfo")
+    public TableDataInfo targetInfo(@RequestBody IvrLibaTarget ivrLibaTarget) {
+        PageUtils.startPageByPost(ivrLibaTarget.getPageNum(), ivrLibaTarget.getPageSize());
+        //杩欎釜鐢ㄦ潵鑾峰彇鍒嗛〉鏁版嵁
+        List<IvrLibaTargetVO> ivrLibaTargetVOS = ivrLibaTargetService.targetInfo(ivrLibaTarget);
+
+        //鐢ㄤ簬鍒嗛〉
+        List<IvrLibaTarget> ivrLibaTargets = ivrLibaTargetService.selectIvrLibaTargetList(null);
+        //鍒嗛〉
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("鏌ヨ鎴愬姛");
+        rspData.setRows(ivrLibaTargetVOS);
+        rspData.setTotal(new PageInfo(ivrLibaTargets).getTotal());
+
+        return rspData;
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java
new file mode 100644
index 0000000..8a8de25
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetTagController.java
@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaTargetTag;
+import com.smartor.service.IIvrLibaTargetTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎸囨爣鏍囩Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@RestController
+@RequestMapping("/smartor/tag")
+public class IvrLibaTargetTagController extends BaseController {
+    @Autowired
+    private IIvrLibaTargetTagService ivrLibaTargetTagService;
+
+    /**
+     * 鏌ヨ鎸囨爣鏍囩鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
+        startPage();
+        List<IvrLibaTargetTag> list = ivrLibaTargetTagService.selectIvrLibaTargetTagList(ivrLibaTargetTag);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭鎸囨爣鏍囩鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:export')")
+    @Log(title = "鎸囨爣鏍囩", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, IvrLibaTargetTag ivrLibaTargetTag) {
+        List<IvrLibaTargetTag> list = ivrLibaTargetTagService.selectIvrLibaTargetTagList(ivrLibaTargetTag);
+        ExcelUtil<IvrLibaTargetTag> util = new ExcelUtil<IvrLibaTargetTag>(IvrLibaTargetTag.class);
+        util.exportExcel(response, list, "鎸囨爣鏍囩鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇鎸囨爣鏍囩璇︾粏淇℃伅
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(ivrLibaTargetTagService.selectIvrLibaTargetTagById(id));
+    }
+
+    /**
+     * 鏂板鎸囨爣鏍囩
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:add')")
+    @Log(title = "鎸囨爣鏍囩", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
+        return toAjax(ivrLibaTargetTagService.insertIvrLibaTargetTag(ivrLibaTargetTag));
+    }
+
+    /**
+     * 淇敼鎸囨爣鏍囩
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+    @Log(title = "鎸囨爣鏍囩", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody IvrLibaTargetTag ivrLibaTargetTag) {
+        return toAjax(ivrLibaTargetTagService.updateIvrLibaTargetTag(ivrLibaTargetTag));
+    }
+
+    /**
+     * 鍒犻櫎鎸囨爣鏍囩
+     */
+    @PreAuthorize("@ss.hasPermi('system:tag:remove')")
+    @Log(title = "鎸囨爣鏍囩", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(ivrLibaTargetTagService.deleteIvrLibaTargetTagByIds(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java
index 22a407f..beb9402 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetoptionController.java
@@ -9,6 +9,8 @@
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.IvrLibaTargetoption;
 import com.smartor.service.IIvrLibaTargetoptionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -22,6 +24,7 @@
  * @author ruoyi
  * @date 2023-12-14
  */
+@Api(description = "鎸囨爣閫夐」搴�")
 @RestController
 @RequestMapping("/smartor/targetoption")
 public class IvrLibaTargetoptionController extends BaseController
@@ -32,6 +35,7 @@
     /**
      * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
      */
+    @ApiOperation("鏌ヨ鎸囨爣閫夐」搴撳垪琛�")
     @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody    IvrLibaTargetoption ivrLibaTargetoption)
@@ -44,6 +48,7 @@
     /**
      * 瀵煎嚭鎸囨爣閫夐」搴撳垪琛�
      */
+    @ApiOperation("瀵煎嚭鎸囨爣閫夐」搴撳垪琛�")
     @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
     @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -57,6 +62,7 @@
     /**
      * 鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭�
      */
+    @ApiOperation("鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭�")
     @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
     @GetMapping(value = "/getInfo/{targetoptionid}")
     public AjaxResult getInfo(@PathVariable("targetoptionid") Long targetoptionid)
@@ -67,6 +73,7 @@
     /**
      * 鏂板鎸囨爣閫夐」搴�
      */
+    @ApiOperation("鏂板鎸囨爣閫夐」搴�")
     @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
     @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
     @PostMapping("/add")
@@ -78,6 +85,7 @@
     /**
      * 淇敼鎸囨爣閫夐」搴�
      */
+    @ApiOperation("淇敼鎸囨爣閫夐」搴�")
     @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
     @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
@@ -89,6 +97,7 @@
     /**
      * 鍒犻櫎鎸囨爣閫夐」搴�
      */
+    @ApiOperation("鍒犻櫎鎸囨爣閫夐」搴�")
     @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
     @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
 	@GetMapping("/remove/{targetoptionids}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetAssortController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetAssortController.java
new file mode 100644
index 0000000..8e19ac5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplatetargetAssortController.java
@@ -0,0 +1,100 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.IvrLibaTemplatetargetAssort;
+import com.smartor.service.IIvrLibaTemplatetargetAssortService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎸囨爣妯℃澘鍒嗙被Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@Api(description = "鎸囨爣妯℃澘鍒嗙被")
+@RestController
+@RequestMapping("/templatetarget/assort")
+public class IvrLibaTemplatetargetAssortController extends BaseController {
+    @Autowired
+    private IIvrLibaTemplatetargetAssortService ivrLibaTemplatetargetAssortService;
+
+    /**
+     * 鏌ヨ鎸囨爣妯℃澘鍒嗙被鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('system:assort:list')")
+    @PostMapping("/list")
+    @ApiOperation("鏌ヨ鎸囨爣妯℃澘鍒嗙被鍒楄〃")
+    public TableDataInfo list(@RequestBody IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort) {
+        startPage();
+        List<IvrLibaTemplatetargetAssort> list = ivrLibaTemplatetargetAssortService.selectIvrLibaTemplatetargetAssortList(ivrLibaTemplatetargetAssort);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭鎸囨爣妯℃澘鍒嗙被鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('system:assort:export')")
+    @Log(title = "鎸囨爣妯℃澘鍒嗙被", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("瀵煎嚭鎸囨爣妯℃澘鍒嗙被鍒楄〃")
+    public void export(HttpServletResponse response, IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort) {
+        List<IvrLibaTemplatetargetAssort> list = ivrLibaTemplatetargetAssortService.selectIvrLibaTemplatetargetAssortList(ivrLibaTemplatetargetAssort);
+        ExcelUtil<IvrLibaTemplatetargetAssort> util = new ExcelUtil<IvrLibaTemplatetargetAssort>(IvrLibaTemplatetargetAssort.class);
+        util.exportExcel(response, list, "鎸囨爣妯℃澘鍒嗙被鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇鎸囨爣妯℃澘鍒嗙被璇︾粏淇℃伅
+     */
+    @ApiOperation("鑾峰彇鎸囨爣妯℃澘鍒嗙被璇︾粏淇℃伅")
+    @PreAuthorize("@ss.hasPermi('system:assort:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(ivrLibaTemplatetargetAssortService.selectIvrLibaTemplatetargetAssortById(id));
+    }
+
+    /**
+     * 鏂板鎸囨爣妯℃澘鍒嗙被
+     */
+    @ApiOperation("鏂板鎸囨爣妯℃澘鍒嗙被")
+    @PreAuthorize("@ss.hasPermi('system:assort:add')")
+    @Log(title = "鎸囨爣妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort) {
+        return toAjax(ivrLibaTemplatetargetAssortService.insertIvrLibaTemplatetargetAssort(ivrLibaTemplatetargetAssort));
+    }
+
+    /**
+     * 淇敼鎸囨爣妯℃澘鍒嗙被
+     */
+    @ApiOperation("淇敼鎸囨爣妯℃澘鍒嗙被")
+    @PreAuthorize("@ss.hasPermi('system:assort:edit')")
+    @Log(title = "鎸囨爣妯℃澘鍒嗙被", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort) {
+        return toAjax(ivrLibaTemplatetargetAssortService.updateIvrLibaTemplatetargetAssort(ivrLibaTemplatetargetAssort));
+    }
+
+    /**
+     * 鍒犻櫎鎸囨爣妯℃澘鍒嗙被
+     */
+    @ApiOperation("鍒犻櫎鎸囨爣妯℃澘鍒嗙被")
+    @PreAuthorize("@ss.hasPermi('system:assort:remove')")
+    @Log(title = "鎸囨爣妯℃澘鍒嗙被", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(ivrLibaTemplatetargetAssortService.deleteIvrLibaTemplatetargetAssortByIds(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index 6f6c85b..8b37ba3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -38,18 +38,18 @@
 public class PatArchiveController extends BaseController {
     @Autowired
     private IPatArchiveService patArchiveService;
-
-    /**
-     * 鏌ヨ鎮h�呮。妗堝垪琛�
-     */
-    @ApiOperation("鏌ヨ鎮h�呮。妗堝垪琛�")
-    @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
-   @PostMapping("/list")
-    public TableDataInfo list(@RequestBody PatArchive patArchive) {
-        startPage();
-        List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
-        return getDataTable(list);
-    }
+//
+//    /**
+//     * 鏌ヨ鎮h�呮。妗堝垪琛�
+//     */
+//    @ApiOperation("鏌ヨ鎮h�呮。妗堝垪琛�")
+//    @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
+//   @PostMapping("/list")
+//    public TableDataInfo list(@RequestBody PatArchive patArchive) {
+//        startPage();
+//        List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
+//        return getDataTable(list);
+//}
 
     /**
      * 瀵煎嚭鎮h�呮。妗堝垪琛�
@@ -75,26 +75,26 @@
         return success(patArchiveService.selectPatArchiveByPatid(patid));
     }
 
-    /**
-     * 鏂板鎮h�呮。妗�
-     */
-    @ApiOperation("鏂板鎮h�呮。妗�")
-    @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
-    @Log(title = "鎮h�呮。妗�", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody PatArchive patArchive) {
-        return toAjax(patArchiveService.insertPatArchive(patArchive));
-    }
+//    /**
+//     * 鏂板鎮h�呮。妗�
+//     */
+//    @ApiOperation("鏂板鎮h�呮。妗�")
+//    @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
+//    @Log(title = "鎮h�呮。妗�", businessType = BusinessType.INSERT)
+//    @PostMapping("/add")
+//    public AjaxResult add(@RequestBody PatArchive patArchive) {
+//        return toAjax(patArchiveService.insertPatArchive(patArchive));
+//    }
 
     /**
-     * 淇敼鎮h�呮。妗�
+     * 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
      */
-    @ApiOperation("淇敼鎮h�呮。妗�")
+    @ApiOperation("鏂板鎴栦慨鏀规偅鑰呮。淇℃伅")
     @PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
     @Log(title = "鎮h�呮。妗�", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody PatArchive patArchive) {
-        return toAjax(patArchiveService.updatePatArchive(patArchive));
+    @PostMapping("/saveOrUpdatePatInfo")
+    public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
+        return toAjax(patArchiveService.saveOrUpdatePatInfo(patArchiveVO));
     }
 
     /**
@@ -159,20 +159,9 @@
     @ApiOperation("鏌ヨ鎮h�呭垪琛�")
     @PostMapping("/patInfoByContion")
     public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
-        PageUtils.startPageByPost(patArchive.getPageNum(),patArchive.getPageSize());
+        PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
         return getDataTable(patArchiveService.patInfoByContion(patArchive));
     }
-
-
-//    /**
-//     * 鎮h�呮爣绛剧鐞�
-//     */
-//    @ApiOperation("鎮h�呮爣绛剧鐞�")
-//    @PostMapping("/patTagByContion")
-//    public TableDataInfo patTagByContion(@RequestBody List<Long> tagids) {
-//        startPage();
-//        return getDataTable(patArchiveService.patTagByContion(tagids));
-//    }
 
 
     /**
@@ -190,17 +179,6 @@
         }
         ExcelUtil<PatArchive> util = new ExcelUtil<PatArchive>(PatArchive.class);
         util.exportExcel(response, patArchives, "鎮h�呮。妗堟暟鎹�");
-    }
-
-    /**
-     * 鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗堬級
-     *
-     * @return
-     */
-    @ApiOperation("鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗�")
-    @PostMapping("/getUserTreatmentInfo")
-    public AjaxResult getUserTreatmentInfo(@RequestParam("pid") String pid,@RequestParam("type") String type) {
-        return null;
     }
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index a375eeb..cc4b61d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -102,7 +102,7 @@
      */
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "鑿滃崟绠$悊", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java
index 3c44ace..d53be27 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/DingTalkService.java
@@ -120,8 +120,8 @@
     }
 
     public static void main(String[] args) throws ApiException, IOException {
-        String str = "鎴戣繕娌¤传骞冲嚟琛�鏈夊悆杩囬キ";
-        String pattern = "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10";
+        String str = "鎴戣繕涓嶆槸娌℃湁鍚冭繃楗�";
+        String pattern = "[\\u4e00-\\u9fa5]*(鍝鍡瘄涓嶆槸|鍋氫簡|宸茬粡濂戒簡|瀹屾垚)[\\u4e00-\\u9fa5]*";
 
         Pattern r = Pattern.compile(pattern);
         Matcher m = r.matcher(str);
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index a685e06..25efcaf 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -91,6 +91,20 @@
     }
 
     /**
+     * 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected TableDataInfo getDataTable2(List<?> list,List<?> list2)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("鏌ヨ鎴愬姛");
+        rspData.setRows(list2);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
+
+    /**
      * 杩斿洖鎴愬姛
      */
     public AjaxResult success()
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserInfo.java
index 6e595dc..705b88e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserInfo.java
@@ -1,13 +1,11 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 鐢ㄦ埛瀵硅薄 base_user_info
diff --git a/smartor/src/main/java/com/smartor/domain/BaseTag.java b/smartor/src/main/java/com/smartor/domain/BaseTag.java
index d4a0999..e01eafc 100644
--- a/smartor/src/main/java/com/smartor/domain/BaseTag.java
+++ b/smartor/src/main/java/com/smartor/domain/BaseTag.java
@@ -86,6 +86,9 @@
     @ApiModelProperty("鏄惁寮�鍚�  1寮�鍚�   0鍏抽棴")
     private Integer isenable;
 
+    @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+    private Integer isoperation;
+
     /**
      * pageNum
      */
diff --git a/smartor/src/main/java/com/smartor/domain/HeCategory.java b/smartor/src/main/java/com/smartor/domain/HeCategory.java
index 5c709f4..02a8268 100644
--- a/smartor/src/main/java/com/smartor/domain/HeCategory.java
+++ b/smartor/src/main/java/com/smartor/domain/HeCategory.java
@@ -25,49 +25,49 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long id;
 
     /**
      * 鍒嗙被鍚嶇О
      */
-    @ApiModelProperty(name = "鍒嗙被鍚嶇О")
+    @ApiModelProperty(value = "鍒嗙被鍚嶇О")
     private String categoryname;
 
     /**
      * 鏈烘瀯ID
      */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     private String orgid;
 
     /**
      * 鍒犻櫎鏍囪
      */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     private Date uploadTime;
 
     /**
      * 鐖禝D
      */
-    @ApiModelProperty(name = "鐖禝D")
+    @ApiModelProperty(value = "鐖禝D")
     private Long pid;
 
     /**
      * GUID
      */
-    @ApiModelProperty(name = "GUID")
+    @ApiModelProperty(value = "GUID")
     private String guid;
 
     @Override
diff --git a/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java b/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
index 72efeb7..643e9e2 100644
--- a/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
@@ -24,55 +24,55 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long id;
 
     /**
      * 鍒嗙被鍚嶇О
      */
-    @ApiModelProperty(name = "鍒嗙被鍚嶇О")
+    @ApiModelProperty(value = "鍒嗙被鍚嶇О")
     private String categoryname;
 
     /**
      * 鏈烘瀯ID
      */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     private String orgid;
 
     /**
      * 鍒犻櫎鏍囪
      */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     private Date uploadTime;
 
     /**
      * 鐖禝D
      */
-    @ApiModelProperty(name = "鐖禝D")
+    @ApiModelProperty(value = "鐖禝D")
     private Long pid;
 
     /**
      * guid
      */
-    @ApiModelProperty(name = "guid")
+    @ApiModelProperty(value = "guid")
     private String guid;
 
     /**
      * 瀛愭暟鎹�
      */
-    @ApiModelProperty(name = "瀛愭暟鎹�")
+    @ApiModelProperty(value = "瀛愭暟鎹�")
     private List<HeCategory> heCategoryList;
 
     @Override
diff --git a/smartor/src/main/java/com/smartor/domain/Icd10.java b/smartor/src/main/java/com/smartor/domain/Icd10.java
new file mode 100644
index 0000000..faf983c
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/Icd10.java
@@ -0,0 +1,96 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鐤剧梾瀵硅薄 icd10
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@ApiModel(value = "Icd10", description = "鐤剧梾瀵硅薄")
+@Data
+public class Icd10 extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("涓婚敭")
+    private Long icdid;
+
+    /**
+     * icd10缂栫爜
+     */
+    @ApiModelProperty("icd10缂栫爜")
+    @Excel(name = "icd10缂栫爜")
+    private String icdcode;
+
+    /**
+     * icd10鍚嶇О
+     */
+    @ApiModelProperty("icd10鍚嶇О")
+    @Excel(name = "icd10鍚嶇О")
+    private String icdname;
+
+    /**
+     * 鎷奸煶鐮�
+     */
+    @ApiModelProperty("鎷奸煶鐮�")
+    @Excel(name = "鎷奸煶鐮�")
+    private String icdpym;
+
+    /**
+     * 浜旂瑪鐮�
+     */
+    @ApiModelProperty("浜旂瑪鐮�")
+    @Excel(name = "浜旂瑪鐮�")
+    private String icdwbm;
+
+    /**
+     * 鏈烘瀯id
+     */
+    @ApiModelProperty("鏈烘瀯id")
+    @Excel(name = "鏈烘瀯id")
+    private String orgid;
+
+    /**
+     * 鍒犻櫎鏍囪瘑
+     */
+    @ApiModelProperty("鍒犻櫎鏍囪瘑")
+    private String delFlag;
+
+    /**
+     * 鐖禝D
+     */
+    @ApiModelProperty("鐖禝D")
+    @Excel(name = "鐖禝D")
+    private Long pid;
+
+    /**
+     * GUID
+     */
+    @ApiModelProperty("GUID")
+    @Excel(name = "GUID")
+    private String guid;
+
+    /**
+     * pageNum
+     */
+    @ApiModelProperty("pageNum")
+    private Integer pageNum;
+
+    /**
+     * pageSize
+     */
+    @ApiModelProperty("pageSize")
+    private Integer pageSize;
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java
index 4950879..b352175 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java
@@ -1,437 +1,243 @@
 package com.smartor.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 璇濇湳搴撳璞� ivr_liba_script
- * 
- * @author smartor
- * @date 2023-03-22
+ * 闂璇濇湳搴撳璞� ivr_liba_script
+ *
+ * @author ruoyi
+ * @date 2023-12-21
  */
-public class IvrLibaScript extends BaseEntity
-{
+@Data
+@ApiModel(value = "IvrLibaScript", description = "闂璇濇湳搴撳璞�")
+public class IvrLibaScript extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /**    */
-    private String questionid;
+    /**
+     * 闂璇濇湳id
+     */
+    @ApiModelProperty("闂璇濇湳id锛堜富閿級")
+    private Long id;
 
-    /**    */
-    @Excel(name = "  ")
-    private String questionpoint;
+    /**
+     * 闂璇濇湳鏍囬
+     */
+    @ApiModelProperty("闂璇濇湳鏍囬")
+    @Excel(name = "闂璇濇湳鏍囬")
+    private String questiontitle;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 璇濇湳鍐呭
+     */
+    @ApiModelProperty("璇濇湳鍐呭")
+    @Excel(name = "璇濇湳鍐呭")
     private String questiontext;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 璇濇湳璇煶
+     */
+    @ApiModelProperty("璇濇湳璇煶")
+    @Excel(name = "璇濇湳璇煶")
     private String questionvoice;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 鏃犲尮閰嶈瘽鏈�
+     */
+    @ApiModelProperty("鏃犲尮閰嶈瘽鏈�")
+    @Excel(name = "鏃犲尮閰嶈瘽鏈�")
     private String nomatchtext;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 鏃犲尮閰嶈瘽鏈闊�
+     */
+    @ApiModelProperty("鏃犲尮閰嶈瘽鏈闊�")
+    @Excel(name = "鏃犲尮閰嶈瘽鏈闊�")
     private String nomatchvoice;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 闈欓粯璇濇湳
+     */
+    @ApiModelProperty("闈欓粯璇濇湳")
+    @Excel(name = "闈欓粯璇濇湳")
     private String sliencetext;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 闈欓粯璇濇湳璇煶
+     */
+    @ApiModelProperty("闈欓粯璇濇湳璇煶")
+    @Excel(name = "闈欓粯璇濇湳璇煶")
     private String sliencevoice;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 閫氱敤搴撳尮閰嶅悗璇濇湳
+     */
+    @ApiModelProperty("閫氱敤搴撳尮閰嶅悗璇濇湳")
+    @Excel(name = "閫氱敤搴撳尮閰嶅悗璇濇湳")
     private String submoduletext;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 閫氱敤搴撳尮閰嶅悗璇濇湳璇煶
+     */
+    @ApiModelProperty("閫氱敤搴撳尮閰嶅悗璇濇湳璇煶")
+    @Excel(name = "閫氱敤搴撳尮閰嶅悗璇濇湳璇煶")
     private String submodulevoice;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 鍚笉娓呰瘽鏈�
+     */
+    @ApiModelProperty("鍚笉娓呰瘽鏈�")
+    @Excel(name = "鍚笉娓呰瘽鏈�")
     private String noclearlytext;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 鍚笉娓呰瘽鏈闊�
+     */
+    @ApiModelProperty("鍚笉娓呰瘽鏈闊�")
+    @Excel(name = "鍚笉娓呰瘽鏈闊�")
     private String noclearlyvoice;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 闂绫诲瀷
+     */
+    @ApiModelProperty("闂绫诲瀷")
+    @Excel(name = "闂绫诲瀷 ")
     private String questiontype;
 
-    /**    */
-    @Excel(name = "  ")
-    private String categoryname;
+    /**
+     * 瀵瑰簲鐨刬vr_liba_target琛ㄧ殑涓婚敭
+     */
+    @ApiModelProperty("瀵瑰簲鐨刬vr_liba_target琛ㄧ殑涓婚敭")
+    @Excel(name = "瀵瑰簲鐨刬vr_liba_target琛ㄧ殑涓婚敭")
+    private Long targetid;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 鎸囨爣鍚嶇О
+     */
+    @ApiModelProperty("鎸囨爣鍚嶇О")
+    @Excel(name = "鎸囨爣鍚嶇О")
+    private String targetname;
+
+    /**
+     * 鎸囨爣鏍囬�夐」姹囨��
+     */
+    @ApiModelProperty("鎸囨爣鏍囬�夐」姹囨��")
+    @Excel(name = "鎸囨爣鏍囬�夐」姹囨��")
     private String targetoptions;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     * 閫傜敤璇█
+     */
+    @ApiModelProperty("閫傜敤璇█")
+    @Excel(name = "閫傜敤璇█")
     private String language;
-    /**    */
-    @Excel(name = "  ")
-    private String note;
 
-    /**    */
-    @Excel(name = "  ")
-    private Long version;
+    /**
+     * 鐗堟湰
+     */
+    @ApiModelProperty("鐗堟湰")
+    @Excel(name = "鐗堟湰")
+    private String version;
 
-    /**    */
-    @Excel(name = "  ")
-    private Long isenable;
+    /**
+     * 鍚敤鐘舵��
+     */
+    @ApiModelProperty("鍚敤鐘舵��")
+    @Excel(name = "鍚敤鐘舵��")
+    private Long usestate;
 
-    /**    */
-    @Excel(name = "  ")
-    private Long isdel;
-
-    /**    */
-    @Excel(name = "  ")
+    /**
+     *
+     */
+    @ApiModelProperty("娣诲姞浜篒D")
+    @Excel(name = "娣诲姞浜篒D")
     private String adduserid;
 
-    /**    */
+    /**
+     *
+     */
+    @ApiModelProperty("娣诲姞鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "娣诲姞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private Date addtime;
 
-    /**    */
-    @Excel(name = "  ")
+    /**
+     *
+     */
+    @ApiModelProperty("璋冩暣浜篿d")
+    @Excel(name = "璋冩暣浜篿d")
     private String modifyuserid;
 
-    /**    */
+    /**
+     *
+     */
+    @ApiModelProperty("璋冩暣鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "璋冩暣鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private Date modifytime;
 
-    /**    */
-    @Excel(name = "  ")
-    private String groupid;
+    /**
+     * 鍒嗙被id
+     */
+    @ApiModelProperty("鍒嗙被id")
+    @Excel(name = "鍒嗙被id")
+    private String assortid;
 
-    /**  鍒犻櫎鏍囪  */
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty("鍒犻櫎鏍囪")
     private String delFlag;
 
-    /**  涓婁紶鏍囪  */
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty("涓婁紶鏍囪")
     @Excel(name = " 涓婁紶鏍囪 ")
     private Long isupload;
 
-    /**  涓婁紶鏃堕棿  */
+    /**
+     * 鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級
+     */
+    @ApiModelProperty(value = "鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級")
+    @Excel(name = "鍊肩被鍨�", readConverterExp = "1=,閫�=椤�,2=,鏂�=鏈�,3=,鏁�=鍊�")
+    private Long isenable;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty("涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date uploadTime;
 
-    /**  鏈烘瀯ID  */
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty("鏈烘瀯ID")
     @Excel(name = " 鏈烘瀯ID ")
     private String orgid;
 
-    public void setQuestionid(String questionid) 
-    {
-        this.questionid = questionid;
-    }
+    /**
+     * 鐖禝D
+     */
+    @ApiModelProperty("鐖禝D")
+    @Excel(name = "鐖禝D")
+    private Long pid;
 
-    public String getQuestionid() 
-    {
-        return questionid;
-    }
-    public void setQuestionpoint(String questionpoint) 
-    {
-        this.questionpoint = questionpoint;
-    }
+    /**
+     * GUID
+     */
+    @ApiModelProperty("GUID")
+    @Excel(name = "GUID")
+    private String guid;
 
-    public String getQuestionpoint() 
-    {
-        return questionpoint;
-    }
-    public void setQuestiontext(String questiontext) 
-    {
-        this.questiontext = questiontext;
-    }
-
-    public String getQuestiontext() 
-    {
-        return questiontext;
-    }
-    public void setQuestionvoice(String questionvoice) 
-    {
-        this.questionvoice = questionvoice;
-    }
-
-    public String getQuestionvoice() 
-    {
-        return questionvoice;
-    }
-    public void setNomatchtext(String nomatchtext) 
-    {
-        this.nomatchtext = nomatchtext;
-    }
-
-    public String getNomatchtext() 
-    {
-        return nomatchtext;
-    }
-    public void setNomatchvoice(String nomatchvoice) 
-    {
-        this.nomatchvoice = nomatchvoice;
-    }
-
-    public String getNomatchvoice() 
-    {
-        return nomatchvoice;
-    }
-    public void setSliencetext(String sliencetext) 
-    {
-        this.sliencetext = sliencetext;
-    }
-
-    public String getSliencetext() 
-    {
-        return sliencetext;
-    }
-    public void setSliencevoice(String sliencevoice) 
-    {
-        this.sliencevoice = sliencevoice;
-    }
-
-    public String getSliencevoice() 
-    {
-        return sliencevoice;
-    }
-    public void setSubmoduletext(String submoduletext) 
-    {
-        this.submoduletext = submoduletext;
-    }
-
-    public String getSubmoduletext() 
-    {
-        return submoduletext;
-    }
-    public void setSubmodulevoice(String submodulevoice) 
-    {
-        this.submodulevoice = submodulevoice;
-    }
-
-    public String getSubmodulevoice() 
-    {
-        return submodulevoice;
-    }
-    public void setNoclearlytext(String noclearlytext) 
-    {
-        this.noclearlytext = noclearlytext;
-    }
-
-    public String getNoclearlytext() 
-    {
-        return noclearlytext;
-    }
-    public void setNoclearlyvoice(String noclearlyvoice) 
-    {
-        this.noclearlyvoice = noclearlyvoice;
-    }
-
-    public String getNoclearlyvoice() 
-    {
-        return noclearlyvoice;
-    }
-    public void setQuestiontype(String questiontype) 
-    {
-        this.questiontype = questiontype;
-    }
-
-    public String getQuestiontype() 
-    {
-        return questiontype;
-    }
-    public void setCategoryname(String categoryname) 
-    {
-        this.categoryname = categoryname;
-    }
-
-    public String getCategoryname() 
-    {
-        return categoryname;
-    }
-    public void setTargetoptions(String targetoptions) 
-    {
-        this.targetoptions = targetoptions;
-    }
-
-    public String getTargetoptions() 
-    {
-        return targetoptions;
-    }
-    public void setLanguage(String language) 
-    {
-        this.language = language;
-    }
-
-    public String getLanguage() 
-    {
-        return language;
-    }
-    public void setNote(String note)
-    {
-        this.note = note;
-    }
-
-    public String getNote()
-    {
-        return note;
-    }
-    public void setVersion(Long version) 
-    {
-        this.version = version;
-    }
-
-    public Long getVersion() 
-    {
-        return version;
-    }
-    public void setIsenable(Long isenable) 
-    {
-        this.isenable = isenable;
-    }
-
-    public Long getIsenable() 
-    {
-        return isenable;
-    }
-    public void setIsdel(Long isdel) 
-    {
-        this.isdel = isdel;
-    }
-
-    public Long getIsdel() 
-    {
-        return isdel;
-    }
-    public void setAdduserid(String adduserid) 
-    {
-        this.adduserid = adduserid;
-    }
-
-    public String getAdduserid() 
-    {
-        return adduserid;
-    }
-    public void setAddtime(Date addtime) 
-    {
-        this.addtime = addtime;
-    }
-
-    public Date getAddtime() 
-    {
-        return addtime;
-    }
-    public void setModifyuserid(String modifyuserid) 
-    {
-        this.modifyuserid = modifyuserid;
-    }
-
-    public String getModifyuserid() 
-    {
-        return modifyuserid;
-    }
-    public void setModifytime(Date modifytime) 
-    {
-        this.modifytime = modifytime;
-    }
-
-    public Date getModifytime() 
-    {
-        return modifytime;
-    }
-    public void setGroupid(String groupid) 
-    {
-        this.groupid = groupid;
-    }
-
-    public String getGroupid() 
-    {
-        return groupid;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setIsupload(Long isupload) 
-    {
-        this.isupload = isupload;
-    }
-
-    public Long getIsupload() 
-    {
-        return isupload;
-    }
-    public void setUploadTime(Date uploadTime) 
-    {
-        this.uploadTime = uploadTime;
-    }
-
-    public Date getUploadTime() 
-    {
-        return uploadTime;
-    }
-    public void setOrgid(String orgid) 
-    {
-        this.orgid = orgid;
-    }
-
-    public String getOrgid() 
-    {
-        return orgid;
-    }
-
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("questionid", getQuestionid())
-            .append("questionpoint", getQuestionpoint())
-            .append("questiontext", getQuestiontext())
-            .append("questionvoice", getQuestionvoice())
-            .append("nomatchtext", getNomatchtext())
-            .append("nomatchvoice", getNomatchvoice())
-            .append("sliencetext", getSliencetext())
-            .append("sliencevoice", getSliencevoice())
-            .append("submoduletext", getSubmoduletext())
-            .append("submodulevoice", getSubmodulevoice())
-            .append("noclearlytext", getNoclearlytext())
-            .append("noclearlyvoice", getNoclearlyvoice())
-            .append("questiontype", getQuestiontype())
-            .append("categoryname", getCategoryname())
-            .append("targetoptions", getTargetoptions())
-            .append("language", getLanguage())
-                .append("note", getNote())
-            .append("version", getVersion())
-            .append("isenable", getIsenable())
-            .append("isdel", getIsdel())
-            .append("adduserid", getAdduserid())
-            .append("addtime", getAddtime())
-            .append("modifyuserid", getModifyuserid())
-            .append("modifytime", getModifytime())
-            .append("groupid", getGroupid())
-            .append("delFlag", getDelFlag())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("isupload", getIsupload())
-            .append("uploadTime", getUploadTime())
-            .append("orgid", getOrgid())
-            .toString();
-    }
 }
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java
new file mode 100644
index 0000000..9f2de25
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java
@@ -0,0 +1,50 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 闂璇濇湳鍒嗙被搴�
+ * 瀵硅薄 ivr_liba_script_assort
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Data
+@ApiModel(value = "IvrLibaScriptAssort", description = "闂璇濇湳鍒嗙被搴�")
+public class IvrLibaScriptAssort extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("涓婚敭")
+    private Long id;
+
+    /**
+     * 鎸囨爣鍒嗙被鍚嶇О
+     */
+    @ApiModelProperty("鎸囨爣鍒嗙被鍚嶇О")
+    @Excel(name = "鎸囨爣鍒嗙被鍚嶇О")
+    private String indexAssortName;
+
+    /**
+     * 鍒犻櫎
+     */
+    @ApiModelProperty("鍒犻櫎")
+    private String delFlag;
+
+    /**
+     * 鐖秈d
+     */
+    @ApiModelProperty("鐖秈d")
+    @Excel(name = "鐖秈d")
+    private Long pid;
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java
new file mode 100644
index 0000000..1c457d3
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java
@@ -0,0 +1,56 @@
+package com.smartor.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鍒嗙被灞曠ず搴�
+ * 瀵硅薄 ivr_liba_script_assort
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Data
+@ApiModel(value = "IvrLibaScriptAssortVO", description = "闂璇濇湳鍒嗙被灞曠ず搴�")
+public class IvrLibaScriptAssortVO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("涓婚敭")
+    private Long id;
+
+    /**
+     * 鎸囨爣鍒嗙被鍚嶇О
+     */
+    @ApiModelProperty("鎸囨爣鍒嗙被鍚嶇О")
+    @Excel(name = "鎸囨爣鍒嗙被鍚嶇О")
+    private String indexAssortName;
+
+    /**
+     * 鍒犻櫎
+     */
+    @ApiModelProperty("鍒犻櫎")
+    private String delFlag;
+
+    /**
+     * 鐖秈d
+     */
+    @ApiModelProperty("鐖秈d")
+    @Excel(name = "鐖秈d")
+    private Long pid;
+
+
+    /**
+     * 瀛愭暟鎹�
+     */
+    @ApiModelProperty(value = "瀛愭暟鎹�")
+    private List<IvrLibaScriptAssort> ivrLibaScriptAssortList;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptTag.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptTag.java
new file mode 100644
index 0000000..7af1097
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptTag.java
@@ -0,0 +1,91 @@
+package com.smartor.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 闂璇濇湳鏍囩搴撳璞� ivr_liba_script_tag
+ * 
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Data
+@ApiModel(value = "IvrLibaScriptTag", description = "闂璇濇湳鏍囩搴撳璞�")
+public class IvrLibaScriptTag extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  鑷ID  */
+    @ApiModelProperty("涓婚敭")
+    private Long id;
+
+    /**  鏍囩鍒嗙被ID  */
+    @ApiModelProperty("鏍囩鍒嗙被ID")
+    @Excel(name = " 鏍囩鍒嗙被ID ")
+    private Long tagcategoryid;
+
+    /**  鏍囩ID  */
+    @ApiModelProperty("鏍囩ID")
+    @Excel(name = " 鏍囩ID ")
+    private Long tagid;
+
+    /**  ivr_liba_script 鐨勪富閿�  */
+    @ApiModelProperty("ivr_liba_script 鐨勪富閿�")
+    @Excel(name = " ivr_liba_script 鐨勪富閿� ")
+    private Long scriptid;
+
+    /**  鏈烘瀯ID  */
+    @ApiModelProperty("鏈烘瀯ID")
+    @Excel(name = " 鏈烘瀯ID ")
+    private String orgid;
+
+    /**  鍒犻櫎鏍囪  */
+    @ApiModelProperty("鍒犻櫎鏍囪")
+    private String delFlag;
+
+    /**  涓婁紶鏍囪  */
+    @ApiModelProperty("涓婁紶鏍囪")
+    @Excel(name = " 涓婁紶鏍囪 ")
+    private Long isupload;
+
+    /**  涓婁紶鏃堕棿  */
+    @ApiModelProperty("涓婁紶鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /** 鏍囩ID  */
+    @ApiModelProperty("鏍囩ID")
+    @Excel(name = "鏍囩ID ")
+    private Long targetid;
+
+    /** 鐖禝D */
+    @ApiModelProperty("鐖禝D")
+    @Excel(name = "鐖禝D")
+    private Long pid;
+
+    /** GUID */
+    @ApiModelProperty("GUID")
+    @Excel(name = "GUID")
+    private String guid;
+
+    /** 鏍囩鍚� */
+    @ApiModelProperty("鏍囩鍚�")
+    @Excel(name = "鏍囩鍚�")
+    private String tagname;
+
+    /**
+     * 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
+     */
+    @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+    private Integer isoperation;
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptTargetoption.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptTargetoption.java
new file mode 100644
index 0000000..65fd160
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptTargetoption.java
@@ -0,0 +1,170 @@
+package com.smartor.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 闂璇濇湳鎸囨爣閫夐」搴撳璞� ivr_liba_script_targetoption
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Data
+@ApiModel(value = "IvrLibaScriptTargetoption", description = "闂璇濇湳鎸囨爣閫夐」搴撳璞�")
+public class IvrLibaScriptTargetoption extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("涓婚敭")
+    private Long id;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("鎸囨爣ID")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long targetid;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("闂ID")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long scriptid;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("涓婚敭")
+    @Excel(name = "${鎸囨爣绫诲瀷}", readConverterExp = "$column.readConverterExp()")
+    private String targettype;
+
+    /**
+     * 绫诲埆鍚嶇О
+     */
+    @Excel(name = "绫诲埆鍚嶇О")
+    @ApiModelProperty("绫诲埆鍚嶇О")
+    private String categoryName;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("鎸囨爣鍊�")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String targetvalue;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("鎸囨爣姝e垯")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String targetregex;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("閫夐」鎻忚堪")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String optiondesc;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("璇█")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String language;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("鐗堟湰")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long version;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("鍒嗙粍ID")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String groupid;
+
+    /**
+     * 鏄惁寮傚父鏍囪瘑
+     */
+    @ApiModelProperty("鏄惁寮傚父鏍囪瘑")
+    @Excel(name = "鏄惁寮傚父鏍囪瘑")
+    private Long isabnormal;
+
+    /**
+     * 棰勮闃�鍊间笂闄�
+     */
+    @ApiModelProperty("棰勮闃�鍊间笂闄�")
+    @Excel(name = "棰勮闃�鍊间笂闄�")
+    private Long warnup;
+
+    /**
+     * 棰勮闃�鍊间笅闄�
+     */
+    @ApiModelProperty("棰勮闃�鍊间笅闄�")
+    @Excel(name = "棰勮闃�鍊间笅闄�")
+    private Long warndown;
+
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty("鍒犻櫎鏍囪")
+    private String delFlag;
+
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty("涓婁紶鏍囪")
+    @Excel(name = " 涓婁紶鏍囪 ")
+    private Long isupload;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty("涓婁紶鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty("鏈烘瀯ID")
+    @Excel(name = " 鏈烘瀯ID ")
+    private String orgid;
+
+    /**
+     * 鐖禝D
+     */
+    @ApiModelProperty("鐖禝D")
+    @Excel(name = "鐖禝D")
+    private Long pid;
+
+    /**
+     * GUID
+     */
+    @ApiModelProperty("GUID")
+    @Excel(name = "GUID")
+    private String guid;
+
+    /**
+     * 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
+     */
+    @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+    private Integer isoperation;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java
new file mode 100644
index 0000000..88ad61a
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java
@@ -0,0 +1,254 @@
+package com.smartor.domain;
+
+import afu.org.checkerframework.checker.igj.qual.I;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 闂璇濇湳搴撳璞� ivr_liba_script
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Data
+@ApiModel(value = "IvrLibaScriptVO", description = "闂璇濇湳搴撳叆鍙傚璞�")
+public class IvrLibaScriptVO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 闂璇濇湳id
+     */
+    @ApiModelProperty("闂璇濇湳id锛堜富閿級")
+    private Long id;
+
+
+    /**
+     * 鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級
+     */
+    @ApiModelProperty("鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級")
+    private Long isenable;
+
+    /**
+     * 闂璇濇湳鏍囬
+     */
+    @ApiModelProperty("闂璇濇湳鏍囬")
+    @Excel(name = "闂璇濇湳鏍囬")
+    private String questiontitle;
+
+    /**
+     * 璇濇湳鍐呭
+     */
+    @ApiModelProperty("璇濇湳鍐呭")
+    @Excel(name = "璇濇湳鍐呭")
+    private String questiontext;
+
+    /**
+     * 璇濇湳璇煶
+     */
+    @ApiModelProperty("璇濇湳璇煶")
+    @Excel(name = "璇濇湳璇煶")
+    private String questionvoice;
+
+    /**
+     * 鏃犲尮閰嶈瘽鏈�
+     */
+    @ApiModelProperty("鏃犲尮閰嶈瘽鏈�")
+    @Excel(name = "鏃犲尮閰嶈瘽鏈�")
+    private String nomatchtext;
+
+    /**
+     * 鏃犲尮閰嶈瘽鏈闊�
+     */
+    @ApiModelProperty("鏃犲尮閰嶈瘽鏈闊�")
+    @Excel(name = "鏃犲尮閰嶈瘽鏈闊�")
+    private String nomatchvoice;
+
+    /**
+     * 闈欓粯璇濇湳
+     */
+    @ApiModelProperty("闈欓粯璇濇湳")
+    @Excel(name = "闈欓粯璇濇湳")
+    private String sliencetext;
+
+    /**
+     * 闈欓粯璇濇湳璇煶
+     */
+    @ApiModelProperty("闈欓粯璇濇湳璇煶")
+    @Excel(name = "闈欓粯璇濇湳璇煶")
+    private String sliencevoice;
+
+    /**
+     * 閫氱敤搴撳尮閰嶅悗璇濇湳
+     */
+    @ApiModelProperty("閫氱敤搴撳尮閰嶅悗璇濇湳")
+    @Excel(name = "閫氱敤搴撳尮閰嶅悗璇濇湳")
+    private String submoduletext;
+
+    /**
+     * 閫氱敤搴撳尮閰嶅悗璇濇湳璇煶
+     */
+    @ApiModelProperty("閫氱敤搴撳尮閰嶅悗璇濇湳璇煶")
+    @Excel(name = "閫氱敤搴撳尮閰嶅悗璇濇湳璇煶")
+    private String submodulevoice;
+
+    /**
+     * 鍚笉娓呰瘽鏈�
+     */
+    @ApiModelProperty("鍚笉娓呰瘽鏈�")
+    @Excel(name = "鍚笉娓呰瘽鏈�")
+    private String noclearlytext;
+
+    /**
+     * 鍚笉娓呰瘽鏈闊�
+     */
+    @ApiModelProperty("鍚笉娓呰瘽鏈闊�")
+    @Excel(name = "鍚笉娓呰瘽鏈闊�")
+    private String noclearlyvoice;
+
+    /**
+     * 闂绫诲瀷
+     */
+    @ApiModelProperty("闂绫诲瀷")
+    @Excel(name = "闂绫诲瀷 ")
+    private String questiontype;
+
+    /**
+     * 瀵瑰簲鐨刬vr_liba_target琛ㄧ殑涓婚敭
+     */
+    @ApiModelProperty("瀵瑰簲鐨刬vr_liba_target琛ㄧ殑涓婚敭")
+    @Excel(name = "瀵瑰簲鐨刬vr_liba_target琛ㄧ殑涓婚敭")
+    private Long targetid;
+
+    /**
+     * 鎸囨爣鍚嶇О
+     */
+    @ApiModelProperty("鎸囨爣鍚嶇О")
+    @Excel(name = "鎸囨爣鍚嶇О")
+    private String targetname;
+
+    /**
+     * 鎸囨爣鏍囬�夐」姹囨��
+     */
+    @ApiModelProperty("鎸囨爣鏍囬�夐」姹囨��")
+    @Excel(name = "鎸囨爣鏍囬�夐」姹囨��")
+    private String targetoptions;
+
+    /**
+     * 閫傜敤璇█
+     */
+    @ApiModelProperty("閫傜敤璇█")
+    @Excel(name = "閫傜敤璇█")
+    private String language;
+
+    /**
+     * 鐗堟湰
+     */
+    @ApiModelProperty("鐗堟湰")
+    @Excel(name = "鐗堟湰")
+    private String version;
+
+    /**
+     * 鍚敤鐘舵��
+     */
+    @ApiModelProperty("鍚敤鐘舵��")
+    @Excel(name = "鍚敤鐘舵��")
+    private Long usestate;
+
+    /**
+     *
+     */
+    @ApiModelProperty("娣诲姞浜篒D")
+    @Excel(name = "娣诲姞浜篒D")
+    private String adduserid;
+
+    /**
+     *
+     */
+    @ApiModelProperty("娣诲姞鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "娣诲姞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date addtime;
+
+    /**
+     *
+     */
+    @ApiModelProperty("璋冩暣浜篿d")
+    @Excel(name = "璋冩暣浜篿d")
+    private String modifyuserid;
+
+    /**
+     *
+     */
+    @ApiModelProperty("璋冩暣鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "璋冩暣鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modifytime;
+
+    /**
+     * 鍒嗙被id
+     */
+    @ApiModelProperty("鍒嗙被id")
+    @Excel(name = "鍒嗙被id")
+    private String assortid;
+
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty("鍒犻櫎鏍囪")
+    private String delFlag;
+
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty("涓婁紶鏍囪")
+    @Excel(name = " 涓婁紶鏍囪 ")
+    private Long isupload;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty("涓婁紶鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty("鏈烘瀯ID")
+    @Excel(name = " 鏈烘瀯ID ")
+    private String orgid;
+
+    /**
+     * 鎸囨爣闆嗗悎
+     */
+    @ApiModelProperty("鎸囨爣闆嗗悎")
+    private List<IvrLibaScriptTarget> ivrLibaScriptTargetList;
+
+
+    /**
+     * 闂鎸囨爣閫夐」闆嗗悎
+     */
+    @ApiModelProperty("闂鎸囨爣閫夐」闆嗗悎")
+    private List<IvrLibaScriptTargetoption> ivrLibaScriptTargetoptionList;
+
+    /**
+     * 闂鏍囩闆嗗悎
+     */
+    @ApiModelProperty("闂鏍囩闆嗗悎")
+    private List<IvrLibaScriptTag> ivrLibaScriptTagList;
+
+    /**
+     * 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
+     */
+    @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+    private Integer isoperation;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScripttarget.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScripttarget.java
deleted file mode 100644
index da4d86f..0000000
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaScripttarget.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package com.smartor.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 璇濇湳搴撹瘽鏈寚鏍囧璞� ivr_liba_scripttarget
- * 
- * @author smartor
- * @date 2023-03-22
- */
-public class IvrLibaScripttarget extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private String questionTargetID;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String questionID;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String targetID;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String targetType;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String categoryName;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String targetValue;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String basicRegex;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String selfRegex;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String regexUsedType;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long sort;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long version;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long isEnable;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long isDel;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String tipsJson;
-
-    /**  鍒犻櫎鏍囪  */
-    private String delFlag;
-
-    /**  涓婁紶鏍囪  */
-    @Excel(name = " 涓婁紶鏍囪 ")
-    private Long isupload;
-
-    /**  涓婁紶鏃堕棿  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date uploadTime;
-
-    /**  鏈烘瀯ID  */
-    @Excel(name = " 鏈烘瀯ID ")
-    private String orgid;
-
-    public void setQuestionTargetID(String questionTargetID) 
-    {
-        this.questionTargetID = questionTargetID;
-    }
-
-    public String getQuestionTargetID() 
-    {
-        return questionTargetID;
-    }
-    public void setQuestionID(String questionID) 
-    {
-        this.questionID = questionID;
-    }
-
-    public String getQuestionID() 
-    {
-        return questionID;
-    }
-    public void setTargetID(String targetID) 
-    {
-        this.targetID = targetID;
-    }
-
-    public String getTargetID() 
-    {
-        return targetID;
-    }
-    public void setTargetType(String targetType) 
-    {
-        this.targetType = targetType;
-    }
-
-    public String getTargetType() 
-    {
-        return targetType;
-    }
-    public void setCategoryName(String categoryName) 
-    {
-        this.categoryName = categoryName;
-    }
-
-    public String getCategoryName() 
-    {
-        return categoryName;
-    }
-    public void setTargetValue(String targetValue) 
-    {
-        this.targetValue = targetValue;
-    }
-
-    public String getTargetValue() 
-    {
-        return targetValue;
-    }
-    public void setBasicRegex(String basicRegex) 
-    {
-        this.basicRegex = basicRegex;
-    }
-
-    public String getBasicRegex() 
-    {
-        return basicRegex;
-    }
-    public void setSelfRegex(String selfRegex) 
-    {
-        this.selfRegex = selfRegex;
-    }
-
-    public String getSelfRegex() 
-    {
-        return selfRegex;
-    }
-    public void setRegexUsedType(String regexUsedType) 
-    {
-        this.regexUsedType = regexUsedType;
-    }
-
-    public String getRegexUsedType() 
-    {
-        return regexUsedType;
-    }
-    public void setSort(Long sort) 
-    {
-        this.sort = sort;
-    }
-
-    public Long getSort() 
-    {
-        return sort;
-    }
-    public void setVersion(Long version) 
-    {
-        this.version = version;
-    }
-
-    public Long getVersion() 
-    {
-        return version;
-    }
-    public void setIsEnable(Long isEnable) 
-    {
-        this.isEnable = isEnable;
-    }
-
-    public Long getIsEnable() 
-    {
-        return isEnable;
-    }
-    public void setIsDel(Long isDel) 
-    {
-        this.isDel = isDel;
-    }
-
-    public Long getIsDel() 
-    {
-        return isDel;
-    }
-    public void setTipsJson(String tipsJson) 
-    {
-        this.tipsJson = tipsJson;
-    }
-
-    public String getTipsJson() 
-    {
-        return tipsJson;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setIsupload(Long isupload) 
-    {
-        this.isupload = isupload;
-    }
-
-    public Long getIsupload() 
-    {
-        return isupload;
-    }
-    public void setUploadTime(Date uploadTime) 
-    {
-        this.uploadTime = uploadTime;
-    }
-
-    public Date getUploadTime() 
-    {
-        return uploadTime;
-    }
-    public void setOrgid(String orgid) 
-    {
-        this.orgid = orgid;
-    }
-
-    public String getOrgid() 
-    {
-        return orgid;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("questionTargetID", getQuestionTargetID())
-            .append("questionID", getQuestionID())
-            .append("targetID", getTargetID())
-            .append("targetType", getTargetType())
-            .append("categoryName", getCategoryName())
-            .append("targetValue", getTargetValue())
-            .append("basicRegex", getBasicRegex())
-            .append("selfRegex", getSelfRegex())
-            .append("regexUsedType", getRegexUsedType())
-            .append("sort", getSort())
-            .append("version", getVersion())
-            .append("isEnable", getIsEnable())
-            .append("isDel", getIsDel())
-            .append("tipsJson", getTipsJson())
-            .append("delFlag", getDelFlag())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("isupload", getIsupload())
-            .append("uploadTime", getUploadTime())
-            .append("orgid", getOrgid())
-            .toString();
-    }
-}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
index 4cbcaea..4b1ec9c 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
@@ -25,55 +25,55 @@
     /**
      * $column.columnComment
      */
-    @ApiModelProperty(name = "涓婚敭")
+    @ApiModelProperty(value = "涓婚敭")
     private Long targetID;
 
     /**
      * 鍒嗙粍ID
      */
     @Excel(name = "鍒嗙粍ID")
-    @ApiModelProperty(name = "鍒嗙粍ID")
+    @ApiModelProperty(value = "鍒嗙粍ID")
     private String groupid;
 
     /**
      * 鎸囨爣绫诲瀷
      */
     @Excel(name = "鎸囨爣绫诲瀷")
-    @ApiModelProperty(name = "鎸囨爣绫诲瀷")
+    @ApiModelProperty(value = "鎸囨爣绫诲瀷")
     private String targettype;
 
     /**
      * 鎸囨爣鍚嶇О
      */
     @Excel(name = "鎸囨爣鍚嶇О")
-    @ApiModelProperty(name = "鎸囨爣鍚嶇О")
+    @ApiModelProperty(value = "鎸囨爣鍚嶇О")
     private String targetname;
 
     /**
      * 鎸囨爣鎻忚堪
      */
     @Excel(name = "鎸囨爣鎻忚堪")
-    @ApiModelProperty(name = "鎸囨爣鎻忚堪")
+    @ApiModelProperty(value = "鎸囨爣鎻忚堪")
     private String targetdesc;
 
     /**
      * 璇█
      */
     @Excel(name = "璇█")
-    @ApiModelProperty(name = "璇█")
+    @ApiModelProperty(value = "璇█")
     private String language;
 
     /**
      * 鐗堟湰
      */
     @Excel(name = "鐗堟湰")
-    @ApiModelProperty(name = "鐗堟湰")
-    private Long version;
+    @ApiModelProperty(value = "鐗堟湰")
+    private String version;
 
     /**
      * 鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級
      */
-    @ApiModelProperty(name = "鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級")
+    @ApiModelProperty(value = "鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級")
     @Excel(name = "鍊肩被鍨�", readConverterExp = "1=,閫�=椤�,2=,鏂�=鏈�,3=,鏁�=鍊�")
     private Long isenable;
 
@@ -81,41 +81,41 @@
      * 鏄惁寮傚父鏍囪瘑
      */
     @Excel(name = "鏄惁寮傚父鏍囪瘑")
-    @ApiModelProperty(name = "鏄惁寮傚父鏍囪瘑")
+    @ApiModelProperty(value = "鏄惁寮傚父鏍囪瘑")
     private Long isabnormal;
 
     /**
      * 棰勮闃�鍊间笂闄�
      */
     @Excel(name = "棰勮闃�鍊间笂闄�")
-    @ApiModelProperty(name = "棰勮闃�鍊间笂闄�")
+    @ApiModelProperty(value = "棰勮闃�鍊间笂闄�")
     private Long warnup;
 
     /**
      * 棰勮闃�鍊间笅闄�
      */
     @Excel(name = "棰勮闃�鍊间笅闄�")
-    @ApiModelProperty(name = "棰勮闃�鍊间笅闄�")
+    @ApiModelProperty(value = "棰勮闃�鍊间笅闄�")
     private Long warndown;
 
     /**
      * 鍒犻櫎鏍囪
      */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
     @Excel(name = " 涓婁紶鏍囪 ")
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date uploadTime;
 
@@ -123,41 +123,63 @@
      * 鏈烘瀯ID
      */
     @Excel(name = " 鏈烘瀯ID ")
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     private String orgid;
 
     /**
      * 鐖禝D
      */
     @Excel(name = "鐖禝D")
-    @ApiModelProperty(name = "鐖禝D")
+    @ApiModelProperty(value = "鐖禝D")
     private Long pid;
 
     /**
      * GUID
      */
     @Excel(name = "GUID")
-    @ApiModelProperty(name = "GUID")
+    @ApiModelProperty(value = "GUID")
     private String guid;
 
     /**
      * 鍒嗙被id
      */
     @Excel(name = "鍒嗙被id")
-    @ApiModelProperty(name = "鍒嗙被id")
+    @ApiModelProperty(value = "鍒嗙被id")
     private Long assortid;
+
+    /**
+     * 鏄惁鍙敤
+     */
+    @Excel(name = "鏄惁鍙敤")
+    @ApiModelProperty(value = "鏄惁鍙敤")
+    private String isAvailable;
+
+    /**
+     * 閫傜敤鐤剧梾
+     */
+    @Excel(name = "閫傜敤鐤剧梾")
+    @ApiModelProperty(value = "閫傜敤鐤剧梾")
+    private String suitDisease;
+
+
+    /**
+     * 閫傜敤鏂瑰紡
+     */
+    @Excel(name = "閫傜敤鏂瑰紡")
+    @ApiModelProperty(value = "閫傜敤鏂瑰紡")
+    private String suitWay;
 
     /**
      * pageNum
      */
-    @ApiModelProperty(name = "pageNum")
+    @ApiModelProperty(value = "pageNum")
     @Excel(name = "pageNum")
     private Integer pageNum;
 
     /**
      * pageSize
      */
-    @ApiModelProperty(name = "pageSize")
+    @ApiModelProperty(value = "pageSize")
     @Excel(name = "pageSize")
     private Integer pageSize;
 
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
index dd84b39..e6ad094 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
@@ -22,40 +22,40 @@
     /**
      * $column.columnComment
      */
-    @ApiModelProperty(name = "涓婚敭")
+    @ApiModelProperty(value = "涓婚敭")
     private Long id;
 
     /**
      * 鎸囨爣鍒嗙被鍚嶇О
      */
-    @ApiModelProperty(name = "涓婚敭")
+    @ApiModelProperty(value = "涓婚敭")
     @Excel(name = "鎸囨爣鍒嗙被鍚嶇О")
     private String indexAssortName;
 
     /**
      * 鍒犻櫎
      */
-    @ApiModelProperty(name = "鍒犻櫎")
+    @ApiModelProperty(value = "鍒犻櫎")
     private String delFlag;
 
     /**
      * 鐖秈d
      */
-    @ApiModelProperty(name = "鐖秈d")
+    @ApiModelProperty(value = "鐖秈d")
     @Excel(name = "鐖秈d")
     private Long pid;
 
     /**
      * pageNum
      */
-    @ApiModelProperty(name = "pageNum")
+    @ApiModelProperty(value = "pageNum")
     @Excel(name = "pageNum")
     private Integer pageNum;
 
     /**
      * pageSize
      */
-    @ApiModelProperty(name = "pageSize")
+    @ApiModelProperty(value = "pageSize")
     @Excel(name = "pageSize")
     private Integer pageSize;
 
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
index 45bb2df..cc89dd7 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
@@ -24,47 +24,47 @@
     /**
      * $column.columnComment
      */
-    @ApiModelProperty(name = "涓婚敭")
+    @ApiModelProperty(value = "涓婚敭")
     private Long id;
 
     /**
      * 鎸囨爣鍒嗙被鍚嶇О
      */
-    @ApiModelProperty(name = "涓婚敭")
+    @ApiModelProperty(value = "涓婚敭")
     @Excel(name = "鎸囨爣鍒嗙被鍚嶇О")
     private String indexAssortName;
 
     /**
      * 鍒犻櫎
      */
-    @ApiModelProperty(name = "鍒犻櫎")
+    @ApiModelProperty(value = "鍒犻櫎")
     private String delFlag;
 
     /**
      * 鐖秈d
      */
-    @ApiModelProperty(name = "鐖秈d")
+    @ApiModelProperty(value = "鐖秈d")
     @Excel(name = "鐖秈d")
     private Long pid;
 
     /**
      * pageNum
      */
-    @ApiModelProperty(name = "pageNum")
+    @ApiModelProperty(value = "pageNum")
     @Excel(name = "pageNum")
     private Integer pageNum;
 
     /**
      * pageSize
      */
-    @ApiModelProperty(name = "pageSize")
+    @ApiModelProperty(value = "pageSize")
     @Excel(name = "pageSize")
     private Integer pageSize;
 
     /**
      * 瀛愭暟鎹�
      */
-    @ApiModelProperty(name = "瀛愭暟鎹�")
+    @ApiModelProperty(value = "瀛愭暟鎹�")
     private List<IvrLibaTargetAssort> ivrLibaTargetAssortList;
 
     @Override
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetIcd10.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetIcd10.java
new file mode 100644
index 0000000..92eb67b
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetIcd10.java
@@ -0,0 +1,123 @@
+package com.smartor.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鎸囨爣鐤剧梾瀵硅薄 ivr_liba_target_icd10
+ *
+ * @author ruoyi
+ * @date 2023-12-20
+ */
+@Data
+@ApiModel(value = "IvrLibaTargetIcd10", description = "鎸囨爣鐤剧梾瀵硅薄")
+public class IvrLibaTargetIcd10 extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 鑷ID
+     */
+    @ApiModelProperty(value = "涓婚敭")
+    private Long id;
+
+    /**
+     * 鐤剧梾id
+     */
+    @ApiModelProperty(value = "鐤剧梾id")
+    @Excel(name = "鐤剧梾id")
+    private Long icd10id;
+
+    /**
+     * 鐤剧梾缂栫爜
+     */
+    @ApiModelProperty(value = "鐤剧梾缂栫爜")
+    @Excel(name = "鐤剧梾缂栫爜")
+    private String icd10code;
+
+    /**
+     * 鐤剧梾鍚嶇О
+     */
+    @ApiModelProperty(value = "鐤剧梾鍚嶇О")
+    @Excel(name = "鐤剧梾鍚嶇О")
+    private String icd10name;
+
+
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty(value = "鏈烘瀯ID")
+    @Excel(name = " 鏈烘瀯ID ")
+    private String orgid;
+
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    private String delFlag;
+
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty(value = "涓婁紶鏍囪")
+    @Excel(name = " 涓婁紶鏍囪 ")
+    private Long isupload;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /**
+     * 澶栭儴ID
+     */
+    @ApiModelProperty(value = "澶栭儴ID")
+    @Excel(name = "澶栭儴ID ")
+    private Long outid;
+
+    /**
+     * 1 鎸囨爣   2瀹f暀   3闂
+     */
+    @ApiModelProperty(value = "1 鎸囨爣   2瀹f暀   3闂")
+    @Excel(name = "1 鎸囨爣   2瀹f暀   3闂 ")
+    private Long type;
+
+    /**
+     * 鐖禝D
+     */
+    @ApiModelProperty(value = "鐖禝D")
+    @Excel(name = "鐖禝D")
+    private Long pid;
+
+    /**
+     * GUID
+     */
+    @ApiModelProperty(value = "GUID")
+    @Excel(name = "GUID")
+    private String guid;
+
+    /**
+     * pageNum
+     */
+    @ApiModelProperty(value = "pageNum")
+    @Excel(name = "pageNum")
+    private Integer pageNum;
+
+    /**
+     * pageSize
+     */
+    @ApiModelProperty(value = "pageSize")
+    @Excel(name = "pageSize")
+    private Integer pageSize;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java
new file mode 100644
index 0000000..986da38
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java
@@ -0,0 +1,94 @@
+package com.smartor.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鎸囨爣鏍囩瀵硅薄 ivr_liba_target_tag
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@Data
+@ApiModel(value = "IvrLibaTargetTag", description = "鎸囨爣鏍囩瀵硅薄")
+public class IvrLibaTargetTag extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 鑷ID
+     */
+    @ApiModelProperty(value = "鑷ID")
+    private Long id;
+
+    /**
+     * 鏍囩鍒嗙被ID
+     */
+    @ApiModelProperty(value = "鏍囩鍒嗙被ID")
+    @Excel(name = " 鏍囩鍒嗙被ID ")
+    private Long tagcategoryid;
+
+    /**
+     * 鏍囩ID
+     */
+    @ApiModelProperty(value = "鏍囩ID")
+    @Excel(name = " 鏍囩ID ")
+    private Long tagid;
+
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty(value = "鏈烘瀯ID")
+    @Excel(name = " 鏈烘瀯ID ")
+    private String orgid;
+
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    private String delFlag;
+
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty(value = "涓婁紶鏍囪")
+    @Excel(name = " 涓婁紶鏍囪 ")
+    private Long isupload;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /**
+     * 鏍囩ID
+     */
+    @ApiModelProperty(value = "鏍囩ID")
+    @Excel(name = "鏍囩ID ")
+    private Long targetid;
+
+    /**
+     * 鐖禝D
+     */
+    @ApiModelProperty(value = "鐖禝D")
+    @Excel(name = "鐖禝D")
+    private Long pid;
+
+    /**
+     * GUID
+     */
+    @ApiModelProperty(value = "GUID")
+    @Excel(name = "GUID")
+    private String guid;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java
new file mode 100644
index 0000000..63ad625
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java
@@ -0,0 +1,100 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎸囨爣鏍囩瀵硅薄 ivr_liba_target_tag
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@Data
+@ApiModel(value = "IvrLibaTargetTagVO", description = "鎸囨爣鏍囩瀵硅薄VO")
+public class IvrLibaTargetTagVO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 鑷ID
+     */
+    @ApiModelProperty(value = "鑷ID")
+    private Long id;
+
+    /**
+     * 鏍囩鍒嗙被ID
+     */
+    @ApiModelProperty(value = "鏍囩鍒嗙被ID")
+    @Excel(name = " 鏍囩鍒嗙被ID ")
+    private Long tagcategoryid;
+
+    /**
+     * 鏍囩ID
+     */
+    @ApiModelProperty(value = "鏍囩ID")
+    @Excel(name = " 鏍囩ID ")
+    private Long tagid;
+
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty(value = "鏈烘瀯ID")
+    @Excel(name = " 鏈烘瀯ID ")
+    private String orgid;
+
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    private String delFlag;
+
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty(value = "涓婁紶鏍囪")
+    @Excel(name = " 涓婁紶鏍囪 ")
+    private Long isupload;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /**
+     * 鏍囩ID
+     */
+    @ApiModelProperty(value = "鏍囩ID")
+    @Excel(name = "鏍囩ID ")
+    private Long targetid;
+
+    /**
+     * 鐖禝D
+     */
+    @ApiModelProperty(value = "鐖禝D")
+    @Excel(name = "鐖禝D")
+    private Long pid;
+
+    /**
+     * GUID
+     */
+    @ApiModelProperty(value = "GUID")
+    @Excel(name = "GUID")
+    private String guid;
+
+    /**
+     * 鏍囩鍚嶇О
+     */
+    @ApiModelProperty(value = "鏍囩鍚嶇О")
+    @Excel(name = "鏍囩鍚嶇О")
+    private List<BaseTag> tagList;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
new file mode 100644
index 0000000..7abfdb2
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
@@ -0,0 +1,195 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎸囨爣搴撳璞¤繑鍙� IvrLibaTargetVO
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+@Data
+@ApiModel(value = "IvrLibaTargetVO", description = "鎸囨爣搴撳璞¤繑鍙�")
+public class IvrLibaTargetVO {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "涓婚敭")
+    private Long targetID;
+
+    /**
+     * 鍒嗙粍ID
+     */
+    @Excel(name = "鍒嗙粍ID")
+    @ApiModelProperty(value = "鍒嗙粍ID")
+    private String groupid;
+
+    /**
+     * 鎸囨爣绫诲瀷
+     */
+    @Excel(name = "鎸囨爣绫诲瀷")
+    @ApiModelProperty(value = "鎸囨爣绫诲瀷")
+    private String targettype;
+
+    /**
+     * 鎸囨爣鍚嶇О
+     */
+    @Excel(name = "鎸囨爣鍚嶇О")
+    @ApiModelProperty(value = "鎸囨爣鍚嶇О")
+    private String targetname;
+
+    /**
+     * 鎸囨爣鎻忚堪
+     */
+    @Excel(name = "鎸囨爣鎻忚堪")
+    @ApiModelProperty(value = "鎸囨爣鎻忚堪")
+    private String targetdesc;
+
+    /**
+     * 璇█
+     */
+    @Excel(name = "璇█")
+    @ApiModelProperty(value = "璇█")
+    private String language;
+
+    /**
+     * 鐗堟湰
+     */
+    @Excel(name = "鐗堟湰")
+    @ApiModelProperty(value = "鐗堟湰")
+    private String version;
+
+    /**
+     * 鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級
+     */
+    @ApiModelProperty(value = "鍊肩被鍨嬶紙1 閫夐」  2 鏂囨湰  3 鏁板�硷級")
+    @Excel(name = "鍊肩被鍨�", readConverterExp = "1=,閫�=椤�,2=,鏂�=鏈�,3=,鏁�=鍊�")
+    private Long isenable;
+
+    /**
+     * 鏄惁寮傚父鏍囪瘑
+     */
+    @Excel(name = "鏄惁寮傚父鏍囪瘑")
+    @ApiModelProperty(value = "鏄惁寮傚父鏍囪瘑")
+    private Long isabnormal;
+
+    /**
+     * 棰勮闃�鍊间笂闄�
+     */
+    @Excel(name = "棰勮闃�鍊间笂闄�")
+    @ApiModelProperty(value = "棰勮闃�鍊间笂闄�")
+    private Long warnup;
+
+    /**
+     * 棰勮闃�鍊间笅闄�
+     */
+    @Excel(name = "棰勮闃�鍊间笅闄�")
+    @ApiModelProperty(value = "棰勮闃�鍊间笅闄�")
+    private Long warndown;
+
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    private String delFlag;
+
+    /**
+     * 涓婁紶鏍囪
+     */
+    @Excel(name = " 涓婁紶鏍囪 ")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
+    private Long isupload;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
+    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /**
+     * 鏈烘瀯ID
+     */
+    @Excel(name = " 鏈烘瀯ID ")
+    @ApiModelProperty(value = "鏈烘瀯ID")
+    private String orgid;
+
+    /**
+     * 鐖禝D
+     */
+    @Excel(name = "鐖禝D")
+    @ApiModelProperty(value = "鐖禝D")
+    private Long pid;
+
+    /**
+     * GUID
+     */
+    @Excel(name = "GUID")
+    @ApiModelProperty(value = "GUID")
+    private String guid;
+
+    /**
+     * 鍒嗙被id
+     */
+    @Excel(name = "鍒嗙被id")
+    @ApiModelProperty(value = "鍒嗙被id")
+    private Long assortid;
+
+    /**
+     * 鏄惁鍙敤
+     */
+    @Excel(name = "鏄惁鍙敤")
+    @ApiModelProperty(value = "鏄惁鍙敤")
+    private String isAvailable;
+
+    /**
+     * 閫傜敤鐤剧梾
+     */
+    @Excel(name = "閫傜敤鐤剧梾")
+    @ApiModelProperty(value = "閫傜敤鐤剧梾")
+    private String suitDisease;
+
+
+    /**
+     * 閫傜敤鏂瑰紡
+     */
+    @Excel(name = "閫傜敤鏂瑰紡")
+    @ApiModelProperty(value = "閫傜敤鏂瑰紡")
+    private String suitWay;
+    /**
+     * pageNum
+     */
+    @ApiModelProperty(value = "pageNum")
+    @Excel(name = "pageNum")
+    private Integer pageNum;
+
+    /**
+     * pageSize
+     */
+    @ApiModelProperty(value = "pageSize")
+    @Excel(name = "pageSize")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+    private Integer isoperation;
+
+    @ApiModelProperty(value = "鎸囨爣閫夐」闆嗗悎")
+    private List<IvrLibaTargetoption> targetoptionList;
+
+    @ApiModelProperty(value = "鏍囩闆嗗悎")
+    private List<BaseTag> baseTagList;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
index 8c91dd0..46b0e50 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
@@ -25,86 +25,86 @@
     /**
      * $column.columnComment
      */
-    @ApiModelProperty(name = "涓婚敭")
+    @ApiModelProperty(value = "涓婚敭")
     private Long targetoptionid;
 
-    @ApiModelProperty(name = "鎸囨爣ID")
+    @ApiModelProperty(value = "鎸囨爣ID")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long targetid;
 
-    @ApiModelProperty(name = "鎸囨爣绫诲瀷")
+    @ApiModelProperty(value = "鎸囨爣绫诲瀷")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String targettype;
 
     /**
      * 绫诲埆鍚嶇О
      */
-    @ApiModelProperty(name = "绫诲埆鍚嶇О")
+    @ApiModelProperty(value = "绫诲埆鍚嶇О")
     @Excel(name = "绫诲埆鍚嶇О")
     private String categoryName;
 
-    @ApiModelProperty(name = "鎸囨爣鍊�")
+    @ApiModelProperty(value = "鎸囨爣鍊�")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String targetvalue;
 
-    @ApiModelProperty(name = "姝e垯")
+    @ApiModelProperty(value = "姝e垯")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String targetregex;
 
-    @ApiModelProperty(name = "閫夐」鎻忚堪")
+    @ApiModelProperty(value = "閫夐」鎻忚堪")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String optiondesc;
 
-    @ApiModelProperty(name = "璇█")
+    @ApiModelProperty(value = "璇█")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String language;
 
-    @ApiModelProperty(name = "鐗堟湰鍙�")
+    @ApiModelProperty(value = "鐗堟湰鍙�")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long version;
 
-    @ApiModelProperty(name = "鍒嗙粍ID")
+    @ApiModelProperty(value = "鍒嗙粍ID")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String groupid;
 
     /**
      * 鏄惁寮傚父鏍囪瘑
      */
-    @ApiModelProperty(name = "鏄惁寮傚父鏍囪瘑")
+    @ApiModelProperty(value = "鏄惁寮傚父鏍囪瘑")
     @Excel(name = "鏄惁寮傚父鏍囪瘑")
     private Long isabnormal;
 
     /**
      * 棰勮闃�鍊间笂闄�
      */
-    @ApiModelProperty(name = "棰勮闃�鍊间笂闄�")
+    @ApiModelProperty(value = "棰勮闃�鍊间笂闄�")
     @Excel(name = "棰勮闃�鍊间笂闄�")
     private Long warnup;
 
     /**
      * 棰勮闃�鍊间笅闄�
      */
-    @ApiModelProperty(name = "棰勮闃�鍊间笅闄�")
+    @ApiModelProperty(value = "棰勮闃�鍊间笅闄�")
     @Excel(name = "棰勮闃�鍊间笅闄�")
     private Long warndown;
 
     /**
      * 鍒犻櫎鏍囪
      */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     @Excel(name = " 涓婁紶鏍囪 ")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date uploadTime;
@@ -112,35 +112,40 @@
     /**
      * 鏈烘瀯ID
      */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     @Excel(name = " 鏈烘瀯ID ")
     private String orgid;
 
     /**
      * 鐖禝D
      */
-    @ApiModelProperty(name = "鐖禝D")
+    @ApiModelProperty(value = "鐖禝D")
     @Excel(name = "鐖禝D")
     private Long pid;
 
     /**
      * GUID
      */
-    @ApiModelProperty(name = "GUID")
+    @ApiModelProperty(value = "GUID")
     @Excel(name = "GUID")
     private String guid;
 
+    @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+    private Integer isoperation;
+
+    @ApiModelProperty(value = "鎬绘潯鏁�")
+    private Integer allitems;
     /**
      * pageNum
      */
-    @ApiModelProperty(name = "pageNum")
+    @ApiModelProperty(value = "pageNum")
     @Excel(name = "pageNum")
     private Integer pageNum;
 
     /**
      * pageSize
      */
-    @ApiModelProperty(name = "pageSize")
+    @ApiModelProperty(value = "pageSize")
     @Excel(name = "pageSize")
     private Integer pageSize;
 
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
index 74fc1ba..32a9d64 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
@@ -1,7 +1,11 @@
 package com.smartor.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -9,425 +13,214 @@
 
 /**
  * 璇濇湳妯℃澘搴撳璞� ivr_liba_template
- * 
+ *
  * @author smartor
  * @date 2023-03-22
  */
-public class IvrLibaTemplate extends BaseEntity
-{
+@Data
+@ApiModel(value = "IvrLibaTemplate", description = "璇濇湳妯℃澘搴撳璞�")
+public class IvrLibaTemplate extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "妯℃澘id")
     private String templateID;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty(value = "妯℃澘鍚嶇О")
     private String templateName;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty(value = "silencetime")
     private Long silencetime;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty(value = "slienceRepeatTimes")
     private Long slienceRepeatTimes;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "nomatchRepeatTimes")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long nomatchRepeatTimes;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "firstQuestionNum")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long firstQuestionNum;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "瀛愮粍浠�")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String submodule;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "璇█")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String language;
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "鎻忚堪")
     @Excel(name = "${note}", readConverterExp = "$column.readConverterExp()")
     private String note;
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "isEnable")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long isEnable;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long isDel;
-
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "娣诲姞浜�")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String addUserID;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date addTime;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "淇敼浜篿d")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String modifyUserID;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "淇敼鏃堕棿")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date modifyTime;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "鍒嗙粍id")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String groupID;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "鏍囩淇℃伅")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String labelInfo;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "妯℃澘id")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String submoduleID;
 
-    /** 鎾姤绫诲瀷 0.璇煶浼樺厛 1.鏂囧瓧浼樺厛 */
+    /**
+     * 鎾姤绫诲瀷 0.璇煶浼樺厛 1.鏂囧瓧浼樺厛
+     */
+    @ApiModelProperty(value = "鎾姤绫诲瀷 0.璇煶浼樺厛 1.鏂囧瓧浼樺厛")
     @Excel(name = "鎾姤绫诲瀷 0.璇煶浼樺厛 1.鏂囧瓧浼樺厛")
     private Long playType;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "icd10code")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String icd10code;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "icd10codename")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String icd10codename;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "atuoTaskDayOffset")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long atuoTaskDayOffset;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "閮ㄩ棬id")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String DeptIds;
+    private String deptIds;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String DeptNames;
+    private String deptNames;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "fKsdm")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String fKsdm;
 
-    /**  鍒犻櫎鏍囪  */
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
-    /**  涓婁紶鏍囪  */
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     @Excel(name = " 涓婁紶鏍囪 ")
     private Long isupload;
 
-    /**  涓婁紶鏃堕棿  */
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date uploadTime;
 
-    /**  鏈烘瀯ID  */
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty(value = "鏈烘瀯ID")
     @Excel(name = " 鏈烘瀯ID ")
     private String orgid;
 
-    public void setTemplateID(String templateID) 
-    {
-        this.templateID = templateID;
-    }
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty(value = "鍒嗙被id")
+    @Excel(name = " 鍒嗙被id ")
+    private Long assortid;
 
-    public String getTemplateID() 
-    {
-        return templateID;
-    }
-    public void setTemplateName(String templateName) 
-    {
-        this.templateName = templateName;
-    }
 
-    public String getTemplateName() 
-    {
-        return templateName;
-    }
-    public void setSilencetime(Long silencetime) 
-    {
-        this.silencetime = silencetime;
-    }
-
-    public Long getSilencetime() 
-    {
-        return silencetime;
-    }
-    public void setSlienceRepeatTimes(Long slienceRepeatTimes) 
-    {
-        this.slienceRepeatTimes = slienceRepeatTimes;
-    }
-
-    public Long getSlienceRepeatTimes() 
-    {
-        return slienceRepeatTimes;
-    }
-    public void setNomatchRepeatTimes(Long nomatchRepeatTimes) 
-    {
-        this.nomatchRepeatTimes = nomatchRepeatTimes;
-    }
-
-    public Long getNomatchRepeatTimes() 
-    {
-        return nomatchRepeatTimes;
-    }
-    public void setFirstQuestionNum(Long firstQuestionNum) 
-    {
-        this.firstQuestionNum = firstQuestionNum;
-    }
-
-    public Long getFirstQuestionNum() 
-    {
-        return firstQuestionNum;
-    }
-    public void setSubmodule(String submodule) 
-    {
-        this.submodule = submodule;
-    }
-
-    public String getSubmodule() 
-    {
-        return submodule;
-    }
-    public void setLanguage(String language) 
-    {
-        this.language = language;
-    }
-
-    public String getNote()
-    {
-        return note;
-    }
-    public void setNote(String note)
-    {
-        this.note = note;
-    }
-
-    public String getLanguage()
-    {
-        return language;
-    }
-    public void setIsEnable(Long isEnable) 
-    {
-        this.isEnable = isEnable;
-    }
-
-    public Long getIsEnable() 
-    {
-        return isEnable;
-    }
-    public void setIsDel(Long isDel) 
-    {
-        this.isDel = isDel;
-    }
-
-    public Long getIsDel() 
-    {
-        return isDel;
-    }
-    public void setAddUserID(String addUserID) 
-    {
-        this.addUserID = addUserID;
-    }
-
-    public String getAddUserID() 
-    {
-        return addUserID;
-    }
-    public void setAddTime(Date addTime) 
-    {
-        this.addTime = addTime;
-    }
-
-    public Date getAddTime() 
-    {
-        return addTime;
-    }
-    public void setModifyUserID(String modifyUserID) 
-    {
-        this.modifyUserID = modifyUserID;
-    }
-
-    public String getModifyUserID() 
-    {
-        return modifyUserID;
-    }
-    public void setModifyTime(Date modifyTime) 
-    {
-        this.modifyTime = modifyTime;
-    }
-
-    public Date getModifyTime() 
-    {
-        return modifyTime;
-    }
-    public void setGroupID(String groupID) 
-    {
-        this.groupID = groupID;
-    }
-
-    public String getGroupID() 
-    {
-        return groupID;
-    }
-    public void setLabelInfo(String labelInfo) 
-    {
-        this.labelInfo = labelInfo;
-    }
-
-    public String getLabelInfo() 
-    {
-        return labelInfo;
-    }
-    public void setSubmoduleID(String submoduleID) 
-    {
-        this.submoduleID = submoduleID;
-    }
-
-    public String getSubmoduleID() 
-    {
-        return submoduleID;
-    }
-    public void setPlayType(Long playType) 
-    {
-        this.playType = playType;
-    }
-
-    public Long getPlayType() 
-    {
-        return playType;
-    }
-    public void setIcd10code(String icd10code) 
-    {
-        this.icd10code = icd10code;
-    }
-
-    public String getIcd10code() 
-    {
-        return icd10code;
-    }
-    public void setIcd10codename(String icd10codename) 
-    {
-        this.icd10codename = icd10codename;
-    }
-
-    public String getIcd10codename() 
-    {
-        return icd10codename;
-    }
-    public void setAtuoTaskDayOffset(Long atuoTaskDayOffset) 
-    {
-        this.atuoTaskDayOffset = atuoTaskDayOffset;
-    }
-
-    public Long getAtuoTaskDayOffset() 
-    {
-        return atuoTaskDayOffset;
-    }
-    public void setDeptIds(String DeptIds) 
-    {
-        this.DeptIds = DeptIds;
-    }
-
-    public String getDeptIds() 
-    {
-        return DeptIds;
-    }
-    public void setDeptNames(String DeptNames) 
-    {
-        this.DeptNames = DeptNames;
-    }
-
-    public String getDeptNames() 
-    {
-        return DeptNames;
-    }
-    public void setfKsdm(String fKsdm) 
-    {
-        this.fKsdm = fKsdm;
-    }
-
-    public String getfKsdm() 
-    {
-        return fKsdm;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setIsupload(Long isupload) 
-    {
-        this.isupload = isupload;
-    }
-
-    public Long getIsupload() 
-    {
-        return isupload;
-    }
-    public void setUploadTime(Date uploadTime) 
-    {
-        this.uploadTime = uploadTime;
-    }
-
-    public Date getUploadTime() 
-    {
-        return uploadTime;
-    }
-    public void setOrgid(String orgid) 
-    {
-        this.orgid = orgid;
-    }
-
-    public String getOrgid() 
-    {
-        return orgid;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("templateID", getTemplateID())
-            .append("templateName", getTemplateName())
-            .append("silencetime", getSilencetime())
-            .append("slienceRepeatTimes", getSlienceRepeatTimes())
-            .append("nomatchRepeatTimes", getNomatchRepeatTimes())
-            .append("firstQuestionNum", getFirstQuestionNum())
-            .append("submodule", getSubmodule())
-            .append("language", getLanguage())
-            .append("note", getNote())
-            .append("isEnable", getIsEnable())
-            .append("isDel", getIsDel())
-            .append("addUserID", getAddUserID())
-            .append("addTime", getAddTime())
-            .append("modifyUserID", getModifyUserID())
-            .append("modifyTime", getModifyTime())
-            .append("groupID", getGroupID())
-            .append("labelInfo", getLabelInfo())
-            .append("submoduleID", getSubmoduleID())
-            .append("playType", getPlayType())
-            .append("icd10code", getIcd10code())
-            .append("icd10codename", getIcd10codename())
-            .append("atuoTaskDayOffset", getAtuoTaskDayOffset())
-            .append("DeptIds", getDeptIds())
-            .append("DeptNames", getDeptNames())
-            .append("fKsdm", getfKsdm())
-            .append("delFlag", getDelFlag())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("isupload", getIsupload())
-            .append("uploadTime", getUploadTime())
-            .append("orgid", getOrgid())
-            .toString();
-    }
 }
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplatescript.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplatescript.java
index 5de221b..090d2af 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplatescript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplatescript.java
@@ -2,6 +2,9 @@
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,367 +16,105 @@
  * @author smartor
  * @date 2023-03-22
  */
+@Data
+@ApiModel(value = "IvrLibaTemplatescript", description = "璇濇湳妯℃澘搴撹瘽鏈璞�")
 public class IvrLibaTemplatescript extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "templateQuestionID")
     private String templateQuestionID;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "templateQuestionNum")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long templateQuestionNum;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "templateID")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String templateID;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "questionID")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String questionID;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "questionPoint")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String questionPoint;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "questionText")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String questionText;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "questionVoice")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String questionVoice;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "noMatchText")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String noMatchText;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "noMatchVoice")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String noMatchVoice;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "slienceText")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String slienceText;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "slienceVoice")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String slienceVoice;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "submoduleText")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String submoduleText;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "submoduleVoice")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String submoduleVoice;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "noClearlyText")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String noClearlyText;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "noClearlyVoice")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String noClearlyVoice;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "绫诲埆鍚�")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String categoryName;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "鎸囨爣閫夐」")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String targetOptions;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "璇█")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String language;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "playWavOnly")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long playWavOnly;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long isEnable;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long isDel;
-
-    /**  鍒犻櫎鏍囪  */
-    private String delFlag;
-
-    /**  涓婁紶鏍囪  */
-    @Excel(name = " 涓婁紶鏍囪 ")
-    private Long isupload;
-
-    /**  涓婁紶鏃堕棿  */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date uploadTime;
-
-    /**  鏈烘瀯ID  */
-    @Excel(name = " 鏈烘瀯ID ")
-    private String orgid;
-
-    public void setTemplateQuestionID(String templateQuestionID) 
-    {
-        this.templateQuestionID = templateQuestionID;
-    }
-
-    public String getTemplateQuestionID() 
-    {
-        return templateQuestionID;
-    }
-    public void setTemplateQuestionNum(Long templateQuestionNum) 
-    {
-        this.templateQuestionNum = templateQuestionNum;
-    }
-
-    public Long getTemplateQuestionNum() 
-    {
-        return templateQuestionNum;
-    }
-    public void setTemplateID(String templateID) 
-    {
-        this.templateID = templateID;
-    }
-
-    public String getTemplateID() 
-    {
-        return templateID;
-    }
-    public void setQuestionID(String questionID) 
-    {
-        this.questionID = questionID;
-    }
-
-    public String getQuestionID() 
-    {
-        return questionID;
-    }
-    public void setQuestionPoint(String questionPoint) 
-    {
-        this.questionPoint = questionPoint;
-    }
-
-    public String getQuestionPoint() 
-    {
-        return questionPoint;
-    }
-    public void setQuestionText(String questionText) 
-    {
-        this.questionText = questionText;
-    }
-
-    public String getQuestionText() 
-    {
-        return questionText;
-    }
-    public void setQuestionVoice(String questionVoice) 
-    {
-        this.questionVoice = questionVoice;
-    }
-
-    public String getQuestionVoice() 
-    {
-        return questionVoice;
-    }
-    public void setNoMatchText(String noMatchText) 
-    {
-        this.noMatchText = noMatchText;
-    }
-
-    public String getNoMatchText() 
-    {
-        return noMatchText;
-    }
-    public void setNoMatchVoice(String noMatchVoice) 
-    {
-        this.noMatchVoice = noMatchVoice;
-    }
-
-    public String getNoMatchVoice() 
-    {
-        return noMatchVoice;
-    }
-    public void setSlienceText(String slienceText) 
-    {
-        this.slienceText = slienceText;
-    }
-
-    public String getSlienceText() 
-    {
-        return slienceText;
-    }
-    public void setSlienceVoice(String slienceVoice) 
-    {
-        this.slienceVoice = slienceVoice;
-    }
-
-    public String getSlienceVoice() 
-    {
-        return slienceVoice;
-    }
-    public void setSubmoduleText(String submoduleText) 
-    {
-        this.submoduleText = submoduleText;
-    }
-
-    public String getSubmoduleText() 
-    {
-        return submoduleText;
-    }
-    public void setSubmoduleVoice(String submoduleVoice) 
-    {
-        this.submoduleVoice = submoduleVoice;
-    }
-
-    public String getSubmoduleVoice() 
-    {
-        return submoduleVoice;
-    }
-    public void setNoClearlyText(String noClearlyText) 
-    {
-        this.noClearlyText = noClearlyText;
-    }
-
-    public String getNoClearlyText() 
-    {
-        return noClearlyText;
-    }
-    public void setNoClearlyVoice(String noClearlyVoice) 
-    {
-        this.noClearlyVoice = noClearlyVoice;
-    }
-
-    public String getNoClearlyVoice() 
-    {
-        return noClearlyVoice;
-    }
-    public void setCategoryName(String categoryName) 
-    {
-        this.categoryName = categoryName;
-    }
-
-    public String getCategoryName() 
-    {
-        return categoryName;
-    }
-    public void setTargetOptions(String targetOptions) 
-    {
-        this.targetOptions = targetOptions;
-    }
-
-    public String getTargetOptions() 
-    {
-        return targetOptions;
-    }
-    public void setLanguage(String language) 
-    {
-        this.language = language;
-    }
-
-    public String getLanguage() 
-    {
-        return language;
-    }
-    public void setPlayWavOnly(Long playWavOnly) 
-    {
-        this.playWavOnly = playWavOnly;
-    }
-
-    public Long getPlayWavOnly() 
-    {
-        return playWavOnly;
-    }
-    public void setIsEnable(Long isEnable) 
-    {
-        this.isEnable = isEnable;
-    }
-
-    public Long getIsEnable() 
-    {
-        return isEnable;
-    }
-    public void setIsDel(Long isDel) 
-    {
-        this.isDel = isDel;
-    }
-
-    public Long getIsDel() 
-    {
-        return isDel;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-    public void setIsupload(Long isupload) 
-    {
-        this.isupload = isupload;
-    }
-
-    public Long getIsupload() 
-    {
-        return isupload;
-    }
-    public void setUploadTime(Date uploadTime) 
-    {
-        this.uploadTime = uploadTime;
-    }
-
-    public Date getUploadTime() 
-    {
-        return uploadTime;
-    }
-    public void setOrgid(String orgid) 
-    {
-        this.orgid = orgid;
-    }
-
-    public String getOrgid() 
-    {
-        return orgid;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("templateQuestionID", getTemplateQuestionID())
-            .append("templateQuestionNum", getTemplateQuestionNum())
-            .append("templateID", getTemplateID())
-            .append("questionID", getQuestionID())
-            .append("questionPoint", getQuestionPoint())
-            .append("questionText", getQuestionText())
-            .append("questionVoice", getQuestionVoice())
-            .append("noMatchText", getNoMatchText())
-            .append("noMatchVoice", getNoMatchVoice())
-            .append("slienceText", getSlienceText())
-            .append("slienceVoice", getSlienceVoice())
-            .append("submoduleText", getSubmoduleText())
-            .append("submoduleVoice", getSubmoduleVoice())
-            .append("noClearlyText", getNoClearlyText())
-            .append("noClearlyVoice", getNoClearlyVoice())
-            .append("categoryName", getCategoryName())
-            .append("targetOptions", getTargetOptions())
-            .append("language", getLanguage())
-            .append("playWavOnly", getPlayWavOnly())
-            .append("isEnable", getIsEnable())
-            .append("isDel", getIsDel())
-            .append("delFlag", getDelFlag())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("isupload", getIsupload())
-            .append("uploadTime", getUploadTime())
-            .append("orgid", getOrgid())
-            .toString();
-    }
 }
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplatetargetAssort.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplatetargetAssort.java
new file mode 100644
index 0000000..fe57253
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplatetargetAssort.java
@@ -0,0 +1,49 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鎸囨爣妯℃澘鍒嗙被瀵硅薄 ivr_liba_templatetarget_assort
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@Data
+@ApiModel(value = "IvrLibaTemplatetargetAssort", description = "鎸囨爣妯℃澘鍒嗙被瀵硅薄")
+public class IvrLibaTemplatetargetAssort extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "涓婚敭")
+    private Long id;
+
+    /**
+     * 鎸囨爣鍒嗙被鍚嶇О
+     */
+    @Excel(name = "鎸囨爣鍒嗙被鍚嶇О")
+    @ApiModelProperty(value = "鎸囨爣鍒嗙被鍚嶇О")
+    private String indexAssortName;
+
+    /**
+     * 鍒犻櫎
+     */
+    @ApiModelProperty(value = "鍒犻櫎")
+    private String delFlag;
+
+    /**
+     * 鐖秈d
+     */
+    @Excel(name = "鐖秈d")
+    @ApiModelProperty(value = "鐖秈d")
+    private Long pid;
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/MedicalHistory.java b/smartor/src/main/java/com/smartor/domain/MedicalHistory.java
index a228a3a..8f44e66 100644
--- a/smartor/src/main/java/com/smartor/domain/MedicalHistory.java
+++ b/smartor/src/main/java/com/smartor/domain/MedicalHistory.java
@@ -112,14 +112,14 @@
     /**
      * pageNum
      */
-    @ApiModelProperty(name = "pageNum")
+    @ApiModelProperty(value = "pageNum")
     @Excel(name = "pageNum")
     private Integer pageNum;
 
     /**
      * pageSize
      */
-    @ApiModelProperty(name = "pageSize")
+    @ApiModelProperty(value = "pageSize")
     @Excel(name = "pageSize")
     private Integer pageSize;
 
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index 6c92148..57d1eb9 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -180,8 +180,15 @@
     @Excel(name = " 鏍囩 ", cellType = Excel.ColumnType.STRING)
     private String tag;
 
+    /**
+     * 鏍囩
+     */
+    @ApiModelProperty("鏍囩id")
+    @Excel(name = " 鏍囩id ", cellType = Excel.ColumnType.STRING)
+    private Long tagid;
+
     @ApiModelProperty("鏍囩闆嗗悎")
-    private List<String> tagList;
+    private List<PatArchivetag> tagList;
 
     /**
      * 鏍囩
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
index 17e3abb..dcd5222 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
@@ -98,14 +98,14 @@
     /**
      * pageNum
      */
-    @ApiModelProperty(name = "pageNum")
+    @ApiModelProperty(value = "pageNum")
     @Excel(name = "pageNum")
     private Integer pageNum;
 
     /**
      * pageSize
      */
-    @ApiModelProperty(name = "pageSize")
+    @ApiModelProperty(value = "pageSize")
     @Excel(name = "pageSize")
     private Integer pageSize;
 
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
similarity index 92%
rename from smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java
rename to smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
index 99e72e5..2bc1dc0 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
@@ -18,9 +18,9 @@
  * @author smartor
  * @date 2023-03-04
  */
-@ApiModel(value = "PatArchive", description = "鎮h�呮。妗堝璞�")
+@ApiModel(value = "PatArchiveVO", description = "鎮h�呮。妗堝璞�")
 @Data
-public class PatArchiveAndTag extends BaseEntity {
+public class PatArchiveVO extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -141,7 +141,10 @@
     private String tag;
 
     @ApiModelProperty("鏍囩闆嗗悎")
-    List<PatArchivetag> patArchivetags;
+    List<PatArchivetag> tagList;
+
+    @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+    private Integer isoperation;
 
     @Override
     public String toString() {
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchivecontact.java b/smartor/src/main/java/com/smartor/domain/PatArchivecontact.java
index c2be437..a82eab5 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchivecontact.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchivecontact.java
@@ -113,14 +113,14 @@
     /**
      * pageNum
      */
-    @ApiModelProperty(name = "pageNum")
+    @ApiModelProperty(value = "pageNum")
     @Excel(name = "pageNum")
     private Integer pageNum;
 
     /**
      * pageSize
      */
-    @ApiModelProperty(name = "pageSize")
+    @ApiModelProperty(value = "pageSize")
     @Excel(name = "pageSize")
     private Integer pageSize;
 
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchivetag.java b/smartor/src/main/java/com/smartor/domain/PatArchivetag.java
index cab2c69..7fe6cc5 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchivetag.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchivetag.java
@@ -25,56 +25,65 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long id;
 
     /**
      * 鏍囩鍒嗙被ID
      */
-    @ApiModelProperty(name = "鏍囩鍒嗙被ID")
+    @ApiModelProperty(value = "鏍囩鍒嗙被ID")
     private Long tagcategoryid;
 
     /**
      * 鏍囩ID
      */
-    @ApiModelProperty(name = "鏍囩ID")
+    @ApiModelProperty(value = "鏍囩ID")
     private Long tagid;
 
     /**
      * 鏈烘瀯ID
      */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     private String orgid;
 
     /**
      * 鍒犻櫎鏍囪
      */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date uploadTime;
 
-    @ApiModelProperty(name = "鏍囩鍚嶇О")
+    /**
+     * 鏍囩鍚嶇О(浣滀负鍏ヨ繑鍙備娇鐢紝琛ㄤ腑娌℃湁)
+     */
+    @ApiModelProperty(value = "鏍囩鍚嶇О")
     private String tagname;
 
     /**
      * 妗fID
      */
-    @ApiModelProperty(name = "妗fID")
+    @ApiModelProperty(value = "妗fID")
     private Long patid;
 
+    /**
+     * 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")(浣滀负鍏ヨ繑鍙備娇鐢紝琛ㄤ腑娌℃湁)
+     */
+    @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+    private Integer isoperation;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("tagname", getTagname()).append("id", getId()).append("tagcategoryid", getTagcategoryid()).append("tagid", getTagid()).append("orgid", getOrgid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("patid", getPatid()).toString();
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchivetagAndPatientInfo.java b/smartor/src/main/java/com/smartor/domain/PatArchivetagAndPatientInfo.java
index 875da04..79ca725 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchivetagAndPatientInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchivetagAndPatientInfo.java
@@ -26,54 +26,54 @@
 //    /**
 //     * 鑷ID
 //     */
-//    @ApiModelProperty(name = "鑷ID")
+//    @ApiModelProperty(value = "鑷ID")
 //    private Long id;
 //
 //    /**
 //     * 鏍囩鍒嗙被ID
 //     */
-//    @ApiModelProperty(name = "鏍囩鍒嗙被ID")
+//    @ApiModelProperty(value = "鏍囩鍒嗙被ID")
 //    private Long tagcategoryid;
 //
 //    /**
 //     * 鏍囩ID
 //     */
-//    @ApiModelProperty(name = "鏍囩ID")
+//    @ApiModelProperty(value = "鏍囩ID")
 //    private Long tagid;
 //
 //    /**
 //     * 鏈烘瀯ID
 //     */
-//    @ApiModelProperty(name = "鏈烘瀯ID")
+//    @ApiModelProperty(value = "鏈烘瀯ID")
 //    private String orgid;
 //
 //    /**
 //     * 鍒犻櫎鏍囪
 //     */
-//    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+//    @ApiModelProperty(value = "鍒犻櫎鏍囪")
 //    private String delFlag;
 //
 //    /**
 //     * 涓婁紶鏍囪
 //     */
-//    @ApiModelProperty(name = "涓婁紶鏍囪")
+//    @ApiModelProperty(value = "涓婁紶鏍囪")
 //    private Long isupload;
 //
 //    /**
 //     * 涓婁紶鏃堕棿
 //     */
-//    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+//    @ApiModelProperty(value = "涓婁紶鏃堕棿")
 //    @JsonFormat(pattern = "yyyy-MM-dd")
 //    @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
 //    private Date uploadTime;
 
-    @ApiModelProperty(name = "鏍囩鍚嶇О")
+    @ApiModelProperty(value = "鏍囩鍚嶇О")
     private String tagname;
 
     /**
      * 妗fID
      */
-    @ApiModelProperty(name = "妗fID")
+    @ApiModelProperty(value = "妗fID")
     private Long patid;
 
     @ApiModelProperty("鎮h�呮暟閲�")
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedBloodsugar.java b/smartor/src/main/java/com/smartor/domain/PatMedBloodsugar.java
index 8a42aa0..663b53b 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedBloodsugar.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedBloodsugar.java
@@ -22,73 +22,73 @@
     private static final long serialVersionUID = 1L;
 
     /**  鑷ID  */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long bloodsugarid;
 
     /**  娴佹按鍙�  */
-    @ApiModelProperty(name = "娴佹按鍙�")
+    @ApiModelProperty(value = "娴佹按鍙�")
     @Excel(name = " 娴佹按鍙� ")
     private String serialnum;
 
     /**  璁板綍鏃堕棿  */
-    @ApiModelProperty(name = "璁板綍鏃堕棿")
+    @ApiModelProperty(value = "璁板綍鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 璁板綍鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordtime;
 
     /**  鏈烘瀯ID  */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     @Excel(name = " 鏈烘瀯ID ")
     private String orgid;
 
     /**  鍒犻櫎鏍囪  */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**  涓婁紶鏍囪  */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     @Excel(name = " 涓婁紶鏍囪 ")
     private Long isupload;
 
     /**  涓婁紶鏃堕棿  */
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date uploadTime;
 
     /**  妗fID  */
-    @ApiModelProperty(name = "妗fID")
+    @ApiModelProperty(value = "妗fID")
     @Excel(name = " 妗fID ")
     private Long patid;
 
     /**  鏁版嵁绫诲瀷  */
-    @ApiModelProperty(name = "鏁版嵁绫诲瀷")
+    @ApiModelProperty(value = "鏁版嵁绫诲瀷")
     @Excel(name = " 鏁版嵁绫诲瀷 ")
     private String typename;
 
     /**  琛�绯栧��  */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     @Excel(name = " 琛�绯栧�� ")
     private BigDecimal sugarlevel;
 
     /**  鏁版嵁鏉ユ簮  */
-    @ApiModelProperty(name = "鏁版嵁鏉ユ簮")
+    @ApiModelProperty(value = "鏁版嵁鏉ユ簮")
     @Excel(name = " 鏁版嵁鏉ユ簮 ")
     private String sourcename;
 
     /**  绌鸿吂琛�绯�  */
-    @ApiModelProperty(name = "绌鸿吂琛�绯�")
+    @ApiModelProperty(value = "绌鸿吂琛�绯�")
     @Excel(name = " 绌鸿吂琛�绯� ")
     private BigDecimal sugarlevelempty;
 
     /**  灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴  */
-    @ApiModelProperty(name = "灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴")
+    @ApiModelProperty(value = "灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴")
     @Excel(name = " 灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴 ")
     private Long visittype;
 
     /**  灏辫瘖ID;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID  */
     @Excel(name = " 灏辫瘖ID;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID ")
-    @ApiModelProperty(name = "灏辫瘖ID;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID")
+    @ApiModelProperty(value = "灏辫瘖ID;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID")
     private Long visitid;
 
     public void setBloodsugarid(Long bloodsugarid) 
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedHypertension.java b/smartor/src/main/java/com/smartor/domain/PatMedHypertension.java
index c1dd3e6..1c21cb0 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedHypertension.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedHypertension.java
@@ -23,20 +23,20 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long id;
 
     /**
      * 娴佹按鍙�
      */
     @Excel(name = " 娴佹按鍙� ")
-    @ApiModelProperty(name = "娴佹按鍙�")
+    @ApiModelProperty(value = "娴佹按鍙�")
     private String serialnum;
 
     /**
      * 璁板綍鏃堕棿
      */
-    @ApiModelProperty(name = "璁板綍鏃堕棿")
+    @ApiModelProperty(value = "璁板綍鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 璁板綍鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordtime;
@@ -44,55 +44,55 @@
     /**
      * 鏁版嵁绫诲瀷
      */
-    @ApiModelProperty(name = "鏁版嵁绫诲瀷")
+    @ApiModelProperty(value = "鏁版嵁绫诲瀷")
     @Excel(name = " 鏁版嵁绫诲瀷 ")
     private String typename;
 
     /**
      * 鏀剁缉鍘�
      */
-    @ApiModelProperty(name = "鏀剁缉鍘�")
+    @ApiModelProperty(value = "鏀剁缉鍘�")
     @Excel(name = " 鏀剁缉鍘� ")
     private BigDecimal systolicpressure;
 
     /**
      * 鑸掑紶鍘�
      */
-    @ApiModelProperty(name = "鑸掑紶鍘�")
+    @ApiModelProperty(value = "鑸掑紶鍘�")
     @Excel(name = " 鑸掑紶鍘� ")
     private BigDecimal diastolicpressure;
 
     /**
      * 鏁版嵁鏉ユ簮
      */
-    @ApiModelProperty(name = "鏁版嵁鏉ユ簮")
+    @ApiModelProperty(value = "鏁版嵁鏉ユ簮")
     @Excel(name = " 鏁版嵁鏉ユ簮 ")
     private String sourcename;
 
     /**
      * 鏈烘瀯ID
      */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     @Excel(name = " 鏈烘瀯ID ")
     private String orgid;
 
     /**
      * 鍒犻櫎鏍囪
      */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     @Excel(name = " 涓婁紶鏍囪 ")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date uploadTime;
@@ -100,28 +100,28 @@
     /**
      * 妗fID
      */
-    @ApiModelProperty(name = "妗fID")
+    @ApiModelProperty(value = "妗fID")
     @Excel(name = " 妗fID ")
     private Long patid;
 
     /**
      * 蹇冪巼;娆�/鍒嗛挓
      */
-    @ApiModelProperty(name = "蹇冪巼;娆�/鍒嗛挓")
+    @ApiModelProperty(value = "蹇冪巼;娆�/鍒嗛挓")
     @Excel(name = " 蹇冪巼;娆�/鍒嗛挓 ")
     private Long heartrate;
 
     /**
      * 灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴
      */
-    @ApiModelProperty(name = "灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴")
+    @ApiModelProperty(value = "灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴")
     @Excel(name = " 灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴 ")
     private Long visittype;
 
     /**
      * 灏辫瘖ID;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID
      */
-    @ApiModelProperty(name = " 灏辫瘖ID;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID")
+    @ApiModelProperty(value = " 灏辫瘖ID;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID")
     @Excel(name = " 灏辫瘖ID;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID ")
     private Long visitid;
 
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedWeight.java b/smartor/src/main/java/com/smartor/domain/PatMedWeight.java
index e1b915d..446fc0a 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedWeight.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedWeight.java
@@ -22,67 +22,67 @@
     private static final long serialVersionUID = 1L;
 
     /**  鑷ID  */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long id;
 
     /**  娴佹按鍙�  */
-    @ApiModelProperty(name = "娴佹按鍙�")
+    @ApiModelProperty(value = "娴佹按鍙�")
     @Excel(name = " 娴佹按鍙� ")
     private String serialnum;
 
     /**  鑴傝偑閲嶉噺  */
-    @ApiModelProperty(name = "鑴傝偑閲嶉噺")
+    @ApiModelProperty(value = "鑴傝偑閲嶉噺")
     @Excel(name = " 鑴傝偑閲嶉噺 ")
     private BigDecimal fatweight;
 
     /**  浣撻噸  */
-    @ApiModelProperty(name = "浣撻噸")
+    @ApiModelProperty(value = "浣撻噸")
     @Excel(name = " 浣撻噸 ")
     private BigDecimal bodyweight;
 
     /**  璁板綍鏃堕棿  */
-    @ApiModelProperty(name = "璁板綍鏃堕棿")
+    @ApiModelProperty(value = "璁板綍鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 璁板綍鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordtime;
 
     /**  鏈烘瀯ID  */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     @Excel(name = " 鏈烘瀯ID ")
     private String orgid;
 
     /**  鍒犻櫎鏍囪  */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**  涓婁紶鏍囪  */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     @Excel(name = " 涓婁紶鏍囪 ")
     private Long isupload;
 
     /**  涓婁紶鏃堕棿  */
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date uploadTime;
 
     /**  妗fID  */
-    @ApiModelProperty(name = "妗fID")
+    @ApiModelProperty(value = "妗fID")
     @Excel(name = " 妗fID ")
     private Long patid;
 
     /**  鏁版嵁鏉ユ簮  */
-    @ApiModelProperty(name = "鏁版嵁鏉ユ簮")
+    @ApiModelProperty(value = "鏁版嵁鏉ユ簮")
     @Excel(name = " 鏁版嵁鏉ユ簮 ")
     private String sourcename;
 
     /**  灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴  */
-    @ApiModelProperty(name = "灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴")
+    @ApiModelProperty(value = "灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴")
     @Excel(name = " 灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴 ")
     private Long visittype;
 
     /**  灏辫瘖;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID  */
-    @ApiModelProperty(name = "灏辫瘖;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID")
+    @ApiModelProperty(value = "灏辫瘖;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID")
     @Excel(name = " 灏辫瘖;灏辫瘖绫诲瀷涓�-1:瀛橀棬璇婅褰旾D 2:瀛樹綇闄㈣褰旾D 3;瀛樹綋妫�璁板綍ID ")
     private Long visitid;
 
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTopicAndOptionRes.java b/smartor/src/main/java/com/smartor/domain/SvyLibTopicAndOptionRes.java
index d5ce65f..ae40116 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTopicAndOptionRes.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTopicAndOptionRes.java
@@ -19,45 +19,45 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long topicid;
 
 
     /**
      * 棰樼洰
      */
-    @ApiModelProperty(name = "棰樼洰")
+    @ApiModelProperty(value = "棰樼洰")
     private String topic;
 
     /**
      * 棰樼洰code
      */
-    @ApiModelProperty(name = "棰樼洰code")
+    @ApiModelProperty(value = "棰樼洰code")
     private String topiccode;
 
 
     /**
      * 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖
      */
-    @ApiModelProperty(name = "棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
+    @ApiModelProperty(value = "棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
     private String topictype;
 
     /**
      * 绫诲埆
      */
-    @ApiModelProperty(name = "绫诲埆")
+    @ApiModelProperty(value = "绫诲埆")
     private String tag;
 
     /**
      * 閫夐」code
      */
-    @ApiModelProperty(name = "閫夐」code")
+    @ApiModelProperty(value = "閫夐」code")
     private String optioncode;
 
     /**
      * 閫夐」鍐呭
      */
-    @ApiModelProperty(name = "閫夐」鍐呭")
+    @ApiModelProperty(value = "閫夐」鍐呭")
     private String optioncontent;
 
 
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTopicRes.java b/smartor/src/main/java/com/smartor/domain/SvyLibTopicRes.java
index d946b79..5d588c4 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTopicRes.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTopicRes.java
@@ -20,28 +20,28 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long topicid;
 
 
     /**
      * 闂嵎ID
      */
-    @ApiModelProperty(name = "闂嵎ID")
+    @ApiModelProperty(value = "闂嵎ID")
     private Long svyid;
 
 
     /**
      * 棰樼洰
      */
-    @ApiModelProperty(name = "棰樼洰")
+    @ApiModelProperty(value = "棰樼洰")
     @Excel(name = " 棰樼洰 ")
     private String topic;
 
     /**
      * 绫诲埆
      */
-    @ApiModelProperty(name = "绫诲埆")
+    @ApiModelProperty(value = "绫诲埆")
     @Excel(name = " 绫诲埆 ")
     private String tag;
 
@@ -49,84 +49,84 @@
     /**
      * 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖
      */
-    @ApiModelProperty(name = "棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
+    @ApiModelProperty(value = "棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
     @Excel(name = " 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖ ")
     private String topictype;
 
     /**
      * 绛旀
      */
-    @ApiModelProperty(name = "绛旀")
+    @ApiModelProperty(value = "绛旀")
     @Excel(name = " 绛旀 ")
     private String answer;
 
     /**
      * 閫夐」A
      */
-    @ApiModelProperty(name = "閫夐」A")
+    @ApiModelProperty(value = "閫夐」A")
     @Excel(name = " 閫夐」A ")
     private String optionA;
 
     /**
      * 閫夐」B
      */
-    @ApiModelProperty(name = "閫夐」B")
+    @ApiModelProperty(value = "閫夐」B")
     @Excel(name = " 閫夐」B ")
     private String optionB;
 
     /**
      * 閫夐」C
      */
-    @ApiModelProperty(name = "閫夐」C")
+    @ApiModelProperty(value = "閫夐」C")
     @Excel(name = " 閫夐」C ")
     private String optionC;
 
     /**
      * 閫夐」D
      */
-    @ApiModelProperty(name = "閫夐」D")
+    @ApiModelProperty(value = "閫夐」D")
     @Excel(name = " 閫夐」D ")
     private String optionD;
 
     /**
      * 閫夐」D
      */
-    @ApiModelProperty(name = "閫夐」E")
+    @ApiModelProperty(value = "閫夐」E")
     @Excel(name = " 閫夐」E ")
     private String optionE;
 
     /**
      * 閫夐」D
      */
-    @ApiModelProperty(name = "閫夐」F")
+    @ApiModelProperty(value = "閫夐」F")
     @Excel(name = " 閫夐」F ")
     private String optionF;
 
     /**
      * 閫夐」D
      */
-    @ApiModelProperty(name = "閫夐」G")
+    @ApiModelProperty(value = "閫夐」G")
     @Excel(name = " 閫夐」G ")
     private String optionG;
 
     /**
      * 閫夐」D
      */
-    @ApiModelProperty(name = "閫夐」H")
+    @ApiModelProperty(value = "閫夐」H")
     @Excel(name = " 閫夐」H ")
     private String optionH;
 
     /**
      * 鍒嗘暟
      */
-    @ApiModelProperty(name = "鍒嗘暟")
+    @ApiModelProperty(value = "鍒嗘暟")
     @Excel(name = " 鍒嗘暟 ")
     private String score;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(name = "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
     @Excel(name = " 澶囨敞 ")
     private String remark;
 
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTopicoption.java b/smartor/src/main/java/com/smartor/domain/SvyLibTopicoption.java
index 4a10be7..4e2eaac 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTopicoption.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTopicoption.java
@@ -24,165 +24,165 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long optionid;
 
     /**
      * 棰樼洰ID
      */
-    @ApiModelProperty(name = "棰樼洰ID")
+    @ApiModelProperty(value = "棰樼洰ID")
     @Excel(name = " 棰樼洰ID ")
     private Long topicid;
 
     /**
      * 闂嵎ID
      */
-    @ApiModelProperty(name = "闂嵎ID")
+    @ApiModelProperty(value = "闂嵎ID")
     private Long svyid;
 
     /**
      * 棰樼洰绫诲瀷
      */
-    @ApiModelProperty(name = "棰樼洰绫诲瀷")
+    @ApiModelProperty(value = "棰樼洰绫诲瀷")
     private Long topictype;
 
     /**
      * 閫夐」Code
      */
-    @ApiModelProperty(name = "閫夐」Code")
+    @ApiModelProperty(value = "閫夐」Code")
     private String optioncode;
 
     /**
      * 閫夐」鍐呭
      */
-    @ApiModelProperty(name = "閫夐」鍐呭")
+    @ApiModelProperty(value = "閫夐」鍐呭")
     private String optioncontent;
 
     /**
      * 鏄惁瀛樺湪鏄庣粏
      */
-    @ApiModelProperty(name = "鏄惁瀛樺湪鏄庣粏")
+    @ApiModelProperty(value = "鏄惁瀛樺湪鏄庣粏")
     private Long isexistdetail;
 
     /**
      * 鏄庣粏鏄惁蹇呭~
      */
-    @ApiModelProperty(name = "鏄庣粏鏄惁蹇呭~")
+    @ApiModelProperty(value = "鏄庣粏鏄惁蹇呭~")
     private Long detailismandatory;
 
     /**
      * 鏄惁寮傚父椤圭洰
      */
-    @ApiModelProperty(name = "鏄惁寮傚父椤圭洰")
+    @ApiModelProperty(value = "鏄惁寮傚父椤圭洰")
     private Long isexceptionitem;
 
     /**
      * 鏄惁璺熻繘
      */
-    @ApiModelProperty(name = "鏄惁璺熻繘")
+    @ApiModelProperty(value = "鏄惁璺熻繘")
     private Long istrack;
 
     /**
      * 鍒嗘暟
      */
-    @ApiModelProperty(name = "鍒嗘暟")
+    @ApiModelProperty(value = "鍒嗘暟")
     private Long score;
 
     /**
      * 鎻愮ず
      */
-    @ApiModelProperty(name = "鎻愮ず")
+    @ApiModelProperty(value = "鎻愮ず")
     private String prompt;
 
     /**
      * 璺宠浆
      */
-    @ApiModelProperty(name = "璺宠浆")
+    @ApiModelProperty(value = "璺宠浆")
     private String jump;
 
     /**
      * 鐖堕�夐」ID
      */
-    @ApiModelProperty(name = "鐖堕�夐」ID")
+    @ApiModelProperty(value = "鐖堕�夐」ID")
     private Long parentoptionid;
 
     /**
      * 鏄惁浜掓枼
      */
-    @ApiModelProperty(name = "鏄惁浜掓枼")
+    @ApiModelProperty(value = "鏄惁浜掓枼")
     private Long ismutex;
 
     /**
      * 楠岃瘉瑙勫垯
      */
-    @ApiModelProperty(name = "楠岃瘉瑙勫垯")
+    @ApiModelProperty(value = "楠岃瘉瑙勫垯")
     private String verifyrule;
 
     /**
      * 鎺掑簭
      */
-    @ApiModelProperty(name = "鎺掑簭")
+    @ApiModelProperty(value = "鎺掑簭")
     private Long sort;
 
     /**
      * 楠岃瘉绫诲瀷;0.涓嶉獙璇� 1.鏁存暟 2.灏忔暟 3.鎵嬫満鍙� 4.韬唤璇� 5.鏃ユ湡
      */
-    @ApiModelProperty(name = "楠岃瘉绫诲瀷;0.涓嶉獙璇� 1.鏁存暟 2.灏忔暟 3.鎵嬫満鍙� 4.韬唤璇� 5.鏃ユ湡 ")
+    @ApiModelProperty(value = "楠岃瘉绫诲瀷;0.涓嶉獙璇� 1.鏁存暟 2.灏忔暟 3.鎵嬫満鍙� 4.韬唤璇� 5.鏃ユ湡 ")
     private Long verificationtype;
 
     /**
      * 鏄惁闄愬埗鑼冨洿
      */
-    @ApiModelProperty(name = "鏄惁闄愬埗鑼冨洿")
+    @ApiModelProperty(value = "鏄惁闄愬埗鑼冨洿")
     private Long isrange;
 
     /**
      * 鏈�灏忚寖鍥�
      */
-    @ApiModelProperty(name = "鏈�灏忚寖鍥�")
+    @ApiModelProperty(value = "鏈�灏忚寖鍥�")
     private String minrange;
 
     /**
      * 鏈�澶ц寖鍥�
      */
-    @ApiModelProperty(name = "鏈�澶ц寖鍥�")
+    @ApiModelProperty(value = "鏈�澶ц寖鍥�")
     private String maxrange;
 
     /**
      * 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟
      */
-    @ApiModelProperty(name = "鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟")
+    @ApiModelProperty(value = "鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟")
     private Long rangelength;
 
     /**
      * 鏈烘瀯ID
      */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     private String orgid;
 
     /**
      * 涓婁竴鐗堟湰ID
      */
-    @ApiModelProperty(name = "涓婁竴鐗堟湰ID")
+    @ApiModelProperty(value = "涓婁竴鐗堟湰ID")
     private Long oldid;
 
     /**
      * 鍒犻櫎鏍囪
      */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     private Date uploadTime;
 
 }
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTopic.java b/smartor/src/main/java/com/smartor/domain/SvyTopic.java
index f2ed734..4a4bc3a 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTopic.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTopic.java
@@ -95,7 +95,7 @@
     /**
      * 涓婁紶鏍囪
      */
-    @ApiModelProperty(name = "绛旀")
+    @ApiModelProperty(value = "绛旀")
     private String answer;
 
 
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTopicReq.java b/smartor/src/main/java/com/smartor/domain/SvyTopicReq.java
index e065bc0..599acb5 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTopicReq.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTopicReq.java
@@ -23,12 +23,12 @@
     /**
      * 棰樼洰
      */
-    @ApiModelProperty(name = "棰樼洰")
+    @ApiModelProperty(value = "棰樼洰")
     private String topic;
 
-    @ApiModelProperty(name = "棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
+    @ApiModelProperty(value = "棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
     private String topicType;
 
-    @ApiModelProperty(name = "绫诲埆")
+    @ApiModelProperty(value = "绫诲埆")
     private String tag;
 }
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTopicoption.java b/smartor/src/main/java/com/smartor/domain/SvyTopicoption.java
index c25e3f7..be6559d 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTopicoption.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTopicoption.java
@@ -22,165 +22,165 @@
     /**
      * 鑷ID
      */
-    @ApiModelProperty(name = "鑷ID")
+    @ApiModelProperty(value = "鑷ID")
     private Long optionid;
 
     /**
      * 棰樼洰ID
      */
-    @ApiModelProperty(name = "棰樼洰ID")
+    @ApiModelProperty(value = "棰樼洰ID")
     @Excel(name = " 棰樼洰ID ")
     private Long topicid;
 
     /**
      * 闂嵎ID
      */
-    @ApiModelProperty(name = "闂嵎ID")
+    @ApiModelProperty(value = "闂嵎ID")
     private Long svyid;
 
     /**
      * 棰樼洰绫诲瀷
      */
-    @ApiModelProperty(name = "棰樼洰绫诲瀷")
+    @ApiModelProperty(value = "棰樼洰绫诲瀷")
     private Long topictype;
 
     /**
      * 閫夐」Code
      */
-    @ApiModelProperty(name = "閫夐」Code")
+    @ApiModelProperty(value = "閫夐」Code")
     private String optioncode;
 
     /**
      * 閫夐」鍐呭
      */
-    @ApiModelProperty(name = "閫夐」鍐呭")
+    @ApiModelProperty(value = "閫夐」鍐呭")
     private String optioncontent;
 
     /**
      * 鏄惁瀛樺湪鏄庣粏
      */
-    @ApiModelProperty(name = "鏄惁瀛樺湪鏄庣粏")
+    @ApiModelProperty(value = "鏄惁瀛樺湪鏄庣粏")
     private Long isexistdetail;
 
     /**
      * 鏄庣粏鏄惁蹇呭~
      */
-    @ApiModelProperty(name = "鏄庣粏鏄惁蹇呭~")
+    @ApiModelProperty(value = "鏄庣粏鏄惁蹇呭~")
     private Long detailismandatory;
 
     /**
      * 鏄惁寮傚父椤圭洰
      */
-    @ApiModelProperty(name = "鏄惁寮傚父椤圭洰")
+    @ApiModelProperty(value = "鏄惁寮傚父椤圭洰")
     private Long isexceptionitem;
 
     /**
      * 鏄惁璺熻繘
      */
-    @ApiModelProperty(name = "鏄惁璺熻繘")
+    @ApiModelProperty(value = "鏄惁璺熻繘")
     private Long istrack;
 
     /**
      * 鍒嗘暟
      */
-    @ApiModelProperty(name = "鍒嗘暟")
+    @ApiModelProperty(value = "鍒嗘暟")
     private Long score;
 
     /**
      * 鎻愮ず
      */
-    @ApiModelProperty(name = "鎻愮ず")
+    @ApiModelProperty(value = "鎻愮ず")
     private String prompt;
 
     /**
      * 璺宠浆
      */
-    @ApiModelProperty(name = "璺宠浆")
+    @ApiModelProperty(value = "璺宠浆")
     private String jump;
 
     /**
      * 鐖堕�夐」ID
      */
-    @ApiModelProperty(name = "鐖堕�夐」ID")
+    @ApiModelProperty(value = "鐖堕�夐」ID")
     private Long parentoptionid;
 
     /**
      * 鏄惁浜掓枼
      */
-    @ApiModelProperty(name = "鏄惁浜掓枼")
+    @ApiModelProperty(value = "鏄惁浜掓枼")
     private Long ismutex;
 
     /**
      * 楠岃瘉瑙勫垯
      */
-    @ApiModelProperty(name = "楠岃瘉瑙勫垯")
+    @ApiModelProperty(value = "楠岃瘉瑙勫垯")
     private String verifyrule;
 
     /**
      * 鎺掑簭
      */
-    @ApiModelProperty(name = "鎺掑簭")
+    @ApiModelProperty(value = "鎺掑簭")
     private Long sort;
 
     /**
      * 楠岃瘉绫诲瀷;0.涓嶉獙璇� 1.鏁存暟 2.灏忔暟 3.鎵嬫満鍙� 4.韬唤璇� 5.鏃ユ湡
      */
-    @ApiModelProperty(name = "楠岃瘉绫诲瀷;0.涓嶉獙璇� 1.鏁存暟 2.灏忔暟 3.鎵嬫満鍙� 4.韬唤璇� 5.鏃ユ湡 ")
+    @ApiModelProperty(value = "楠岃瘉绫诲瀷;0.涓嶉獙璇� 1.鏁存暟 2.灏忔暟 3.鎵嬫満鍙� 4.韬唤璇� 5.鏃ユ湡 ")
     private Long verificationtype;
 
     /**
      * 鏄惁闄愬埗鑼冨洿
      */
-    @ApiModelProperty(name = "鏄惁闄愬埗鑼冨洿")
+    @ApiModelProperty(value = "鏄惁闄愬埗鑼冨洿")
     private Long isrange;
 
     /**
      * 鏈�灏忚寖鍥�
      */
-    @ApiModelProperty(name = "鏈�灏忚寖鍥�")
+    @ApiModelProperty(value = "鏈�灏忚寖鍥�")
     private String minrange;
 
     /**
      * 鏈�澶ц寖鍥�
      */
-    @ApiModelProperty(name = "鏈�澶ц寖鍥�")
+    @ApiModelProperty(value = "鏈�澶ц寖鍥�")
     private String maxrange;
 
     /**
      * 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟
      */
-    @ApiModelProperty(name = "鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟")
+    @ApiModelProperty(value = "鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟")
     private Long rangelength;
 
     /**
      * 鏈烘瀯ID
      */
-    @ApiModelProperty(name = "鏈烘瀯ID")
+    @ApiModelProperty(value = "鏈烘瀯ID")
     private String orgid;
 
     /**
      * 涓婁竴鐗堟湰ID
      */
-    @ApiModelProperty(name = "涓婁竴鐗堟湰ID")
+    @ApiModelProperty(value = "涓婁竴鐗堟湰ID")
     private Long oldid;
 
     /**
      * 鍒犻櫎鏍囪
      */
-    @ApiModelProperty(name = "鍒犻櫎鏍囪")
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
-    @ApiModelProperty(name = "涓婁紶鏍囪")
+    @ApiModelProperty(value = "涓婁紶鏍囪")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "涓婁紶鏃堕棿")
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
     private Date uploadTime;
 
 }
diff --git a/smartor/src/main/java/com/smartor/domain/TreeNode.java b/smartor/src/main/java/com/smartor/domain/TreeNode.java
index 047ca30..3610a70 100644
--- a/smartor/src/main/java/com/smartor/domain/TreeNode.java
+++ b/smartor/src/main/java/com/smartor/domain/TreeNode.java
@@ -11,10 +11,10 @@
 @ApiModel(value = "TreeNode", description = "鑺傜偣鏍�")
 @Data
 public class TreeNode {
-    @ApiModelProperty(name = "鑺傜偣鍚嶇О")
+    @ApiModelProperty(value = "鑺傜偣鍚嶇О")
     private String name;
 
-    @ApiModelProperty(name = "瀛愯妭鐐归泦鍚�")
+    @ApiModelProperty(value = "瀛愯妭鐐归泦鍚�")
     private List<TreeNode> children;
 
     public TreeNode(String name) {
diff --git a/smartor/src/main/java/com/smartor/mapper/Icd10Mapper.java b/smartor/src/main/java/com/smartor/mapper/Icd10Mapper.java
new file mode 100644
index 0000000..0c040de
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/Icd10Mapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.Icd10;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鐤剧梾Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Mapper
+public interface Icd10Mapper {
+    /**
+     * 鏌ヨ鐤剧梾
+     *
+     * @param icdid 鐤剧梾涓婚敭
+     * @return 鐤剧梾
+     */
+    public Icd10 selectIcd10ByIcdid(Long icdid);
+
+    /**
+     * 鏌ヨ鐤剧梾鍒楄〃
+     *
+     * @param icd10 鐤剧梾
+     * @return 鐤剧梾闆嗗悎
+     */
+    public List<Icd10> selectIcd10List(Icd10 icd10);
+
+    /**
+     * 鏂板鐤剧梾
+     *
+     * @param icd10 鐤剧梾
+     * @return 缁撴灉
+     */
+    public int insertIcd10(Icd10 icd10);
+
+    /**
+     * 淇敼鐤剧梾
+     *
+     * @param icd10 鐤剧梾
+     * @return 缁撴灉
+     */
+    public int updateIcd10(Icd10 icd10);
+
+    /**
+     * 鍒犻櫎鐤剧梾
+     *
+     * @param icdid 鐤剧梾涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIcd10ByIcdid(Long icdid);
+
+    /**
+     * 鎵归噺鍒犻櫎鐤剧梾
+     *
+     * @param icdids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIcd10ByIcdids(Long[] icdids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaOutIcd10Mapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaOutIcd10Mapper.java
new file mode 100644
index 0000000..7ee6c45
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaOutIcd10Mapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.IvrLibaTargetIcd10;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鐤剧梾Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-20
+ */
+@Mapper
+public interface IvrLibaOutIcd10Mapper {
+    /**
+     * 鏌ヨ鎸囨爣鐤剧梾
+     *
+     * @param id 鎸囨爣鐤剧梾涓婚敭
+     * @return 鎸囨爣鐤剧梾
+     */
+    public IvrLibaTargetIcd10 selectIvrLibaTargetIcd10ById(Long id);
+
+    /**
+     * 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
+     *
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 鎸囨爣鐤剧梾闆嗗悎
+     */
+    public List<IvrLibaTargetIcd10> selectIvrLibaTargetIcd10List(IvrLibaTargetIcd10 ivrLibaTargetIcd10);
+
+    /**
+     * 鏂板鎸囨爣鐤剧梾
+     *
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaTargetIcd10(IvrLibaTargetIcd10 ivrLibaTargetIcd10);
+
+    /**
+     * 淇敼鎸囨爣鐤剧梾
+     *
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaTargetIcd10(IvrLibaTargetIcd10 ivrLibaTargetIcd10);
+
+    /**
+     * 鍒犻櫎鎸囨爣鐤剧梾
+     *
+     * @param id 鎸囨爣鐤剧梾涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTargetIcd10ById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣鐤剧梾
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTargetIcd10ByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptAssortMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptAssortMapper.java
new file mode 100644
index 0000000..91d35d9
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptAssortMapper.java
@@ -0,0 +1,68 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.IvrLibaScriptAssort;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鍒嗙被搴�
+ * Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Mapper
+public interface IvrLibaScriptAssortMapper {
+    /**
+     * 鏌ヨ闂璇濇湳鍒嗙被搴�
+     *
+     * @param id 闂璇濇湳鍒嗙被搴�
+     *           涓婚敭
+     * @return 闂璇濇湳鍒嗙被搴�
+     */
+    public IvrLibaScriptAssort selectIvrLibaScriptAssortById(Long id);
+
+    /**
+     * 鏌ヨ闂璇濇湳鍒嗙被搴�
+     * 鍒楄〃
+     *
+     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+     * @return 闂璇濇湳鍒嗙被搴�
+     * 闆嗗悎
+     */
+    public List<IvrLibaScriptAssort> selectIvrLibaScriptAssortList(IvrLibaScriptAssort ivrLibaScriptAssort);
+
+    /**
+     * 鏂板闂璇濇湳鍒嗙被搴�
+     *
+     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaScriptAssort(IvrLibaScriptAssort ivrLibaScriptAssort);
+
+    /**
+     * 淇敼闂璇濇湳鍒嗙被搴�
+     *
+     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaScriptAssort(IvrLibaScriptAssort ivrLibaScriptAssort);
+
+    /**
+     * 鍒犻櫎闂璇濇湳鍒嗙被搴�
+     *
+     * @param id 闂璇濇湳鍒嗙被搴�
+     *           涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptAssortById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鍒嗙被搴�
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptAssortByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptMapper.java
index af112a2..6945bcd 100644
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptMapper.java
@@ -1,61 +1,57 @@
 package com.smartor.mapper;
 
-import java.util.List;
 import com.smartor.domain.IvrLibaScript;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
 
 /**
- * 璇濇湳搴揗apper鎺ュ彛
- * 
- * @author smartor
- * @date 2023-03-22
+ * 闂璇濇湳搴揗apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-21
  */
-public interface IvrLibaScriptMapper 
-{
+@Mapper
+public interface IvrLibaScriptMapper {
     /**
-     * 鏌ヨ璇濇湳搴�
-     * 
-     * @param questionid 璇濇湳搴撲富閿�
-     * @return 璇濇湳搴�
+     * 鏌ヨ闂璇濇湳搴�
+     *
+     * @param questionid 闂璇濇湳搴撲富閿�
+     * @return 闂璇濇湳搴�
      */
     public IvrLibaScript selectIvrLibaScriptByQuestionid(String questionid);
 
     /**
-     * 鏌ヨ璇濇湳搴撳垪琛�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
-     * @return 璇濇湳搴撻泦鍚�
+     * 鏌ヨ闂璇濇湳搴撳垪琛�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
+     * @return 闂璇濇湳搴撻泦鍚�
      */
     public List<IvrLibaScript> selectIvrLibaScriptList(IvrLibaScript ivrLibaScript);
 
     /**
-     * 鏂板璇濇湳搴�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
+     * 鏂板闂璇濇湳搴�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
      * @return 缁撴灉
      */
     public int insertIvrLibaScript(IvrLibaScript ivrLibaScript);
 
     /**
-     * 淇敼璇濇湳搴�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
+     * 淇敼闂璇濇湳搴�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
      * @return 缁撴灉
      */
     public int updateIvrLibaScript(IvrLibaScript ivrLibaScript);
 
     /**
-     * 鍒犻櫎璇濇湳搴�
-     * 
-     * @param questionid 璇濇湳搴撲富閿�
+     * 鍒犻櫎闂璇濇湳搴�
+     *
+     * @param id 闂璇濇湳搴撲富閿�
      * @return 缁撴灉
      */
-    public int deleteIvrLibaScriptByQuestionid(String questionid);
+    public int deleteIvrLibaScriptByQuestionid(Integer id);
 
-    /**
-     * 鎵归噺鍒犻櫎璇濇湳搴�
-     * 
-     * @param questionids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
-     * @return 缁撴灉
-     */
-    public int deleteIvrLibaScriptByQuestionids(String[] questionids);
+
 }
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTagMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTagMapper.java
new file mode 100644
index 0000000..471b349
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTagMapper.java
@@ -0,0 +1,64 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.IvrLibaScriptTag;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鏍囩搴揗apper鎺ュ彛
+ * 
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Mapper
+public interface IvrLibaScriptTagMapper 
+{
+    /**
+     * 鏌ヨ闂璇濇湳鏍囩搴�
+     * 
+     * @param id 闂璇濇湳鏍囩搴撲富閿�
+     * @return 闂璇濇湳鏍囩搴�
+     */
+    public IvrLibaScriptTag selectIvrLibaScriptTagById(Long id);
+
+    /**
+     * 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
+     * 
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 闂璇濇湳鏍囩搴撻泦鍚�
+     */
+    public List<IvrLibaScriptTag> selectIvrLibaScriptTagList(IvrLibaScriptTag ivrLibaScriptTag);
+
+    /**
+     * 鏂板闂璇濇湳鏍囩搴�
+     * 
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaScriptTag(IvrLibaScriptTag ivrLibaScriptTag);
+
+    /**
+     * 淇敼闂璇濇湳鏍囩搴�
+     * 
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaScriptTag(IvrLibaScriptTag ivrLibaScriptTag);
+
+    /**
+     * 鍒犻櫎闂璇濇湳鏍囩搴�
+     * 
+     * @param id 闂璇濇湳鏍囩搴撲富閿�
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptTagById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鏍囩搴�
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptTagByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTargetoptionMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTargetoptionMapper.java
new file mode 100644
index 0000000..e884594
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaScriptTargetoptionMapper.java
@@ -0,0 +1,56 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.IvrLibaScriptTargetoption;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鎸囨爣閫夐」搴揗apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Mapper
+public interface IvrLibaScriptTargetoptionMapper {
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param targetoptionid 闂璇濇湳鎸囨爣閫夐」搴撲富閿�
+     * @return 闂璇濇湳鎸囨爣閫夐」搴�
+     */
+    public IvrLibaScriptTargetoption selectIvrLibaScriptTargetoptionByTargetoptionid(String targetoptionid);
+
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴撳垪琛�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 闂璇濇湳鎸囨爣閫夐」搴撻泦鍚�
+     */
+    public List<IvrLibaScriptTargetoption> selectIvrLibaScriptTargetoptionList(IvrLibaScriptTargetoption ivrLibaScriptTargetoption);
+
+    /**
+     * 鏂板闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaScriptTargetoption(IvrLibaScriptTargetoption ivrLibaScriptTargetoption);
+
+    /**
+     * 淇敼闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaScriptTargetoption(IvrLibaScriptTargetoption ivrLibaScriptTargetoption);
+
+    /**
+     * 鍒犻櫎闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param id 闂璇濇湳鎸囨爣閫夐」搴撲富閿�
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptTargetoptionByTargetoptionid(Long id);
+
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaScripttargetMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaScripttargetMapper.java
deleted file mode 100644
index 6effbce..0000000
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaScripttargetMapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.smartor.mapper;
-
-import java.util.List;
-import com.smartor.domain.IvrLibaScripttarget;
-
-/**
- * 璇濇湳搴撹瘽鏈寚鏍嘙apper鎺ュ彛
- * 
- * @author smartor
- * @date 2023-03-22
- */
-public interface IvrLibaScripttargetMapper 
-{
-    /**
-     * 鏌ヨ璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param questionTargetID 璇濇湳搴撹瘽鏈寚鏍囦富閿�
-     * @return 璇濇湳搴撹瘽鏈寚鏍�
-     */
-    public IvrLibaScripttarget selectIvrLibaScripttargetByQuestionTargetID(String questionTargetID);
-
-    /**
-     * 鏌ヨ璇濇湳搴撹瘽鏈寚鏍囧垪琛�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 璇濇湳搴撹瘽鏈寚鏍囬泦鍚�
-     */
-    public List<IvrLibaScripttarget> selectIvrLibaScripttargetList(IvrLibaScripttarget ivrLibaScripttarget);
-
-    /**
-     * 鏂板璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 缁撴灉
-     */
-    public int insertIvrLibaScripttarget(IvrLibaScripttarget ivrLibaScripttarget);
-
-    /**
-     * 淇敼璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 缁撴灉
-     */
-    public int updateIvrLibaScripttarget(IvrLibaScripttarget ivrLibaScripttarget);
-
-    /**
-     * 鍒犻櫎璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param questionTargetID 璇濇湳搴撹瘽鏈寚鏍囦富閿�
-     * @return 缁撴灉
-     */
-    public int deleteIvrLibaScripttargetByQuestionTargetID(String questionTargetID);
-
-    /**
-     * 鎵归噺鍒犻櫎璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param questionTargetIDs 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
-     * @return 缁撴灉
-     */
-    public int deleteIvrLibaScripttargetByQuestionTargetIDs(String[] questionTargetIDs);
-}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
index 81d514a..15268fb 100644
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
@@ -1,6 +1,7 @@
 package com.smartor.mapper;
 
 import com.smartor.domain.IvrLibaTarget;
+import com.smartor.domain.IvrLibaTargetVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -30,6 +31,8 @@
      */
     public List<IvrLibaTarget> selectIvrLibaTargetList(IvrLibaTarget ivrLibaTarget);
 
+    public List<IvrLibaTargetVO> targetInfo(IvrLibaTarget ivrLibaTarget);
+
     /**
      * 鏂板鎸囨爣閫夐」搴�
      * 
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetTagMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetTagMapper.java
new file mode 100644
index 0000000..fac5b40
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetTagMapper.java
@@ -0,0 +1,72 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.BaseTag;
+import com.smartor.domain.IvrLibaTargetTag;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鏍囩Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@Mapper
+public interface IvrLibaTargetTagMapper {
+    /**
+     * 鏌ヨ鎸囨爣鏍囩
+     *
+     * @param id 鎸囨爣鏍囩涓婚敭
+     * @return 鎸囨爣鏍囩
+     */
+    public IvrLibaTargetTag selectIvrLibaTargetTagById(Long id);
+
+    /**
+     * 鏌ヨ鎸囨爣鍚嶇О
+     *
+     * @param id 鎸囨爣鏍囩涓婚敭
+     * @return 鎸囨爣鏍囩
+     */
+    public List<BaseTag> selectTagName(Long targetid);
+
+    /**
+     * 鏌ヨ鎸囨爣鏍囩鍒楄〃
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 鎸囨爣鏍囩闆嗗悎
+     */
+    public List<IvrLibaTargetTag> selectIvrLibaTargetTagList(IvrLibaTargetTag ivrLibaTargetTag);
+
+    /**
+     * 鏂板鎸囨爣鏍囩
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaTargetTag(IvrLibaTargetTag ivrLibaTargetTag);
+
+    /**
+     * 淇敼鎸囨爣鏍囩
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaTargetTag(IvrLibaTargetTag ivrLibaTargetTag);
+
+    /**
+     * 鍒犻櫎鎸囨爣鏍囩
+     *
+     * @param id 鎸囨爣鏍囩涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTargetTagById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣鏍囩
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTargetTagByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java
index dae98f1..f2b8ec3 100644
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetoptionMapper.java
@@ -60,4 +60,5 @@
      * @return 缁撴灉
      */
     public int deleteIvrLibaTargetoptionByTargetoptionids(Long[] targetoptionids);
+
 }
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTemplatetargetAssortMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTemplatetargetAssortMapper.java
new file mode 100644
index 0000000..7315768
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTemplatetargetAssortMapper.java
@@ -0,0 +1,64 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.IvrLibaTemplatetargetAssort;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣妯℃澘鍒嗙被Mapper鎺ュ彛
+ * 
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@Mapper
+public interface IvrLibaTemplatetargetAssortMapper 
+{
+    /**
+     * 鏌ヨ鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param id 鎸囨爣妯℃澘鍒嗙被涓婚敭
+     * @return 鎸囨爣妯℃澘鍒嗙被
+     */
+    public IvrLibaTemplatetargetAssort selectIvrLibaTemplatetargetAssortById(Long id);
+
+    /**
+     * 鏌ヨ鎸囨爣妯℃澘鍒嗙被鍒楄〃
+     * 
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 鎸囨爣妯℃澘鍒嗙被闆嗗悎
+     */
+    public List<IvrLibaTemplatetargetAssort> selectIvrLibaTemplatetargetAssortList(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort);
+
+    /**
+     * 鏂板鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaTemplatetargetAssort(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort);
+
+    /**
+     * 淇敼鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaTemplatetargetAssort(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort);
+
+    /**
+     * 鍒犻櫎鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param id 鎸囨爣妯℃澘鍒嗙被涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTemplatetargetAssortById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTemplatetargetAssortByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java b/smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java
index 4256aa0..92eddc6 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatArchivetagMapper.java
@@ -53,7 +53,7 @@
      * @param id 鎮h�呮。妗堟爣绛句富閿�
      * @return 缁撴灉
      */
-    public int deletePatArchivetagById(Long id);
+    public int deletePatArchivetagById(PatArchivetag patArchivetag);
 
     /**
      * 鎵归噺鍒犻櫎鎮h�呮。妗堟爣绛�
diff --git a/smartor/src/main/java/com/smartor/service/IIcd10Service.java b/smartor/src/main/java/com/smartor/service/IIcd10Service.java
new file mode 100644
index 0000000..c036844
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIcd10Service.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.Icd10;
+
+import java.util.List;
+
+/**
+ * 鐤剧梾Service鎺ュ彛
+ * 
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+public interface IIcd10Service 
+{
+    /**
+     * 鏌ヨ鐤剧梾
+     * 
+     * @param icdid 鐤剧梾涓婚敭
+     * @return 鐤剧梾
+     */
+    public Icd10 selectIcd10ByIcdid(Long icdid);
+
+    /**
+     * 鏌ヨ鐤剧梾鍒楄〃
+     * 
+     * @param icd10 鐤剧梾
+     * @return 鐤剧梾闆嗗悎
+     */
+    public List<Icd10> selectIcd10List(Icd10 icd10);
+
+    /**
+     * 鏂板鐤剧梾
+     * 
+     * @param icd10 鐤剧梾
+     * @return 缁撴灉
+     */
+    public int insertIcd10(Icd10 icd10);
+
+    /**
+     * 淇敼鐤剧梾
+     * 
+     * @param icd10 鐤剧梾
+     * @return 缁撴灉
+     */
+    public int updateIcd10(Icd10 icd10);
+
+    /**
+     * 鎵归噺鍒犻櫎鐤剧梾
+     * 
+     * @param icdids 闇�瑕佸垹闄ょ殑鐤剧梾涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIcd10ByIcdids(Long[] icdids);
+
+    /**
+     * 鍒犻櫎鐤剧梾淇℃伅
+     * 
+     * @param icdid 鐤剧梾涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIcd10ByIcdid(Long icdid);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaOutIcd10Service.java b/smartor/src/main/java/com/smartor/service/IIvrLibaOutIcd10Service.java
new file mode 100644
index 0000000..f27af09
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaOutIcd10Service.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.IvrLibaTargetIcd10;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鐤剧梾Service鎺ュ彛
+ * 
+ * @author ruoyi
+ * @date 2023-12-20
+ */
+public interface IIvrLibaOutIcd10Service
+{
+    /**
+     * 鏌ヨ鎸囨爣鐤剧梾
+     * 
+     * @param id 鎸囨爣鐤剧梾涓婚敭
+     * @return 鎸囨爣鐤剧梾
+     */
+    public IvrLibaTargetIcd10 selectIvrLibaTargetIcd10ById(Long id);
+
+    /**
+     * 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
+     * 
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 鎸囨爣鐤剧梾闆嗗悎
+     */
+    public List<IvrLibaTargetIcd10> selectIvrLibaTargetIcd10List(IvrLibaTargetIcd10 ivrLibaTargetIcd10);
+
+    /**
+     * 鏂板鎸囨爣鐤剧梾
+     * 
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaTargetIcd10(IvrLibaTargetIcd10 ivrLibaTargetIcd10);
+
+    /**
+     * 淇敼鎸囨爣鐤剧梾
+     * 
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaTargetIcd10(IvrLibaTargetIcd10 ivrLibaTargetIcd10);
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣鐤剧梾
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣鐤剧梾涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTargetIcd10ByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎鎸囨爣鐤剧梾淇℃伅
+     * 
+     * @param id 鎸囨爣鐤剧梾涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTargetIcd10ById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaScriptAssortService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaScriptAssortService.java
new file mode 100644
index 0000000..aa040ef
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaScriptAssortService.java
@@ -0,0 +1,79 @@
+package com.smartor.service;
+
+import com.smartor.domain.IvrLibaScriptAssort;
+import com.smartor.domain.IvrLibaScriptAssortVO;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鍒嗙被搴�
+Service鎺ュ彛
+ * 
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+public interface IIvrLibaScriptAssortService 
+{
+    /**
+     * 鏌ヨ闂璇濇湳鍒嗙被搴�
+
+     * 
+     * @param id 闂璇濇湳鍒嗙被搴�
+涓婚敭
+     * @return 闂璇濇湳鍒嗙被搴�
+
+     */
+    public IvrLibaScriptAssort selectIvrLibaScriptAssortById(Long id);
+
+    /**
+     * 鏌ヨ闂璇濇湳鍒嗙被搴�
+鍒楄〃
+     * 
+     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+
+     * @return 闂璇濇湳鍒嗙被搴�
+闆嗗悎
+     */
+    public List<IvrLibaScriptAssortVO> selectIvrLibaScriptAssortList(IvrLibaScriptAssort ivrLibaScriptAssort);
+
+
+    /**
+     * 鏂板闂璇濇湳鍒嗙被搴�
+
+     * 
+     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaScriptAssort(IvrLibaScriptAssort ivrLibaScriptAssort);
+
+    /**
+     * 淇敼闂璇濇湳鍒嗙被搴�
+
+     * 
+     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaScriptAssort(IvrLibaScriptAssort ivrLibaScriptAssort);
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鍒嗙被搴�
+
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑闂璇濇湳鍒嗙被搴�
+涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptAssortByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎闂璇濇湳鍒嗙被搴�
+淇℃伅
+     * 
+     * @param id 闂璇濇湳鍒嗙被搴�
+涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptAssortById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaScriptService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaScriptService.java
index 0a65c94..c866bb2 100644
--- a/smartor/src/main/java/com/smartor/service/IIvrLibaScriptService.java
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaScriptService.java
@@ -1,61 +1,65 @@
 package com.smartor.service;
 
-import java.util.List;
 import com.smartor.domain.IvrLibaScript;
+import com.smartor.domain.IvrLibaScriptVO;
+
+import java.util.List;
 
 /**
- * 璇濇湳搴揝ervice鎺ュ彛
- * 
- * @author smartor
- * @date 2023-03-22
+ * 闂璇濇湳搴揝ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-21
  */
-public interface IIvrLibaScriptService 
-{
+public interface IIvrLibaScriptService {
     /**
-     * 鏌ヨ璇濇湳搴�
-     * 
-     * @param questionid 璇濇湳搴撲富閿�
-     * @return 璇濇湳搴�
+     * 鏌ヨ闂璇濇湳搴�
+     *
+     * @param questionid 闂璇濇湳搴撲富閿�
+     * @return 闂璇濇湳搴�
      */
     public IvrLibaScript selectIvrLibaScriptByQuestionid(String questionid);
 
     /**
-     * 鏌ヨ璇濇湳搴撳垪琛�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
-     * @return 璇濇湳搴撻泦鍚�
+     * 鏌ヨ闂璇濇湳搴撳垪琛�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
+     * @return 闂璇濇湳搴撻泦鍚�
      */
     public List<IvrLibaScript> selectIvrLibaScriptList(IvrLibaScript ivrLibaScript);
 
     /**
-     * 鏂板璇濇湳搴�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
+     * 鏌ヨ闂璇濇湳璇︽儏鏍规嵁鏉′欢
+     */
+    public IvrLibaScriptVO selectInfoByCondition(IvrLibaScriptVO ivrLibaScriptVO);
+
+    /**
+     * 鏌ヨ闂璇濇湳璇︽儏鏍规嵁鏉′欢
+     */
+    public Integer saveOrUpdateScript(IvrLibaScriptVO ivrLibaScriptVO);
+
+    /**
+     * 鏂板闂璇濇湳搴�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
      * @return 缁撴灉
      */
     public int insertIvrLibaScript(IvrLibaScript ivrLibaScript);
 
     /**
-     * 淇敼璇濇湳搴�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
+     * 淇敼闂璇濇湳搴�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
      * @return 缁撴灉
      */
     public int updateIvrLibaScript(IvrLibaScript ivrLibaScript);
 
     /**
-     * 鎵归噺鍒犻櫎璇濇湳搴�
-     * 
-     * @param questionids 闇�瑕佸垹闄ょ殑璇濇湳搴撲富閿泦鍚�
+     * 鎵归噺鍒犻櫎闂璇濇湳搴�
+     *
+     * @param questionids 闇�瑕佸垹闄ょ殑闂璇濇湳搴撲富閿泦鍚�
      * @return 缁撴灉
      */
     public int deleteIvrLibaScriptByQuestionids(String[] questionids);
 
-    /**
-     * 鍒犻櫎璇濇湳搴撲俊鎭�
-     * 
-     * @param questionid 璇濇湳搴撲富閿�
-     * @return 缁撴灉
-     */
-    public int deleteIvrLibaScriptByQuestionid(String questionid);
 }
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaScriptTagService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaScriptTagService.java
new file mode 100644
index 0000000..91d285b
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaScriptTagService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.IvrLibaScriptTag;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鏍囩搴揝ervice鎺ュ彛
+ * 
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+public interface IIvrLibaScriptTagService 
+{
+    /**
+     * 鏌ヨ闂璇濇湳鏍囩搴�
+     * 
+     * @param id 闂璇濇湳鏍囩搴撲富閿�
+     * @return 闂璇濇湳鏍囩搴�
+     */
+    public IvrLibaScriptTag selectIvrLibaScriptTagById(Long id);
+
+    /**
+     * 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
+     * 
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 闂璇濇湳鏍囩搴撻泦鍚�
+     */
+    public List<IvrLibaScriptTag> selectIvrLibaScriptTagList(IvrLibaScriptTag ivrLibaScriptTag);
+
+    /**
+     * 鏂板闂璇濇湳鏍囩搴�
+     * 
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaScriptTag(IvrLibaScriptTag ivrLibaScriptTag);
+
+    /**
+     * 淇敼闂璇濇湳鏍囩搴�
+     * 
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaScriptTag(IvrLibaScriptTag ivrLibaScriptTag);
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鏍囩搴�
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑闂璇濇湳鏍囩搴撲富閿泦鍚�
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptTagByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎闂璇濇湳鏍囩搴撲俊鎭�
+     * 
+     * @param id 闂璇濇湳鏍囩搴撲富閿�
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptTagById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaScriptTargetoptionService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaScriptTargetoptionService.java
new file mode 100644
index 0000000..f5d8bf1
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaScriptTargetoptionService.java
@@ -0,0 +1,54 @@
+package com.smartor.service;
+
+import com.smartor.domain.IvrLibaScriptTargetoption;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鎸囨爣閫夐」搴揝ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+public interface IIvrLibaScriptTargetoptionService {
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param targetoptionid 闂璇濇湳鎸囨爣閫夐」搴撲富閿�
+     * @return 闂璇濇湳鎸囨爣閫夐」搴�
+     */
+    public IvrLibaScriptTargetoption selectIvrLibaScriptTargetoptionByTargetoptionid(String targetoptionid);
+
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴撳垪琛�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 闂璇濇湳鎸囨爣閫夐」搴撻泦鍚�
+     */
+    public List<IvrLibaScriptTargetoption> selectIvrLibaScriptTargetoptionList(IvrLibaScriptTargetoption ivrLibaScriptTargetoption);
+
+    /**
+     * 鏂板闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaScriptTargetoption(IvrLibaScriptTargetoption ivrLibaScriptTargetoption);
+
+    /**
+     * 淇敼闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaScriptTargetoption(IvrLibaScriptTargetoption ivrLibaScriptTargetoption);
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param targetoptionids 闇�瑕佸垹闄ょ殑闂璇濇湳鎸囨爣閫夐」搴撲富閿泦鍚�
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaScriptTargetoptionByTargetoptionids(String[] targetoptionids);
+
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaScripttargetService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaScripttargetService.java
deleted file mode 100644
index 4603e62..0000000
--- a/smartor/src/main/java/com/smartor/service/IIvrLibaScripttargetService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.smartor.service;
-
-import java.util.List;
-import com.smartor.domain.IvrLibaScripttarget;
-
-/**
- * 璇濇湳搴撹瘽鏈寚鏍嘢ervice鎺ュ彛
- * 
- * @author smartor
- * @date 2023-03-22
- */
-public interface IIvrLibaScripttargetService 
-{
-    /**
-     * 鏌ヨ璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param questionTargetID 璇濇湳搴撹瘽鏈寚鏍囦富閿�
-     * @return 璇濇湳搴撹瘽鏈寚鏍�
-     */
-    public IvrLibaScripttarget selectIvrLibaScripttargetByQuestionTargetID(String questionTargetID);
-
-    /**
-     * 鏌ヨ璇濇湳搴撹瘽鏈寚鏍囧垪琛�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 璇濇湳搴撹瘽鏈寚鏍囬泦鍚�
-     */
-    public List<IvrLibaScripttarget> selectIvrLibaScripttargetList(IvrLibaScripttarget ivrLibaScripttarget);
-
-    /**
-     * 鏂板璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 缁撴灉
-     */
-    public int insertIvrLibaScripttarget(IvrLibaScripttarget ivrLibaScripttarget);
-
-    /**
-     * 淇敼璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 缁撴灉
-     */
-    public int updateIvrLibaScripttarget(IvrLibaScripttarget ivrLibaScripttarget);
-
-    /**
-     * 鎵归噺鍒犻櫎璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param questionTargetIDs 闇�瑕佸垹闄ょ殑璇濇湳搴撹瘽鏈寚鏍囦富閿泦鍚�
-     * @return 缁撴灉
-     */
-    public int deleteIvrLibaScripttargetByQuestionTargetIDs(String[] questionTargetIDs);
-
-    /**
-     * 鍒犻櫎璇濇湳搴撹瘽鏈寚鏍囦俊鎭�
-     * 
-     * @param questionTargetID 璇濇湳搴撹瘽鏈寚鏍囦富閿�
-     * @return 缁撴灉
-     */
-    public int deleteIvrLibaScripttargetByQuestionTargetID(String questionTargetID);
-}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
index 12a1111..b6313d4 100644
--- a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
@@ -1,20 +1,20 @@
 package com.smartor.service;
 
 import com.smartor.domain.IvrLibaTarget;
+import com.smartor.domain.IvrLibaTargetVO;
 
 import java.util.List;
 
 /**
  * 鎸囨爣閫夐」搴揝ervice鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2023-12-14
  */
-public interface IIvrLibaTargetService 
-{
+public interface IIvrLibaTargetService {
     /**
      * 鏌ヨ鎸囨爣閫夐」搴�
-     * 
+     *
      * @param targetID 鎸囨爣閫夐」搴撲富閿�
      * @return 鎸囨爣閫夐」搴�
      */
@@ -22,31 +22,40 @@
 
     /**
      * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
-     * 
+     *
      * @param ivrLibaTarget 鎸囨爣閫夐」搴�
      * @return 鎸囨爣閫夐」搴撻泦鍚�
      */
     public List<IvrLibaTarget> selectIvrLibaTargetList(IvrLibaTarget ivrLibaTarget);
 
     /**
-     * 鏂板鎸囨爣閫夐」搴�
-     * 
+     * 鏌ヨ鎸囨爣鍜屽叧鑱旂殑鎸囨爣閫夐」
+     *
      * @param ivrLibaTarget 鎸囨爣閫夐」搴�
+     * @return 鏌ヨ鎸囨爣鍜屽叧鑱旂殑鎸囨爣閫夐」
+     */
+    public List<IvrLibaTargetVO> targetInfo(IvrLibaTarget ivrLibaTarget);
+
+    /**
+     * 鏂板鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaTargetVO 鎸囨爣閫夐」搴�
      * @return 缁撴灉
      */
-    public int insertIvrLibaTarget(IvrLibaTarget ivrLibaTarget);
+    public int insertIvrLibaTarget(IvrLibaTargetVO ivrLibaTargetVO);
 
     /**
      * 淇敼鎸囨爣閫夐」搴�
-     * 
-     * @param ivrLibaTarget 鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaTargetVO 鎸囨爣閫夐」搴�
      * @return 缁撴灉
      */
-    public int updateIvrLibaTarget(IvrLibaTarget ivrLibaTarget);
+    public int saveOrupdateIvrLibaTarget(IvrLibaTargetVO ivrLibaTargetVO);
+
 
     /**
      * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
-     * 
+     *
      * @param targetIDs 闇�瑕佸垹闄ょ殑鎸囨爣閫夐」搴撲富閿泦鍚�
      * @return 缁撴灉
      */
@@ -54,7 +63,7 @@
 
     /**
      * 鍒犻櫎鎸囨爣閫夐」搴撲俊鎭�
-     * 
+     *
      * @param targetID 鎸囨爣閫夐」搴撲富閿�
      * @return 缁撴灉
      */
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetTagService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetTagService.java
new file mode 100644
index 0000000..e0d3157
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetTagService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.IvrLibaTargetTag;
+import com.smartor.domain.IvrLibaTargetTagVO;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鏍囩Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+public interface IIvrLibaTargetTagService {
+    /**
+     * 鏌ヨ鎸囨爣鏍囩
+     *
+     * @param id 鎸囨爣鏍囩涓婚敭
+     * @return 鎸囨爣鏍囩
+     */
+    public IvrLibaTargetTag selectIvrLibaTargetTagById(Long id);
+
+    /**
+     * 鏌ヨ鎸囨爣鏍囩鍒楄〃
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 鎸囨爣鏍囩闆嗗悎
+     */
+    public List<IvrLibaTargetTag> selectIvrLibaTargetTagList(IvrLibaTargetTag ivrLibaTargetTag);
+
+    /**
+     * 鏂板鎸囨爣鏍囩
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaTargetTag(IvrLibaTargetTag ivrLibaTargetTag);
+
+    /**
+     * 淇敼鎸囨爣鏍囩
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaTargetTag(IvrLibaTargetTag ivrLibaTargetTag);
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣鏍囩
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣鏍囩涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTargetTagByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎鎸囨爣鏍囩淇℃伅
+     *
+     * @param id 鎸囨爣鏍囩涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTargetTagById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaTemplatetargetAssortService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaTemplatetargetAssortService.java
new file mode 100644
index 0000000..b0c3520
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaTemplatetargetAssortService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.IvrLibaTemplatetargetAssort;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣妯℃澘鍒嗙被Service鎺ュ彛
+ * 
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+public interface IIvrLibaTemplatetargetAssortService 
+{
+    /**
+     * 鏌ヨ鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param id 鎸囨爣妯℃澘鍒嗙被涓婚敭
+     * @return 鎸囨爣妯℃澘鍒嗙被
+     */
+    public IvrLibaTemplatetargetAssort selectIvrLibaTemplatetargetAssortById(Long id);
+
+    /**
+     * 鏌ヨ鎸囨爣妯℃澘鍒嗙被鍒楄〃
+     * 
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 鎸囨爣妯℃澘鍒嗙被闆嗗悎
+     */
+    public List<IvrLibaTemplatetargetAssort> selectIvrLibaTemplatetargetAssortList(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort);
+
+    /**
+     * 鏂板鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 缁撴灉
+     */
+    public int insertIvrLibaTemplatetargetAssort(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort);
+
+    /**
+     * 淇敼鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 缁撴灉
+     */
+    public int updateIvrLibaTemplatetargetAssort(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort);
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣妯℃澘鍒嗙被
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣妯℃澘鍒嗙被涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTemplatetargetAssortByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎鎸囨爣妯℃澘鍒嗙被淇℃伅
+     * 
+     * @param id 鎸囨爣妯℃澘鍒嗙被涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteIvrLibaTemplatetargetAssortById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchiveService.java b/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
index 677f222..38014de 100644
--- a/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatArchiveService.java
@@ -39,15 +39,15 @@
      * @param patArchive 鎮h�呮。妗�
      * @return 缁撴灉
      */
-    public int insertPatArchive(PatArchive patArchive);
+    public Integer insertPatArchive(PatArchive patArchive);
 
     /**
      * 淇敼鎮h�呮。妗�
      *
-     * @param patArchive 鎮h�呮。妗�
+     * @param patArchiveVO 鎮h�呮。妗�
      * @return 缁撴灉
      */
-    public Boolean updatePatArchive(PatArchive patArchive);
+    public Boolean saveOrUpdatePatInfo(PatArchiveVO patArchiveVO);
 
     /**
      * 鎵归噺鍒犻櫎鎮h�呮。妗�
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchivetagService.java b/smartor/src/main/java/com/smartor/service/IPatArchivetagService.java
index 158ab41..907c902 100644
--- a/smartor/src/main/java/com/smartor/service/IPatArchivetagService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatArchivetagService.java
@@ -53,12 +53,6 @@
      */
     public int deletePatArchivetagByIds(Long[] ids);
 
-    /**
-     * 鍒犻櫎鎮h�呮。妗堟爣绛句俊鎭�
-     *
-     * @param id 鎮h�呮。妗堟爣绛句富閿�
-     * @return 缁撴灉
-     */
-    public int deletePatArchivetagById(Long id);
+
 
 }
\ No newline at end of file
diff --git a/smartor/src/main/java/com/smartor/service/impl/Icd10ServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/Icd10ServiceImpl.java
new file mode 100644
index 0000000..e84b6a3
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/Icd10ServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.Icd10;
+import com.smartor.mapper.Icd10Mapper;
+import com.smartor.service.IIcd10Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鐤剧梾Service涓氬姟灞傚鐞�
+ * 
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Service
+public class Icd10ServiceImpl implements IIcd10Service
+{
+    @Autowired
+    private Icd10Mapper icd10Mapper;
+
+    /**
+     * 鏌ヨ鐤剧梾
+     * 
+     * @param icdid 鐤剧梾涓婚敭
+     * @return 鐤剧梾
+     */
+    @Override
+    public Icd10 selectIcd10ByIcdid(Long icdid)
+    {
+        return icd10Mapper.selectIcd10ByIcdid(icdid);
+    }
+
+    /**
+     * 鏌ヨ鐤剧梾鍒楄〃
+     * 
+     * @param icd10 鐤剧梾
+     * @return 鐤剧梾
+     */
+    @Override
+    public List<Icd10> selectIcd10List(Icd10 icd10)
+    {
+        return icd10Mapper.selectIcd10List(icd10);
+    }
+
+    /**
+     * 鏂板鐤剧梾
+     * 
+     * @param icd10 鐤剧梾
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertIcd10(Icd10 icd10)
+    {
+        icd10.setCreateTime(DateUtils.getNowDate());
+        return icd10Mapper.insertIcd10(icd10);
+    }
+
+    /**
+     * 淇敼鐤剧梾
+     * 
+     * @param icd10 鐤剧梾
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateIcd10(Icd10 icd10)
+    {
+        icd10.setUpdateTime(DateUtils.getNowDate());
+        return icd10Mapper.updateIcd10(icd10);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎鐤剧梾
+     * 
+     * @param icdids 闇�瑕佸垹闄ょ殑鐤剧梾涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIcd10ByIcdids(Long[] icdids)
+    {
+        return icd10Mapper.deleteIcd10ByIcdids(icdids);
+    }
+
+    /**
+     * 鍒犻櫎鐤剧梾淇℃伅
+     * 
+     * @param icdid 鐤剧梾涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIcd10ByIcdid(Long icdid)
+    {
+        return icd10Mapper.deleteIcd10ByIcdid(icdid);
+    }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaOutIcd10ServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaOutIcd10ServiceImpl.java
new file mode 100644
index 0000000..4c3c627
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaOutIcd10ServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.IvrLibaTargetIcd10;
+import com.smartor.mapper.IvrLibaOutIcd10Mapper;
+import com.smartor.service.IIvrLibaOutIcd10Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鐤剧梾Service涓氬姟灞傚鐞�
+ * 
+ * @author ruoyi
+ * @date 2023-12-20
+ */
+@Service
+public class IvrLibaOutIcd10ServiceImpl implements IIvrLibaOutIcd10Service
+{
+    @Autowired
+    private IvrLibaOutIcd10Mapper ivrLibaTargetIcd10Mapper;
+
+    /**
+     * 鏌ヨ鎸囨爣鐤剧梾
+     * 
+     * @param id 鎸囨爣鐤剧梾涓婚敭
+     * @return 鎸囨爣鐤剧梾
+     */
+    @Override
+    public IvrLibaTargetIcd10 selectIvrLibaTargetIcd10ById(Long id)
+    {
+        return ivrLibaTargetIcd10Mapper.selectIvrLibaTargetIcd10ById(id);
+    }
+
+    /**
+     * 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
+     * 
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 鎸囨爣鐤剧梾
+     */
+    @Override
+    public List<IvrLibaTargetIcd10> selectIvrLibaTargetIcd10List(IvrLibaTargetIcd10 ivrLibaTargetIcd10)
+    {
+        return ivrLibaTargetIcd10Mapper.selectIvrLibaTargetIcd10List(ivrLibaTargetIcd10);
+    }
+
+    /**
+     * 鏂板鎸囨爣鐤剧梾
+     * 
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertIvrLibaTargetIcd10(IvrLibaTargetIcd10 ivrLibaTargetIcd10)
+    {
+        ivrLibaTargetIcd10.setCreateTime(DateUtils.getNowDate());
+        return ivrLibaTargetIcd10Mapper.insertIvrLibaTargetIcd10(ivrLibaTargetIcd10);
+    }
+
+    /**
+     * 淇敼鎸囨爣鐤剧梾
+     * 
+     * @param ivrLibaTargetIcd10 鎸囨爣鐤剧梾
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateIvrLibaTargetIcd10(IvrLibaTargetIcd10 ivrLibaTargetIcd10)
+    {
+        ivrLibaTargetIcd10.setUpdateTime(DateUtils.getNowDate());
+        return ivrLibaTargetIcd10Mapper.updateIvrLibaTargetIcd10(ivrLibaTargetIcd10);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣鐤剧梾
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣鐤剧梾涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaTargetIcd10ByIds(Long[] ids)
+    {
+        return ivrLibaTargetIcd10Mapper.deleteIvrLibaTargetIcd10ByIds(ids);
+    }
+
+    /**
+     * 鍒犻櫎鎸囨爣鐤剧梾淇℃伅
+     * 
+     * @param id 鎸囨爣鐤剧梾涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaTargetIcd10ById(Long id)
+    {
+        return ivrLibaTargetIcd10Mapper.deleteIvrLibaTargetIcd10ById(id);
+    }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
new file mode 100644
index 0000000..890caf6
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
@@ -0,0 +1,127 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.domain.*;
+import com.smartor.mapper.IvrLibaScriptAssortMapper;
+import com.smartor.service.IIvrLibaScriptAssortService;
+import io.jsonwebtoken.lang.Collections;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 闂璇濇湳鍒嗙被搴�
+ * Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Service
+public class IvrLibaScriptAssortServiceImpl implements IIvrLibaScriptAssortService {
+    @Autowired
+    private IvrLibaScriptAssortMapper ivrLibaScriptAssortMapper;
+
+    /**
+     * 鏌ヨ闂璇濇湳鍒嗙被搴�
+     *
+     * @param id 闂璇濇湳鍒嗙被搴�
+     *           涓婚敭
+     * @return 闂璇濇湳鍒嗙被搴�
+     */
+    @Override
+    public IvrLibaScriptAssort selectIvrLibaScriptAssortById(Long id) {
+        return ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortById(id);
+    }
+
+//    /**
+//     * 鏌ヨ闂璇濇湳鍒嗙被搴�
+//     * 鍒楄〃
+//     *
+//     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+//     * @return 闂璇濇湳鍒嗙被搴�
+//     */
+//    @Override
+//    public List<IvrLibaScriptAssort> selectIvrLibaScriptAssortList(IvrLibaScriptAssort ivrLibaScriptAssort) {
+//        return ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
+//    }
+
+    /**
+     * 鏂板闂璇濇湳鍒嗙被搴�
+     *
+     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertIvrLibaScriptAssort(IvrLibaScriptAssort ivrLibaScriptAssort) {
+        ivrLibaScriptAssort.setCreateTime(DateUtils.getNowDate());
+        return ivrLibaScriptAssortMapper.insertIvrLibaScriptAssort(ivrLibaScriptAssort);
+    }
+
+    /**
+     * 淇敼闂璇濇湳鍒嗙被搴�
+     *
+     * @param ivrLibaScriptAssort 闂璇濇湳鍒嗙被搴�
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateIvrLibaScriptAssort(IvrLibaScriptAssort ivrLibaScriptAssort) {
+        ivrLibaScriptAssort.setUpdateTime(DateUtils.getNowDate());
+        return ivrLibaScriptAssortMapper.updateIvrLibaScriptAssort(ivrLibaScriptAssort);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鍒嗙被搴�
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑闂璇濇湳鍒嗙被搴�
+     *            涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaScriptAssortByIds(Long[] ids) {
+        return ivrLibaScriptAssortMapper.deleteIvrLibaScriptAssortByIds(ids);
+    }
+
+    /**
+     * 鍒犻櫎闂璇濇湳鍒嗙被搴�
+     * 淇℃伅
+     *
+     * @param id 闂璇濇湳鍒嗙被搴�
+     *           涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaScriptAssortById(Long id) {
+        return ivrLibaScriptAssortMapper.deleteIvrLibaScriptAssortById(id);
+    }
+
+    /**
+     * 鏌ヨ闂鍒嗙被鍒楄〃
+     *
+     * @param ivrLibaScriptAssort 闂鍒嗙被
+     * @return 闂鍒嗙被
+     */
+    @Override
+    public List<IvrLibaScriptAssortVO> selectIvrLibaScriptAssortList(IvrLibaScriptAssort ivrLibaScriptAssort) {
+        List<IvrLibaScriptAssort> ivrLibaScriptAssorts = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
+        //灏唒id涓虹┖鐨勶紝杩囨护鎺�
+        ivrLibaScriptAssorts = ivrLibaScriptAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
+
+        List<IvrLibaScriptAssortVO> ivrLibaScriptAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaScriptAssorts, IvrLibaScriptAssortVO.class);
+        //閬嶅巻鏌ュ嚭鏉ョ殑鏁版嵁锛岄�氳繃 id=pid 鑾峰彇浠栦滑鐨勫瓙鏁版嵁
+        for (IvrLibaScriptAssortVO ivrLibaScriptAssortVO : ivrLibaScriptAssortVOS) {
+            if (ivrLibaScriptAssortVO.getPid() != null) {
+                continue;
+            }
+            IvrLibaScriptAssort ivrLibaTargetAssort1 = new IvrLibaScriptAssort();
+            ivrLibaTargetAssort1.setPid(ivrLibaScriptAssortVO.getId());
+            List<IvrLibaScriptAssort> ivrLibaScriptAssorts1 = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaTargetAssort1);
+            if (!Collections.isEmpty(ivrLibaScriptAssorts1)) {
+                ivrLibaScriptAssortVO.setIvrLibaScriptAssortList(ivrLibaScriptAssorts1);
+            }
+        }
+        return ivrLibaScriptAssortVOS;
+    }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java
index 25cd10d..f0e42de 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptServiceImpl.java
@@ -1,96 +1,232 @@
 package com.smartor.service.impl;
 
-import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.domain.*;
+import com.smartor.mapper.IvrLibaScriptMapper;
+import com.smartor.mapper.IvrLibaScriptTagMapper;
+import com.smartor.mapper.IvrLibaScriptTargetMapper;
+import com.smartor.mapper.IvrLibaScriptTargetoptionMapper;
+import com.smartor.service.IIvrLibaScriptService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.smartor.mapper.IvrLibaScriptMapper;
-import com.smartor.domain.IvrLibaScript;
-import com.smartor.service.IIvrLibaScriptService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
- * 璇濇湳搴揝ervice涓氬姟灞傚鐞�
- * 
- * @author smartor
- * @date 2023-03-22
+ * 闂璇濇湳搴揝ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-21
  */
+@Slf4j
 @Service
-public class IvrLibaScriptServiceImpl implements IIvrLibaScriptService 
-{
+public class IvrLibaScriptServiceImpl implements IIvrLibaScriptService {
     @Autowired
     private IvrLibaScriptMapper ivrLibaScriptMapper;
 
+    @Autowired
+    private IvrLibaScriptTagMapper ivrLibaScriptTagMapper;
+
+    @Autowired
+    private IvrLibaScriptTargetoptionMapper ivrLibaScriptTargetoptionMapper;
+
+    @Autowired
+    private IvrLibaScriptTargetMapper ivrLibaScriptTargetMapper;
+
     /**
-     * 鏌ヨ璇濇湳搴�
-     * 
-     * @param questionid 璇濇湳搴撲富閿�
-     * @return 璇濇湳搴�
+     * 鏌ヨ闂璇濇湳搴�
+     *
+     * @param questionid 闂璇濇湳搴撲富閿�
+     * @return 闂璇濇湳搴�
      */
     @Override
-    public IvrLibaScript selectIvrLibaScriptByQuestionid(String questionid)
-    {
+    public IvrLibaScript selectIvrLibaScriptByQuestionid(String questionid) {
         return ivrLibaScriptMapper.selectIvrLibaScriptByQuestionid(questionid);
     }
 
     /**
-     * 鏌ヨ璇濇湳搴撳垪琛�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
-     * @return 璇濇湳搴�
+     * 鏌ヨ闂璇濇湳搴撳垪琛�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
+     * @return 闂璇濇湳搴�
      */
     @Override
-    public List<IvrLibaScript> selectIvrLibaScriptList(IvrLibaScript ivrLibaScript)
-    {
+    public List<IvrLibaScript> selectIvrLibaScriptList(IvrLibaScript ivrLibaScript) {
         return ivrLibaScriptMapper.selectIvrLibaScriptList(ivrLibaScript);
     }
 
     /**
-     * 鏂板璇濇湳搴�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
+     * 鏌ヨ闂璇濇湳璇︽儏鏍规嵁鏉′欢
+     */
+    @Override
+    public IvrLibaScriptVO selectInfoByCondition(IvrLibaScriptVO ivrLibaScriptVO) {
+        log.info("鏌ヨ闂璇濇湳璇︽儏鏍规嵁鏉′欢鐨勫叆鍙備负 : {}", ivrLibaScriptVO);
+        //鍏堟牴鎹潯浠舵煡璇㈤棶棰樿〃淇℃伅
+        IvrLibaScript ivrLibaScript = DtoConversionUtils.sourceToTarget(ivrLibaScriptVO, IvrLibaScript.class);
+        List<IvrLibaScript> ivrLibaScripts = selectIvrLibaScriptList(ivrLibaScript);
+        if (CollectionUtils.isEmpty(ivrLibaScripts)) {
+            log.info("鎻愪緵鐨勬潯浠�,鏌ヨ鏁版嵁涓虹┖锛歿}", ivrLibaScript);
+            return null;
+        }
+        log.info("ivrLibaScript鐨勬煡璇㈢粨鏋滀负:{},鏁伴噺涓� : {}", ivrLibaScripts.get(0), ivrLibaScripts.size());
+        //瀹氫箟IvrLibaScriptVO 鐢ㄤ簬杩斿弬
+        IvrLibaScriptVO scriptVO = DtoConversionUtils.sourceToTarget(ivrLibaScripts.get(0), IvrLibaScriptVO.class);
+
+        //鑾峰彇tag淇℃伅
+        IvrLibaScriptTag ivrLibaScriptTag = new IvrLibaScriptTag();
+        ivrLibaScriptTag.setScriptid(ivrLibaScripts.get(0).getId());
+        List<IvrLibaScriptTag> ivrLibaScriptTags = ivrLibaScriptTagMapper.selectIvrLibaScriptTagList(ivrLibaScriptTag);
+        scriptVO.setIvrLibaScriptTagList(ivrLibaScriptTags);
+
+        //鑾峰彇option淇℃伅
+        IvrLibaScriptTargetoption ivrLibaScriptTargetoption = new IvrLibaScriptTargetoption();
+        ivrLibaScriptTargetoption.setScriptid(ivrLibaScripts.get(0).getId());
+        List<IvrLibaScriptTargetoption> ivrLibaScriptTargetoptions = ivrLibaScriptTargetoptionMapper.selectIvrLibaScriptTargetoptionList(ivrLibaScriptTargetoption);
+        scriptVO.setIvrLibaScriptTargetoptionList(ivrLibaScriptTargetoptions);
+
+        //鏌ヨ闂鎸囨爣鎺ュ彛
+        IvrLibaScriptTarget ivrLibaScriptTarget = new IvrLibaScriptTarget();
+        ivrLibaScriptTarget.setScriptid(ivrLibaScripts.get(0).getId());
+        List<IvrLibaScriptTarget> ivrLibaScriptTargets = ivrLibaScriptTargetMapper.selectIvrLibaScriptTargetList(ivrLibaScriptTarget);
+        scriptVO.setIvrLibaScriptTargetList(ivrLibaScriptTargets);
+
+        return scriptVO;
+    }
+
+    /**
+     * 鏂板鎴栦慨鏀归棶棰樿鎯�
+     *
+     * @param ivrLibaScriptVO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Integer saveOrUpdateScript(IvrLibaScriptVO ivrLibaScriptVO) {
+        IvrLibaScript ivrLibaScript = DtoConversionUtils.sourceToTarget(ivrLibaScriptVO, IvrLibaScript.class);
+        //瀵归棶棰樿〃杩涜鏁版嵁澶勭悊
+        Integer i = null;
+        if (ivrLibaScriptVO.getIsoperation() != null && ivrLibaScriptVO.getIsoperation() == 1) {
+            i = ivrLibaScriptMapper.insertIvrLibaScript(ivrLibaScript);
+        } else if (ivrLibaScriptVO.getIsoperation() != null && ivrLibaScriptVO.getIsoperation() == 2) {
+            i = ivrLibaScriptMapper.updateIvrLibaScript(ivrLibaScript);
+        }
+        log.info("闂琛ㄥ搴旂殑id涓猴細{}", ivrLibaScript.getId());
+
+        //瀵归棶棰樻寚鏍囪繘琛屽鐞�
+        if (CollectionUtils.isNotEmpty(ivrLibaScriptVO.getIvrLibaScriptTargetList())) {
+            for (IvrLibaScriptTarget ivrLibaScriptTarget : ivrLibaScriptVO.getIvrLibaScriptTargetList()) {
+                if (ivrLibaScriptTarget.getIsoperation() != null && ivrLibaScriptTarget.getIsoperation() == 1) {
+                    //鏂板
+                    ivrLibaScriptTarget.setScriptid(ivrLibaScript.getId());
+                    ivrLibaScriptTargetMapper.insertIvrLibaScriptTarget(ivrLibaScriptTarget);
+                } else if (ivrLibaScriptTarget.getIsoperation() != null && ivrLibaScriptTarget.getIsoperation() == 2) {
+                    //淇敼
+                    ivrLibaScriptTarget.setScriptid(ivrLibaScript.getId());
+                    ivrLibaScriptTargetMapper.updateIvrLibaScriptTarget(ivrLibaScriptTarget);
+                } else if (ivrLibaScriptTarget.getIsoperation() != null && ivrLibaScriptTarget.getIsoperation() == 3) {
+                    //鍒犻櫎
+                    if (ivrLibaScriptTarget.getId() == null) {
+                        log.info("鍒犻櫎澶辫触,闂鎸囨爣id涓虹┖");
+                    } else {
+                        ivrLibaScriptTargetMapper.deleteIvrLibaScriptTargetByQuestionTargetID(ivrLibaScriptTarget.getId());
+                    }
+                }
+            }
+        }
+
+        //瀵归棶棰樻寚鏍囬�夐」杩涜澶勭悊
+        if (CollectionUtils.isNotEmpty(ivrLibaScriptVO.getIvrLibaScriptTargetoptionList())) {
+            for (IvrLibaScriptTargetoption ivrLibaScriptTargetoption : ivrLibaScriptVO.getIvrLibaScriptTargetoptionList()) {
+                if (ivrLibaScriptTargetoption.getIsoperation() != null && ivrLibaScriptTargetoption.getIsoperation() == 1) {
+                    //鏂板
+                    ivrLibaScriptTargetoption.setScriptid(ivrLibaScript.getId());
+                    ivrLibaScriptTargetoptionMapper.insertIvrLibaScriptTargetoption(ivrLibaScriptTargetoption);
+                }
+                if (ivrLibaScriptTargetoption.getIsoperation() != null && ivrLibaScriptTargetoption.getIsoperation() == 2) {
+                    //淇敼
+                    ivrLibaScriptTargetoption.setScriptid(ivrLibaScript.getId());
+                    ivrLibaScriptTargetoptionMapper.updateIvrLibaScriptTargetoption(ivrLibaScriptTargetoption);
+                }
+                if (ivrLibaScriptTargetoption.getIsoperation() != null && ivrLibaScriptTargetoption.getIsoperation() == 3) {
+                    //鍒犻櫎
+                    if (ivrLibaScriptTargetoption.getId() == null) {
+                        log.info("鍒犻櫎澶辫触,闂鎸囨爣閫夐」id涓虹┖");
+                    } else {
+                        ivrLibaScriptTargetoptionMapper.deleteIvrLibaScriptTargetoptionByTargetoptionid(ivrLibaScriptTargetoption.getId());
+                    }
+                }
+            }
+        }
+
+        //瀵归棶棰樻爣绛捐繘琛屽鐞�
+        if (CollectionUtils.isNotEmpty(ivrLibaScriptVO.getIvrLibaScriptTagList())) {
+            for (IvrLibaScriptTag ivrLibaScriptTag : ivrLibaScriptVO.getIvrLibaScriptTagList()) {
+                if (ivrLibaScriptTag.getIsoperation() != null && ivrLibaScriptTag.getIsoperation() == 1) {
+                    //鏂板
+                    ivrLibaScriptTag.setScriptid(ivrLibaScript.getId());
+                    ivrLibaScriptTagMapper.insertIvrLibaScriptTag(ivrLibaScriptTag);
+                }
+                if (ivrLibaScriptTag.getIsoperation() != null && ivrLibaScriptTag.getIsoperation() == 2) {
+                    //淇敼
+                    ivrLibaScriptTag.setScriptid(ivrLibaScript.getId());
+                    ivrLibaScriptTagMapper.updateIvrLibaScriptTag(ivrLibaScriptTag);
+                }
+                if (ivrLibaScriptTag.getIsoperation() != null && ivrLibaScriptTag.getIsoperation() == 3) {
+                    //鍒犻櫎
+                    if (ivrLibaScriptTag.getId() == null) {
+                        log.info("鍒犻櫎澶辫触,闂鏍囩id涓虹┖");
+                    } else {
+                        ivrLibaScriptTagMapper.deleteIvrLibaScriptTagById(ivrLibaScriptTag.getId());
+                    }
+                }
+            }
+        }
+
+
+        return i;
+    }
+
+    /**
+     * 鏂板闂璇濇湳搴�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
      * @return 缁撴灉
      */
     @Override
-    public int insertIvrLibaScript(IvrLibaScript ivrLibaScript)
-    {
+    public int insertIvrLibaScript(IvrLibaScript ivrLibaScript) {
         ivrLibaScript.setCreateTime(DateUtils.getNowDate());
         return ivrLibaScriptMapper.insertIvrLibaScript(ivrLibaScript);
     }
 
     /**
-     * 淇敼璇濇湳搴�
-     * 
-     * @param ivrLibaScript 璇濇湳搴�
+     * 淇敼闂璇濇湳搴�
+     *
+     * @param ivrLibaScript 闂璇濇湳搴�
      * @return 缁撴灉
      */
     @Override
-    public int updateIvrLibaScript(IvrLibaScript ivrLibaScript)
-    {
+    public int updateIvrLibaScript(IvrLibaScript ivrLibaScript) {
         ivrLibaScript.setUpdateTime(DateUtils.getNowDate());
         return ivrLibaScriptMapper.updateIvrLibaScript(ivrLibaScript);
     }
 
     /**
-     * 鎵归噺鍒犻櫎璇濇湳搴�
-     * 
-     * @param questionids 闇�瑕佸垹闄ょ殑璇濇湳搴撲富閿�
+     * 鎵归噺鍒犻櫎闂璇濇湳搴�
+     *
+     * @param questionids 闇�瑕佸垹闄ょ殑闂璇濇湳搴撲富閿�
      * @return 缁撴灉
      */
     @Override
-    public int deleteIvrLibaScriptByQuestionids(String[] questionids)
-    {
-        return ivrLibaScriptMapper.deleteIvrLibaScriptByQuestionids(questionids);
+    public int deleteIvrLibaScriptByQuestionids(String[] questionids) {
+        Integer i = null;
+        for (String id : questionids) {
+            i = ivrLibaScriptMapper.deleteIvrLibaScriptByQuestionid(Integer.valueOf(id));
+        }
+        return i;
     }
 
-    /**
-     * 鍒犻櫎璇濇湳搴撲俊鎭�
-     * 
-     * @param questionid 璇濇湳搴撲富閿�
-     * @return 缁撴灉
-     */
-    @Override
-    public int deleteIvrLibaScriptByQuestionid(String questionid)
-    {
-        return ivrLibaScriptMapper.deleteIvrLibaScriptByQuestionid(questionid);
-    }
 }
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTagServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTagServiceImpl.java
new file mode 100644
index 0000000..69c8702
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTagServiceImpl.java
@@ -0,0 +1,93 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.IvrLibaScriptTag;
+import com.smartor.mapper.IvrLibaScriptTagMapper;
+import com.smartor.service.IIvrLibaScriptTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鏍囩搴揝ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Service
+public class IvrLibaScriptTagServiceImpl implements IIvrLibaScriptTagService {
+    @Autowired
+    private IvrLibaScriptTagMapper ivrLibaScriptTagMapper;
+
+    /**
+     * 鏌ヨ闂璇濇湳鏍囩搴�
+     *
+     * @param id 闂璇濇湳鏍囩搴撲富閿�
+     * @return 闂璇濇湳鏍囩搴�
+     */
+    @Override
+    public IvrLibaScriptTag selectIvrLibaScriptTagById(Long id) {
+        return ivrLibaScriptTagMapper.selectIvrLibaScriptTagById(id);
+    }
+
+    /**
+     * 鏌ヨ闂璇濇湳鏍囩搴撳垪琛�
+     *
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 闂璇濇湳鏍囩搴�
+     */
+    @Override
+    public List<IvrLibaScriptTag> selectIvrLibaScriptTagList(IvrLibaScriptTag ivrLibaScriptTag) {
+        return ivrLibaScriptTagMapper.selectIvrLibaScriptTagList(ivrLibaScriptTag);
+    }
+
+    /**
+     * 鏂板闂璇濇湳鏍囩搴�
+     *
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertIvrLibaScriptTag(IvrLibaScriptTag ivrLibaScriptTag) {
+        ivrLibaScriptTag.setCreateTime(DateUtils.getNowDate());
+        return ivrLibaScriptTagMapper.insertIvrLibaScriptTag(ivrLibaScriptTag);
+    }
+
+    /**
+     * 淇敼闂璇濇湳鏍囩搴�
+     *
+     * @param ivrLibaScriptTag 闂璇濇湳鏍囩搴�
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateIvrLibaScriptTag(IvrLibaScriptTag ivrLibaScriptTag) {
+        ivrLibaScriptTag.setUpdateTime(DateUtils.getNowDate());
+        return ivrLibaScriptTagMapper.updateIvrLibaScriptTag(ivrLibaScriptTag);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鏍囩搴�
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑闂璇濇湳鏍囩搴撲富閿�
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaScriptTagByIds(Long[] ids) {
+        for (Long id : ids) {
+            ivrLibaScriptTagMapper.deleteIvrLibaScriptTagById(id);
+        }
+        return 1;
+    }
+
+    /**
+     * 鍒犻櫎闂璇濇湳鏍囩搴撲俊鎭�
+     *
+     * @param id 闂璇濇湳鏍囩搴撲富閿�
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaScriptTagById(Long id) {
+        return ivrLibaScriptTagMapper.deleteIvrLibaScriptTagById(id);
+    }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetServiceImpl.java
new file mode 100644
index 0000000..3748d84
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetServiceImpl.java
@@ -0,0 +1,84 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.IvrLibaScriptTarget;
+import com.smartor.mapper.IvrLibaScriptTargetMapper;
+import com.smartor.service.IIvrLibaScriptTargetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鎸囨爣搴揝ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Service
+public class IvrLibaScriptTargetServiceImpl implements IIvrLibaScriptTargetService {
+    @Autowired
+    private IvrLibaScriptTargetMapper ivrLibaScriptTargetMapper;
+
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣搴�
+     *
+     * @param questionTargetID 闂璇濇湳鎸囨爣搴撲富閿�
+     * @return 闂璇濇湳鎸囨爣搴�
+     */
+    @Override
+    public IvrLibaScriptTarget selectIvrLibaScriptTargetByQuestionTargetID(String questionTargetID) {
+        return ivrLibaScriptTargetMapper.selectIvrLibaScriptTargetByQuestionTargetID(questionTargetID);
+    }
+
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣搴撳垪琛�
+     *
+     * @param ivrLibaScriptTarget 闂璇濇湳鎸囨爣搴�
+     * @return 闂璇濇湳鎸囨爣搴�
+     */
+    @Override
+    public List<IvrLibaScriptTarget> selectIvrLibaScriptTargetList(IvrLibaScriptTarget ivrLibaScriptTarget) {
+        return ivrLibaScriptTargetMapper.selectIvrLibaScriptTargetList(ivrLibaScriptTarget);
+    }
+
+    /**
+     * 鏂板闂璇濇湳鎸囨爣搴�
+     *
+     * @param ivrLibaScriptTarget 闂璇濇湳鎸囨爣搴�
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertIvrLibaScriptTarget(IvrLibaScriptTarget ivrLibaScriptTarget) {
+        ivrLibaScriptTarget.setCreateTime(DateUtils.getNowDate());
+        return ivrLibaScriptTargetMapper.insertIvrLibaScriptTarget(ivrLibaScriptTarget);
+    }
+
+    /**
+     * 淇敼闂璇濇湳鎸囨爣搴�
+     *
+     * @param ivrLibaScriptTarget 闂璇濇湳鎸囨爣搴�
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateIvrLibaScriptTarget(IvrLibaScriptTarget ivrLibaScriptTarget) {
+        ivrLibaScriptTarget.setUpdateTime(DateUtils.getNowDate());
+        return ivrLibaScriptTargetMapper.updateIvrLibaScriptTarget(ivrLibaScriptTarget);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鎸囨爣搴�
+     *
+     * @param questionTargetIDs 闇�瑕佸垹闄ょ殑闂璇濇湳鎸囨爣搴撲富閿�
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaScriptTargetByQuestionTargetIDs(Integer[] ids) {
+        Integer i = null;
+        for (int id : ids) {
+            i = ivrLibaScriptTargetMapper.deleteIvrLibaScriptTargetByQuestionTargetID(Long.valueOf(id));
+        }
+        return i;
+    }
+
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetoptionServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetoptionServiceImpl.java
new file mode 100644
index 0000000..637cf89
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptTargetoptionServiceImpl.java
@@ -0,0 +1,86 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.IvrLibaScriptTargetoption;
+import com.smartor.mapper.IvrLibaScriptTargetoptionMapper;
+import com.smartor.service.IIvrLibaScriptTargetoptionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 闂璇濇湳鎸囨爣閫夐」搴揝ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-21
+ */
+@Service
+public class IvrLibaScriptTargetoptionServiceImpl implements IIvrLibaScriptTargetoptionService {
+    @Autowired
+    private IvrLibaScriptTargetoptionMapper ivrLibaScriptTargetoptionMapper;
+
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param targetoptionid 闂璇濇湳鎸囨爣閫夐」搴撲富閿�
+     * @return 闂璇濇湳鎸囨爣閫夐」搴�
+     */
+    @Override
+    public IvrLibaScriptTargetoption selectIvrLibaScriptTargetoptionByTargetoptionid(String targetoptionid) {
+        return ivrLibaScriptTargetoptionMapper.selectIvrLibaScriptTargetoptionByTargetoptionid(targetoptionid);
+    }
+
+    /**
+     * 鏌ヨ闂璇濇湳鎸囨爣閫夐」搴撳垪琛�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 闂璇濇湳鎸囨爣閫夐」搴�
+     */
+    @Override
+    public List<IvrLibaScriptTargetoption> selectIvrLibaScriptTargetoptionList(IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
+        return ivrLibaScriptTargetoptionMapper.selectIvrLibaScriptTargetoptionList(ivrLibaScriptTargetoption);
+    }
+
+    /**
+     * 鏂板闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertIvrLibaScriptTargetoption(IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
+        ivrLibaScriptTargetoption.setCreateTime(DateUtils.getNowDate());
+        return ivrLibaScriptTargetoptionMapper.insertIvrLibaScriptTargetoption(ivrLibaScriptTargetoption);
+    }
+
+    /**
+     * 淇敼闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaScriptTargetoption 闂璇濇湳鎸囨爣閫夐」搴�
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateIvrLibaScriptTargetoption(IvrLibaScriptTargetoption ivrLibaScriptTargetoption) {
+        ivrLibaScriptTargetoption.setUpdateTime(DateUtils.getNowDate());
+        return ivrLibaScriptTargetoptionMapper.updateIvrLibaScriptTargetoption(ivrLibaScriptTargetoption);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎闂璇濇湳鎸囨爣閫夐」搴�
+     *
+     * @param targetoptionids 闇�瑕佸垹闄ょ殑闂璇濇湳鎸囨爣閫夐」搴撲富閿�
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaScriptTargetoptionByTargetoptionids(String[] targetoptionids) {
+        Integer i = null;
+        for (String id : targetoptionids) {
+            i = ivrLibaScriptTargetoptionMapper.deleteIvrLibaScriptTargetoptionByTargetoptionid(Long.valueOf(id));
+        }
+
+        return i;
+    }
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScripttargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScripttargetServiceImpl.java
deleted file mode 100644
index af9699e..0000000
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScripttargetServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.smartor.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.smartor.mapper.IvrLibaScripttargetMapper;
-import com.smartor.domain.IvrLibaScripttarget;
-import com.smartor.service.IIvrLibaScripttargetService;
-
-/**
- * 璇濇湳搴撹瘽鏈寚鏍嘢ervice涓氬姟灞傚鐞�
- * 
- * @author smartor
- * @date 2023-03-22
- */
-@Service
-public class IvrLibaScripttargetServiceImpl implements IIvrLibaScripttargetService 
-{
-    @Autowired
-    private IvrLibaScripttargetMapper ivrLibaScripttargetMapper;
-
-    /**
-     * 鏌ヨ璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param questionTargetID 璇濇湳搴撹瘽鏈寚鏍囦富閿�
-     * @return 璇濇湳搴撹瘽鏈寚鏍�
-     */
-    @Override
-    public IvrLibaScripttarget selectIvrLibaScripttargetByQuestionTargetID(String questionTargetID)
-    {
-        return ivrLibaScripttargetMapper.selectIvrLibaScripttargetByQuestionTargetID(questionTargetID);
-    }
-
-    /**
-     * 鏌ヨ璇濇湳搴撹瘽鏈寚鏍囧垪琛�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 璇濇湳搴撹瘽鏈寚鏍�
-     */
-    @Override
-    public List<IvrLibaScripttarget> selectIvrLibaScripttargetList(IvrLibaScripttarget ivrLibaScripttarget)
-    {
-        return ivrLibaScripttargetMapper.selectIvrLibaScripttargetList(ivrLibaScripttarget);
-    }
-
-    /**
-     * 鏂板璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 缁撴灉
-     */
-    @Override
-    public int insertIvrLibaScripttarget(IvrLibaScripttarget ivrLibaScripttarget)
-    {
-        ivrLibaScripttarget.setCreateTime(DateUtils.getNowDate());
-        return ivrLibaScripttargetMapper.insertIvrLibaScripttarget(ivrLibaScripttarget);
-    }
-
-    /**
-     * 淇敼璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param ivrLibaScripttarget 璇濇湳搴撹瘽鏈寚鏍�
-     * @return 缁撴灉
-     */
-    @Override
-    public int updateIvrLibaScripttarget(IvrLibaScripttarget ivrLibaScripttarget)
-    {
-        ivrLibaScripttarget.setUpdateTime(DateUtils.getNowDate());
-        return ivrLibaScripttargetMapper.updateIvrLibaScripttarget(ivrLibaScripttarget);
-    }
-
-    /**
-     * 鎵归噺鍒犻櫎璇濇湳搴撹瘽鏈寚鏍�
-     * 
-     * @param questionTargetIDs 闇�瑕佸垹闄ょ殑璇濇湳搴撹瘽鏈寚鏍囦富閿�
-     * @return 缁撴灉
-     */
-    @Override
-    public int deleteIvrLibaScripttargetByQuestionTargetIDs(String[] questionTargetIDs)
-    {
-        return ivrLibaScripttargetMapper.deleteIvrLibaScripttargetByQuestionTargetIDs(questionTargetIDs);
-    }
-
-    /**
-     * 鍒犻櫎璇濇湳搴撹瘽鏈寚鏍囦俊鎭�
-     * 
-     * @param questionTargetID 璇濇湳搴撹瘽鏈寚鏍囦富閿�
-     * @return 缁撴灉
-     */
-    @Override
-    public int deleteIvrLibaScripttargetByQuestionTargetID(String questionTargetID)
-    {
-        return ivrLibaScripttargetMapper.deleteIvrLibaScripttargetByQuestionTargetID(questionTargetID);
-    }
-}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
index 4b71a2d..53548bc 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
@@ -1,97 +1,195 @@
 package com.smartor.service.impl;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.smartor.domain.IvrLibaTarget;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.domain.*;
 import com.smartor.mapper.IvrLibaTargetMapper;
+import com.smartor.mapper.IvrLibaTargetTagMapper;
+import com.smartor.mapper.IvrLibaTargetoptionMapper;
 import com.smartor.service.IIvrLibaTargetService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 /**
  * 鎸囨爣閫夐」搴揝ervice涓氬姟灞傚鐞�
- * 
+ *
  * @author ruoyi
  * @date 2023-12-14
  */
+@Slf4j
 @Service
-public class IvrLibaTargetServiceImpl implements IIvrLibaTargetService
-{
+public class IvrLibaTargetServiceImpl implements IIvrLibaTargetService {
     @Autowired
     private IvrLibaTargetMapper ivrLibaTargetMapper;
 
+    @Autowired
+    private IvrLibaTargetTagMapper ivrLibaTargetTagMapper;
+
+    @Autowired
+    private IvrLibaTargetoptionMapper ivrLibaTargetoptionMapper;
+
     /**
      * 鏌ヨ鎸囨爣閫夐」搴�
-     * 
+     *
      * @param targetID 鎸囨爣閫夐」搴撲富閿�
      * @return 鎸囨爣閫夐」搴�
      */
     @Override
-    public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID)
-    {
+    public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID) {
         return ivrLibaTargetMapper.selectIvrLibaTargetByTargetID(targetID);
     }
 
     /**
      * 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
-     * 
+     *
      * @param ivrLibaTarget 鎸囨爣閫夐」搴�
      * @return 鎸囨爣閫夐」搴�
      */
     @Override
-    public List<IvrLibaTarget> selectIvrLibaTargetList(IvrLibaTarget ivrLibaTarget)
-    {
+    public List<IvrLibaTarget> selectIvrLibaTargetList(IvrLibaTarget ivrLibaTarget) {
         return ivrLibaTargetMapper.selectIvrLibaTargetList(ivrLibaTarget);
+    }
+
+    @Override
+    public List<IvrLibaTargetVO> targetInfo(IvrLibaTarget ivrLibaTarget) {
+        List<IvrLibaTarget> ivrLibaTargets = ivrLibaTargetMapper.selectIvrLibaTargetList(ivrLibaTarget);
+        List<IvrLibaTargetVO> ivrLibaTargetVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargets, IvrLibaTargetVO.class);
+        for (IvrLibaTargetVO ivrLibaTarget1 : ivrLibaTargetVOS) {
+            IvrLibaTargetoption ivrLibaTargetoption = new IvrLibaTargetoption();
+            ivrLibaTargetoption.setTargetid(ivrLibaTarget1.getTargetID());
+            //鑾峰彇璇ユ寚鏍囩殑閫夐」
+            List<IvrLibaTargetoption> ivrLibaTargetoptions = ivrLibaTargetoptionMapper.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
+            if (CollectionUtils.isNotEmpty(ivrLibaTargetoptions)) {
+                ivrLibaTarget1.setTargetoptionList(ivrLibaTargetoptions);
+            }
+            //鑾峰彇璇ユ寚鏍囩殑鏍囩
+            List<BaseTag> baseTags = ivrLibaTargetTagMapper.selectTagName(ivrLibaTarget1.getTargetID());
+            ivrLibaTarget1.setBaseTagList(baseTags);
+        }
+        //涓嬮潰鐢ㄥ乏澶栨劅瑙夋湁鐐归棶棰橈紝where涓殑option鐨刣el浼氬鑷村乏杈圭殑鏌ヨ涓嶅叏锛屽厛涓嶇敤鍚�
+//        ivrLibaTargetMapper.targetInfo(ivrLibaTarget)
+        return ivrLibaTargetVOS;
     }
 
     /**
      * 鏂板鎸囨爣閫夐」搴�
-     * 
-     * @param ivrLibaTarget 鎸囨爣閫夐」搴�
+     *
+     * @param ivrLibaTargetVO 鎸囨爣閫夐」搴�
      * @return 缁撴灉
      */
     @Override
-    public int insertIvrLibaTarget(IvrLibaTarget ivrLibaTarget)
-    {
+    @Transactional(rollbackFor = Exception.class)
+    public int insertIvrLibaTarget(IvrLibaTargetVO ivrLibaTargetVO) {
+        //鏂板鎸囨爣淇℃伅
+        IvrLibaTarget ivrLibaTarget = DtoConversionUtils.sourceToTarget(ivrLibaTargetVO, IvrLibaTarget.class);
         ivrLibaTarget.setCreateTime(DateUtils.getNowDate());
-        return ivrLibaTargetMapper.insertIvrLibaTarget(ivrLibaTarget);
+        ivrLibaTargetMapper.insertIvrLibaTarget(ivrLibaTarget);
+
+        //鏂板璇ユ寚鏍囧搴旂殑鏍囩淇℃伅
+        for (BaseTag baseTag : ivrLibaTargetVO.getBaseTagList()) {
+            IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
+            ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
+            ivrLibaTargetTag.setTargetid(ivrLibaTarget.getTargetID());
+            //鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
+            ivrLibaTargetTag.setTagid(baseTag.getTagid());
+            ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
+        }
+
+        //鏂板璇ユ寚鏍囧搴旂殑鎸囨爣閫夐」淇℃伅
+        for (IvrLibaTargetoption targetoption : ivrLibaTargetVO.getTargetoptionList()) {
+            if (ObjectUtils.isEmpty(targetoption)) continue;
+            log.info("targetoption鐨勬暟鎹负锛歿}", targetoption);
+            targetoption.setTargetid(ivrLibaTarget.getTargetID());
+            ivrLibaTargetoptionMapper.insertIvrLibaTargetoption(targetoption);
+        }
+
+        log.info("鎸囨爣id涓猴細{}", ivrLibaTarget.getTargetID().intValue());
+        return ivrLibaTarget.getTargetID().intValue();
     }
 
     /**
-     * 淇敼鎸囨爣閫夐」搴�
-     * 
-     * @param ivrLibaTarget 鎸囨爣閫夐」搴�
+     * 鏂板鎴栦慨鏀规寚鏍囬�夐」搴�
+     *
+     * @param ivrLibaTargetVO 鎸囨爣閫夐」搴�
      * @return 缁撴灉
      */
     @Override
-    public int updateIvrLibaTarget(IvrLibaTarget ivrLibaTarget)
-    {
+    @Transactional(rollbackFor = Exception.class)
+    public int saveOrupdateIvrLibaTarget(IvrLibaTargetVO ivrLibaTargetVO) {
+        IvrLibaTarget ivrLibaTarget = DtoConversionUtils.sourceToTarget(ivrLibaTargetVO, IvrLibaTarget.class);
         ivrLibaTarget.setUpdateTime(DateUtils.getNowDate());
-        return ivrLibaTargetMapper.updateIvrLibaTarget(ivrLibaTarget);
+        if (ivrLibaTargetVO.getIsoperation() != null && ivrLibaTargetVO.getIsoperation() == 1) {
+            //鏂板
+            ivrLibaTargetMapper.insertIvrLibaTarget(ivrLibaTarget);
+        } else if (ivrLibaTargetVO.getIsoperation() != null && ivrLibaTargetVO.getIsoperation() == 2) {
+            //淇敼
+            ivrLibaTargetMapper.updateIvrLibaTarget(ivrLibaTarget);
+        }
+
+        if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getBaseTagList())) {
+            for (BaseTag baseTag : ivrLibaTargetVO.getBaseTagList()) {
+                if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 1) {
+                    //鏂板
+                    IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
+                    ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
+                    ivrLibaTargetTag.setTargetid(ivrLibaTarget.getTargetID());
+                    //鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
+                    ivrLibaTargetTag.setTagid(baseTag.getTagid());
+                    ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
+                } else if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 2) {
+                    //鍓嶇椤甸潰搴旇娌℃湁淇敼
+                } else if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 3) {
+                    //鍒犻櫎
+                    ivrLibaTargetTagMapper.deleteIvrLibaTargetTagById(baseTag.getTagid());
+                }
+            }
+        }
+        if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getTargetoptionList())) {
+            for (IvrLibaTargetoption ivrLibaTargetoption : ivrLibaTargetVO.getTargetoptionList()) {
+                if (ivrLibaTargetoption.getIsoperation() != null && ivrLibaTargetoption.getIsoperation() == 1) {
+                    //鏂板
+                    ivrLibaTargetoption.setTargetid(ivrLibaTarget.getTargetID());
+                    ivrLibaTargetoptionMapper.insertIvrLibaTargetoption(ivrLibaTargetoption);
+                } else if (ivrLibaTargetoption.getIsoperation() != null && ivrLibaTargetoption.getIsoperation() == 2) {
+                    //淇敼
+                    ivrLibaTargetoptionMapper.updateIvrLibaTargetoption(ivrLibaTargetoption);
+                } else if (ivrLibaTargetoption.getIsoperation() != null && ivrLibaTargetoption.getIsoperation() == 3) {
+                    // 鍒犻櫎
+                    ivrLibaTargetoptionMapper.deleteIvrLibaTargetoptionByTargetoptionid(ivrLibaTargetoption.getTargetoptionid());
+                }
+
+            }
+        }
+
+        return ivrLibaTarget.getTargetID().intValue();
     }
+
 
     /**
      * 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
-     * 
+     *
      * @param targetIDs 闇�瑕佸垹闄ょ殑鎸囨爣閫夐」搴撲富閿�
      * @return 缁撴灉
      */
     @Override
-    public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs)
-    {
+    public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs) {
         return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetIDs(targetIDs);
     }
 
     /**
      * 鍒犻櫎鎸囨爣閫夐」搴撲俊鎭�
-     * 
+     *
      * @param targetID 鎸囨爣閫夐」搴撲富閿�
      * @return 缁撴灉
      */
     @Override
-    public int deleteIvrLibaTargetByTargetID(Long targetID)
-    {
+    public int deleteIvrLibaTargetByTargetID(Long targetID) {
         return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetID(targetID);
     }
 }
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetTagServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetTagServiceImpl.java
new file mode 100644
index 0000000..11d18ee
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetTagServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.BaseTag;
+import com.smartor.domain.IvrLibaTargetTag;
+import com.smartor.domain.IvrLibaTargetTagVO;
+import com.smartor.mapper.BaseTagMapper;
+import com.smartor.mapper.IvrLibaTargetTagMapper;
+import com.smartor.service.IIvrLibaTargetTagService;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鏍囩Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@Service
+public class IvrLibaTargetTagServiceImpl implements IIvrLibaTargetTagService {
+    @Autowired
+    private IvrLibaTargetTagMapper ivrLibaTargetTagMapper;
+
+    @Autowired
+    private BaseTagMapper baseTagMapper;
+
+    /**
+     * 鏌ヨ鎸囨爣鏍囩
+     *
+     * @param id 鎸囨爣鏍囩涓婚敭
+     * @return 鎸囨爣鏍囩
+     */
+    @Override
+    public IvrLibaTargetTag selectIvrLibaTargetTagById(Long id) {
+        return ivrLibaTargetTagMapper.selectIvrLibaTargetTagById(id);
+    }
+
+    /**
+     * 鏌ヨ鎸囨爣鏍囩鍒楄〃
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 鎸囨爣鏍囩
+     */
+    @Override
+    public List<IvrLibaTargetTag> selectIvrLibaTargetTagList(IvrLibaTargetTag ivrLibaTargetTag) {
+        return ivrLibaTargetTagMapper.selectIvrLibaTargetTagList(ivrLibaTargetTag);
+    }
+
+    /**
+     * 鏂板鎸囨爣鏍囩
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertIvrLibaTargetTag(IvrLibaTargetTag ivrLibaTargetTag) {
+        ivrLibaTargetTag.setCreateTime(DateUtils.getNowDate());
+        return ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
+    }
+
+    /**
+     * 淇敼鎸囨爣鏍囩
+     *
+     * @param ivrLibaTargetTag 鎸囨爣鏍囩
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateIvrLibaTargetTag(IvrLibaTargetTag ivrLibaTargetTag) {
+        ivrLibaTargetTag.setUpdateTime(DateUtils.getNowDate());
+        return ivrLibaTargetTagMapper.updateIvrLibaTargetTag(ivrLibaTargetTag);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣鏍囩
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣鏍囩涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaTargetTagByIds(Long[] ids) {
+        return ivrLibaTargetTagMapper.deleteIvrLibaTargetTagByIds(ids);
+    }
+
+    /**
+     * 鍒犻櫎鎸囨爣鏍囩淇℃伅
+     *
+     * @param id 鎸囨爣鏍囩涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaTargetTagById(Long id) {
+        return ivrLibaTargetTagMapper.deleteIvrLibaTargetTagById(id);
+    }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplatetargetAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplatetargetAssortServiceImpl.java
new file mode 100644
index 0000000..8595be8
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplatetargetAssortServiceImpl.java
@@ -0,0 +1,90 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.IvrLibaTemplatetargetAssort;
+import com.smartor.mapper.IvrLibaTemplatetargetAssortMapper;
+import com.smartor.service.IIvrLibaTemplatetargetAssortService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣妯℃澘鍒嗙被Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-12-18
+ */
+@Service
+public class IvrLibaTemplatetargetAssortServiceImpl implements IIvrLibaTemplatetargetAssortService {
+    @Autowired
+    private IvrLibaTemplatetargetAssortMapper ivrLibaTemplatetargetAssortMapper;
+
+    /**
+     * 鏌ヨ鎸囨爣妯℃澘鍒嗙被
+     *
+     * @param id 鎸囨爣妯℃澘鍒嗙被涓婚敭
+     * @return 鎸囨爣妯℃澘鍒嗙被
+     */
+    @Override
+    public IvrLibaTemplatetargetAssort selectIvrLibaTemplatetargetAssortById(Long id) {
+        return ivrLibaTemplatetargetAssortMapper.selectIvrLibaTemplatetargetAssortById(id);
+    }
+
+    /**
+     * 鏌ヨ鎸囨爣妯℃澘鍒嗙被鍒楄〃
+     *
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 鎸囨爣妯℃澘鍒嗙被
+     */
+    @Override
+    public List<IvrLibaTemplatetargetAssort> selectIvrLibaTemplatetargetAssortList(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort) {
+        return ivrLibaTemplatetargetAssortMapper.selectIvrLibaTemplatetargetAssortList(ivrLibaTemplatetargetAssort);
+    }
+
+    /**
+     * 鏂板鎸囨爣妯℃澘鍒嗙被
+     *
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertIvrLibaTemplatetargetAssort(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort) {
+        ivrLibaTemplatetargetAssort.setCreateTime(DateUtils.getNowDate());
+        return ivrLibaTemplatetargetAssortMapper.insertIvrLibaTemplatetargetAssort(ivrLibaTemplatetargetAssort);
+    }
+
+    /**
+     * 淇敼鎸囨爣妯℃澘鍒嗙被
+     *
+     * @param ivrLibaTemplatetargetAssort 鎸囨爣妯℃澘鍒嗙被
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateIvrLibaTemplatetargetAssort(IvrLibaTemplatetargetAssort ivrLibaTemplatetargetAssort) {
+        ivrLibaTemplatetargetAssort.setUpdateTime(DateUtils.getNowDate());
+        return ivrLibaTemplatetargetAssortMapper.updateIvrLibaTemplatetargetAssort(ivrLibaTemplatetargetAssort);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣妯℃澘鍒嗙被
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣妯℃澘鍒嗙被涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaTemplatetargetAssortByIds(Long[] ids) {
+        return ivrLibaTemplatetargetAssortMapper.deleteIvrLibaTemplatetargetAssortByIds(ids);
+    }
+
+    /**
+     * 鍒犻櫎鎸囨爣妯℃澘鍒嗙被淇℃伅
+     *
+     * @param id 鎸囨爣妯℃澘鍒嗙被涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteIvrLibaTemplatetargetAssortById(Long id) {
+        return ivrLibaTemplatetargetAssortMapper.deleteIvrLibaTemplatetargetAssortById(id);
+    }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index 15fb59d..53af4ce 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -94,63 +94,59 @@
      * @return 缁撴灉
      */
     @Override
-    public int insertPatArchive(PatArchive patArchive) {
+    public Integer insertPatArchive(PatArchive patArchive) {
         patArchive.setCreateTime(DateUtils.getNowDate());
         List<PatArchive> patArchives = new ArrayList<>();
         patArchives.add(patArchive);
-        return patArchiveMapper.insertPatArchive(patArchives);
+        patArchiveMapper.insertPatArchive(patArchives);
+        if (CollectionUtils.isNotEmpty(patArchives)) {
+            patArchives.get(0).getPatid();
+            log.info("鎮h�卛d涓�: {}", patArchives.get(0).getPatid());
+            return patArchives.get(0).getPatid().intValue();
+        }
+        return null;
     }
 
     /**
-     * 淇敼鎮h�呮。妗�
+     * 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
      *
-     * @param patArchive 鎮h�呮。妗�
+     * @param patArchiveVO 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
      * @return 缁撴灉
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Boolean updatePatArchive(PatArchive patArchive) {
-        patArchive.setUpdateTime(DateUtils.getNowDate());
+    public Boolean saveOrUpdatePatInfo(PatArchiveVO patArchiveVO) {
+        //閫氳繃isoperation鏉ュ垽鏂槸鍚︽柊澧�
+        PatArchive patArchive = DtoConversionUtils.sourceToTarget(patArchiveVO, PatArchive.class);
+        if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 1) {
+            //鏂板
+            List<PatArchive> patArchives = new ArrayList<>();
+            patArchive.setUpdateTime(DateUtils.getNowDate());
+            patArchives.add(patArchive);
+            patArchiveMapper.insertPatArchive(patArchives);
+        } else if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 2) {
+            //淇敼
+            patArchiveMapper.updatePatArchive(patArchive);
+        }
 
-        for (String tagName : patArchive.getTagList()) {
-            BaseTag baseTag = new BaseTag();
-            baseTag.setTagname(tagName);
-            List<BaseTag> baseTags = baseTagMapper.selectBaseTagList(baseTag);
-
-            if (CollectionUtils.isEmpty(baseTags)) {
-                baseTag = new BaseTag();
-                baseTag.setTagcategoryid(1L);
-                baseTag.setTagname(tagName);
-                baseTag.setOrgid(null);
-                baseTag.setDelFlag("0");
-                baseTag.setCreateBy(null);
-                baseTag.setCreateTime(new Date());
-                baseTag.setCreateBy(null);
-                baseTag.setCreateTime(new Date());
-                baseTagMapper.insertBaseTag(baseTag);
-                //鐒跺悗鍐嶅線pat_archivetag琛ㄤ腑鏂板
-            } else {
-                //濡傛灉鍦╞asetag涓瓨鍦�,鍒欐牴鎹畉agid鍜宲atid鍘籶at_archivetag琛ㄤ腑鏌ヨ鏄惁瀛樺湪
-                baseTag = baseTags.get(0);
-                PatArchivetag patArchivetag = new PatArchivetag();
-                patArchivetag.setPatid(patArchive.getPatid());
-                patArchivetag.setTagid(baseTag.getTagid());
-                List<PatArchivetag> patArchivetags = patArchivetagMapper.selectPatArchivetagAndBaseTagList(patArchivetag);
-                if (CollectionUtils.isNotEmpty(patArchivetags)) {
-                    //濡傛灉瀛樺湪锛宑ontinue;
-                    continue;
-                } else {
-                    //濡傛灉涓嶅瓨鍦紝鍒欏垯pat_archivetag涓柊澧�
-                    // 鏂板鎮h�呮。妗堟爣绛�
+        if (CollectionUtils.isNotEmpty(patArchiveVO.getTagList())) {
+            //澶勭悊鏍囩锛堟柊澧炪�佸垹闄わ級
+            for (PatArchivetag patArchivetag : patArchiveVO.getTagList()) {
+                if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 1) {
+                    //鏂板
+                    patArchivetag.setUpdateBy(null);
+                    patArchivetag.setCreateTime(new Date());
+                    patArchivetag.setPatid(patArchive.getPatid());
+                    patArchivetagMapper.insertPatArchivetag(patArchivetag);
+                } else if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 3) {
+                    patArchivetag.setDelFlag("1");
+                    //鍒犻櫎
+                    log.info("鏍囩鐨刬d涓猴細{}", patArchivetag.getTagid());
+                    patArchivetagMapper.deletePatArchivetagById(patArchivetag);
                 }
             }
-            PatArchivetag patArchivetag = DtoConversionUtils.sourceToTarget(baseTag, PatArchivetag.class);
-            patArchivetag.setUpdateBy(null);
-            patArchivetag.setCreateTime(new Date());
-            patArchivetag.setPatid(patArchive.getPatid());
-            patArchivetagMapper.insertPatArchivetag(patArchivetag);
+
         }
-        patArchiveMapper.updatePatArchive(patArchive);
         return true;
     }
 
@@ -486,7 +482,7 @@
         //瀵规暟鎹繘琛屽皝瑁�
         for (List<PatArchive> list : listMap.values()) {
             PatArchive patArchive1 = new PatArchive();
-            Set<String> stringList = new HashSet<>();
+            Set<PatArchivetag> stringList = new HashSet<>();
             for (int i = 0; i < list.size(); i++) {
                 if (i == 0) {
                     patArchive1 = DtoConversionUtils.sourceToTarget(list.get(0), PatArchive.class);
@@ -494,7 +490,10 @@
                     patArchive1.setTag("");
                 }
                 //灏嗘煡鍑虹殑tag锛屾斁鍒皃atArchive1閲岀殑TagList涓�
-                stringList.add(list.get(i).getTag());
+                PatArchivetag patArchivetag = new PatArchivetag();
+                patArchivetag.setTagname(list.get(i).getTag());
+                patArchivetag.setTagid(list.get(i).getTagid());
+                stringList.add(patArchivetag);
             }
             patArchive1.setTagList(stringList.stream().collect(Collectors.toList()));
             patArchives.add(patArchive1);
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java
index 2fed8d0..f11a3e5 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchivetagServiceImpl.java
@@ -81,16 +81,4 @@
         return patArchivetagMapper.deletePatArchivetagByIds(ids);
     }
 
-    /**
-     * 鍒犻櫎鎮h�呮。妗堟爣绛句俊鎭�
-     *
-     * @param id 鎮h�呮。妗堟爣绛句富閿�
-     * @return 缁撴灉
-     */
-    @Override
-    public int deletePatArchivetagById(Long id) {
-        return patArchivetagMapper.deletePatArchivetagById(id);
-    }
-
-
 }
diff --git a/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml b/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml
new file mode 100644
index 0000000..adbbb0d
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml
@@ -0,0 +1,106 @@
+<?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.Icd10Mapper">
+    
+    <resultMap type="com.smartor.domain.Icd10" id="Icd10Result">
+        <result property="icdid"    column="icdid"    />
+        <result property="icdcode"    column="icdcode"    />
+        <result property="icdname"    column="icdname"    />
+        <result property="icdpym"    column="icdpym"    />
+        <result property="icdwbm"    column="icdwbm"    />
+        <result property="orgid"    column="orgid"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="pid"    column="pid"    />
+        <result property="guid"    column="guid"    />
+    </resultMap>
+
+    <sql id="selectIcd10Vo">
+        select icdid, icdcode, icdname, icdpym, icdwbm, orgid, del_flag, create_by, create_time, update_by, update_time, pid, guid from icd10
+    </sql>
+
+    <select id="selectIcd10List" parameterType="com.smartor.domain.Icd10" resultMap="Icd10Result">
+        <include refid="selectIcd10Vo"/>
+        <where>  
+            <if test="icdcode != null  and icdcode != ''"> and icdcode = #{icdcode}</if>
+            <if test="icdname != null  and icdname != ''"> and icdname like concat('%', #{icdname}, '%')</if>
+            <if test="icdpym != null  and icdpym != ''"> and icdpym = #{icdpym}</if>
+            <if test="icdwbm != null  and icdwbm != ''"> and icdwbm = #{icdwbm}</if>
+            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
+            <if test="pid != null "> and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''"> and guid = #{guid}</if>
+        </where>
+    </select>
+    
+    <select id="selectIcd10ByIcdid" parameterType="Long" resultMap="Icd10Result">
+        <include refid="selectIcd10Vo"/>
+        where icdid = #{icdid}
+    </select>
+        
+    <insert id="insertIcd10" parameterType="com.smartor.domain.Icd10" useGeneratedKeys="true" keyProperty="icdid">
+        insert into icd10
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="icdcode != null">icdcode,</if>
+            <if test="icdname != null">icdname,</if>
+            <if test="icdpym != null">icdpym,</if>
+            <if test="icdwbm != null">icdwbm,</if>
+            <if test="orgid != null">orgid,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="pid != null">pid,</if>
+            <if test="guid != null">guid,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="icdcode != null">#{icdcode},</if>
+            <if test="icdname != null">#{icdname},</if>
+            <if test="icdpym != null">#{icdpym},</if>
+            <if test="icdwbm != null">#{icdwbm},</if>
+            <if test="orgid != null">#{orgid},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="guid != null">#{guid},</if>
+         </trim>
+    </insert>
+
+    <update id="updateIcd10" parameterType="com.smartor.domain.Icd10">
+        update icd10
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="icdcode != null">icdcode = #{icdcode},</if>
+            <if test="icdname != null">icdname = #{icdname},</if>
+            <if test="icdpym != null">icdpym = #{icdpym},</if>
+            <if test="icdwbm != null">icdwbm = #{icdwbm},</if>
+            <if test="orgid != null">orgid = #{orgid},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="guid != null">guid = #{guid},</if>
+        </trim>
+        where icdid = #{icdid}
+    </update>
+
+    <delete id="deleteIcd10ByIcdid" parameterType="Long">
+        delete from icd10 where icdid = #{icdid}
+    </delete>
+
+    <delete id="deleteIcd10ByIcdids" parameterType="String">
+        delete from icd10 where icdid in 
+        <foreach item="icdid" collection="array" open="(" separator="," close=")">
+            #{icdid}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaOutIcd10Mapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaOutIcd10Mapper.xml
new file mode 100644
index 0000000..63ec04e
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaOutIcd10Mapper.xml
@@ -0,0 +1,138 @@
+<?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.IvrLibaOutIcd10Mapper">
+
+    <resultMap type="com.smartor.domain.IvrLibaTargetIcd10" id="IvrLibaTargetIcd10Result">
+        <result property="id" column="id"/>
+        <result property="icd10id" column="icd10id"/>
+        <result property="icd10code" column="icd10code"/>
+        <result property="icd10name" column="icd10name"/>
+        <result property="orgid" column="orgid"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="outid" column="outid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
+    </resultMap>
+
+    <sql id="selectIvrLibaTargetIcd10Vo">
+        select id,
+               icd10id,
+               icd10code,
+               icd10name,
+               orgid,
+               del_flag,
+               update_by,
+               update_time,
+               create_by,
+               create_time,
+               isupload,
+               upload_time,
+               type,
+               outid,
+               pid,
+               guid
+        from ivr_liba_out_icd10
+    </sql>
+
+    <select id="selectIvrLibaTargetIcd10List" parameterType="com.smartor.domain.IvrLibaTargetIcd10"
+            resultMap="IvrLibaTargetIcd10Result">
+        <include refid="selectIvrLibaTargetIcd10Vo"/>
+        <where>
+            <if test="icd10id != null ">and icd10id = #{icd10id}</if>
+            <if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="outid != null ">and outid = #{outid}</if>
+            <if test="type != null ">and type = #{type}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
+        </where>
+    </select>
+
+    <select id="selectIvrLibaTargetIcd10ById" parameterType="Long" resultMap="IvrLibaTargetIcd10Result">
+        <include refid="selectIvrLibaTargetIcd10Vo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertIvrLibaTargetIcd10" parameterType="com.smartor.domain.IvrLibaTargetIcd10" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into ivr_liba_out_icd10
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="icd10id != null">icd10id,</if>
+            <if test="icd10code != null">icd10code,</if>
+            <if test="icd10name != null">icd10name,</if>
+            <if test="orgid != null">orgid,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="isupload != null">isupload,</if>
+            <if test="uploadTime != null">upload_time,</if>
+            <if test="outid != null">outid,</if>
+            <if test="type != null">type,</if>
+            <if test="pid != null">pid,</if>
+            <if test="guid != null">guid,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="icd10id != null">#{icd10id},</if>
+            <if test="icd10code != null">#{icd10code},</if>
+            <if test="icd10name != null">#{icd10name},</if>
+            <if test="orgid != null">#{orgid},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="isupload != null">#{isupload},</if>
+            <if test="uploadTime != null">#{uploadTime},</if>
+            <if test="outid != null">#{outid},</if>
+            <if test="type != null">#{type},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="guid != null">#{guid},</if>
+        </trim>
+    </insert>
+
+    <update id="updateIvrLibaTargetIcd10" parameterType="com.smartor.domain.IvrLibaTargetIcd10">
+        update ivr_liba_out_icd10
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="icd10id != null">icd10id = #{icd10id},</if>
+            <if test="icd10code != null">icd10code = #{icd10code},</if>
+            <if test="orgid != null">orgid = #{orgid},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="isupload != null">isupload = #{isupload},</if>
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="outid != null">outid = #{outid},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="guid != null">guid = #{guid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIvrLibaTargetIcd10ById" parameterType="Long">
+        delete
+        from ivr_liba_out_icd10
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteIvrLibaTargetIcd10ByIds" parameterType="String">
+        delete from ivr_liba_out_icd10 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml
new file mode 100644
index 0000000..2a788ed
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml
@@ -0,0 +1,81 @@
+<?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.IvrLibaScriptAssortMapper">
+
+    <resultMap type="com.smartor.domain.IvrLibaScriptAssort" id="IvrLibaScriptAssortResult">
+        <result property="id" column="id"/>
+        <result property="indexAssortName" column="index_assort_name"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="pid" column="pid"/>
+    </resultMap>
+
+    <sql id="selectIvrLibaScriptAssortVo">
+        select id, index_assort_name, del_flag, create_time, update_time, pid
+        from ivr_liba_script_assort
+    </sql>
+
+    <select id="selectIvrLibaScriptAssortList" parameterType="com.smartor.domain.IvrLibaScriptAssort"
+            resultMap="IvrLibaScriptAssortResult">
+        <include refid="selectIvrLibaScriptAssortVo"/>
+        <where>
+            <if test="indexAssortName != null  and indexAssortName != ''">and index_assort_name like concat('%',
+                #{indexAssortName}, '%')
+            </if>
+            <if test="pid != null ">and pid = #{pid}</if>
+        </where>
+    </select>
+
+    <select id="selectIvrLibaScriptAssortById" parameterType="Long" resultMap="IvrLibaScriptAssortResult">
+        <include refid="selectIvrLibaScriptAssortVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertIvrLibaScriptAssort" parameterType="com.smartor.domain.IvrLibaScriptAssort">
+        insert into ivr_liba_script_assort
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="indexAssortName != null and indexAssortName != ''">index_assort_name,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="pid != null">pid,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="indexAssortName != null and indexAssortName != ''">#{indexAssortName},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="pid != null">#{pid},</if>
+        </trim>
+    </insert>
+
+    <update id="updateIvrLibaScriptAssort" parameterType="com.smartor.domain.IvrLibaScriptAssort">
+        update ivr_liba_script_assort
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="indexAssortName != null and indexAssortName != ''">index_assort_name = #{indexAssortName},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="pid != null">pid = #{pid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIvrLibaScriptAssortById" parameterType="Long">
+        delete
+        from ivr_liba_script_assort
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteIvrLibaScriptAssortByIds" parameterType="String">
+        delete from ivr_liba_script_assort where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
index 8f72e05..e2b5dfa 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
@@ -1,93 +1,116 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.IvrLibaScriptMapper">
-    
-    <resultMap type="IvrLibaScript" id="IvrLibaScriptResult">
-        <result property="questionid"    column="questionid"    />
-        <result property="questionpoint"    column="questionpoint"    />
-        <result property="questiontext"    column="questiontext"    />
-        <result property="questionvoice"    column="questionvoice"    />
-        <result property="nomatchtext"    column="nomatchtext"    />
-        <result property="nomatchvoice"    column="nomatchvoice"    />
-        <result property="sliencetext"    column="sliencetext"    />
-        <result property="sliencevoice"    column="sliencevoice"    />
-        <result property="submoduletext"    column="submoduletext"    />
-        <result property="submodulevoice"    column="submodulevoice"    />
-        <result property="noclearlytext"    column="noclearlytext"    />
-        <result property="noclearlyvoice"    column="noclearlyvoice"    />
-        <result property="questiontype"    column="questiontype"    />
-        <result property="categoryname"    column="categoryname"    />
-        <result property="targetoptions"    column="targetoptions"    />
-        <result property="language"    column="language"    />
-        <result property="note"    column="note"    />
-        <result property="version"    column="version"    />
-        <result property="isenable"    column="isenable"    />
-        <result property="isdel"    column="isdel"    />
-        <result property="adduserid"    column="adduserid"    />
-        <result property="addtime"    column="addtime"    />
-        <result property="modifyuserid"    column="modifyuserid"    />
-        <result property="modifytime"    column="modifytime"    />
-        <result property="groupid"    column="groupid"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="isupload"    column="isupload"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="orgid"    column="orgid"    />
+
+    <resultMap type="com.smartor.domain.IvrLibaScript" id="IvrLibaScriptResult">
+        <result property="id" column="id"/>
+        <result property="questiontitle" column="questiontitle"/>
+        <result property="questiontext" column="questiontext"/>
+        <result property="questionvoice" column="questionvoice"/>
+        <result property="nomatchtext" column="nomatchtext"/>
+        <result property="nomatchvoice" column="nomatchvoice"/>
+        <result property="sliencetext" column="sliencetext"/>
+        <result property="sliencevoice" column="sliencevoice"/>
+        <result property="submoduletext" column="submoduletext"/>
+        <result property="submodulevoice" column="submodulevoice"/>
+        <result property="noclearlytext" column="noclearlytext"/>
+        <result property="noclearlyvoice" column="noclearlyvoice"/>
+        <result property="questiontype" column="questiontype"/>
+        <result property="targetid" column="targetid"/>
+        <result property="targetname" column="targetname"/>
+        <result property="targetoptions" column="targetoptions"/>
+        <result property="language" column="language"/>
+        <result property="remark" column="remark"/>
+        <result property="version" column="version"/>
+        <result property="usestate" column="usestate"/>
+        <result property="adduserid" column="adduserid"/>
+        <result property="addtime" column="addtime"/>
+        <result property="modifyuserid" column="modifyuserid"/>
+        <result property="modifytime" column="modifytime"/>
+        <result property="assortid" column="assortid"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
     </resultMap>
 
     <sql id="selectIvrLibaScriptVo">
-        select questionid, questionpoint, questiontext, questionvoice, nomatchtext, nomatchvoice, sliencetext, sliencevoice, submoduletext, submodulevoice, noclearlytext, noclearlyvoice, questiontype, categoryname, targetoptions, language, note, version, isenable, isdel, adduserid, addtime, modifyuserid, modifytime, groupid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_script
+        select id,
+               questiontitle,
+               isenable,
+               questiontext,
+               questionvoice,
+               nomatchtext,
+               nomatchvoice,
+               sliencetext,
+               sliencevoice,
+               submoduletext,
+               submodulevoice,
+               noclearlytext,
+               noclearlyvoice,
+               questiontype,
+               targetid,
+               targetname,
+               targetoptions, language, remark, version, usestate, adduserid, addtime, modifyuserid, modifytime, assortid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
+        from ivr_liba_script
     </sql>
 
-    <select id="selectIvrLibaScriptList" parameterType="IvrLibaScript" resultMap="IvrLibaScriptResult">
+    <select id="selectIvrLibaScriptList" parameterType="com.smartor.domain.IvrLibaScript"
+            resultMap="IvrLibaScriptResult">
         <include refid="selectIvrLibaScriptVo"/>
-        <where>  
-            <if test="questionpoint != null  and questionpoint != ''"> and questionpoint = #{questionpoint}</if>
-            <if test="questiontext != null  and questiontext != ''"> and questiontext = #{questiontext}</if>
-            <if test="questionvoice != null  and questionvoice != ''"> and questionvoice = #{questionvoice}</if>
-            <if test="nomatchtext != null  and nomatchtext != ''"> and nomatchtext = #{nomatchtext}</if>
-            <if test="nomatchvoice != null  and nomatchvoice != ''"> and nomatchvoice = #{nomatchvoice}</if>
-            <if test="sliencetext != null  and sliencetext != ''"> and sliencetext = #{sliencetext}</if>
-            <if test="sliencevoice != null  and sliencevoice != ''"> and sliencevoice = #{sliencevoice}</if>
-            <if test="submoduletext != null  and submoduletext != ''"> and submoduletext = #{submoduletext}</if>
-            <if test="submodulevoice != null  and submodulevoice != ''"> and submodulevoice = #{submodulevoice}</if>
-            <if test="noclearlytext != null  and noclearlytext != ''"> and noclearlytext = #{noclearlytext}</if>
-            <if test="noclearlyvoice != null  and noclearlyvoice != ''"> and noclearlyvoice = #{noclearlyvoice}</if>
-            <if test="questiontype != null  and questiontype != ''"> and questiontype = #{questiontype}</if>
-            <if test="categoryname != null  and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if>
-            <if test="targetoptions != null  and targetoptions != ''"> and targetoptions = #{targetoptions}</if>
-            <if test="language != null  and language != ''"> and language = #{language}</if>
-
-            <if test="note != null  and note != ''"> and note = #{note}</if>
-            <if test="version != null "> and version = #{version}</if>
-            <if test="isenable != null "> and isenable = #{isenable}</if>
-            <if test="isdel != null "> and isdel = #{isdel}</if>
-            <if test="adduserid != null  and adduserid != ''"> and adduserid = #{adduserid}</if>
-            <if test="addtime != null "> and addtime = #{addtime}</if>
-            <if test="modifyuserid != null  and modifyuserid != ''"> and modifyuserid = #{modifyuserid}</if>
-            <if test="modifytime != null "> and modifytime = #{modifytime}</if>
-            <if test="groupid != null  and groupid != ''"> and groupid = #{groupid}</if>
-            <if test="isupload != null "> and isupload = #{isupload}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
+        <where>
+            <if test="id != null ">and id = #{id}</if>
+            <if test="questiontitle != null  and questiontitle != ''">and questiontitle = #{questiontitle}</if>
+            <if test="isenable != null ">and isenable = #{isenable}</if>
+            <if test="questiontext != null  and questiontext != ''">and questiontext = #{questiontext}</if>
+            <if test="questionvoice != null  and questionvoice != ''">and questionvoice = #{questionvoice}</if>
+            <if test="nomatchtext != null  and nomatchtext != ''">and nomatchtext = #{nomatchtext}</if>
+            <if test="nomatchvoice != null  and nomatchvoice != ''">and nomatchvoice = #{nomatchvoice}</if>
+            <if test="sliencetext != null  and sliencetext != ''">and sliencetext = #{sliencetext}</if>
+            <if test="sliencevoice != null  and sliencevoice != ''">and sliencevoice = #{sliencevoice}</if>
+            <if test="submoduletext != null  and submoduletext != ''">and submoduletext = #{submoduletext}</if>
+            <if test="submodulevoice != null  and submodulevoice != ''">and submodulevoice = #{submodulevoice}</if>
+            <if test="noclearlytext != null  and noclearlytext != ''">and noclearlytext = #{noclearlytext}</if>
+            <if test="noclearlyvoice != null  and noclearlyvoice != ''">and noclearlyvoice = #{noclearlyvoice}</if>
+            <if test="questiontype != null  and questiontype != ''">and questiontype = #{questiontype}</if>
+            <if test="targetid != null ">and targetid = #{targetid}</if>
+            <if test="targetname != null  and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
+            <if test="targetoptions != null  and targetoptions != ''">and targetoptions = #{targetoptions}</if>
+            <if test="language != null  and language != ''">and language = #{language}</if>
+            <if test="version != null  and version != ''">and version = #{version}</if>
+            <if test="usestate != null ">and usestate = #{usestate}</if>
+            <if test="adduserid != null  and adduserid != ''">and adduserid = #{adduserid}</if>
+            <if test="addtime != null ">and addtime = #{addtime}</if>
+            <if test="modifyuserid != null  and modifyuserid != ''">and modifyuserid = #{modifyuserid}</if>
+            <if test="modifytime != null ">and modifytime = #{modifytime}</if>
+            <if test="assortid != null  and assortid != ''">and assortid = #{assortid}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
         </where>
     </select>
-    
+
     <select id="selectIvrLibaScriptByQuestionid" parameterType="String" resultMap="IvrLibaScriptResult">
         <include refid="selectIvrLibaScriptVo"/>
-        where questionid = #{questionid}
+        where id = #{questionid}
     </select>
-        
-    <insert id="insertIvrLibaScript" parameterType="IvrLibaScript">
+
+    <insert id="insertIvrLibaScript" parameterType="com.smartor.domain.IvrLibaScript" useGeneratedKeys="true"
+            keyProperty="id">
         insert into ivr_liba_script
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="questionid != null">questionid,</if>
-            <if test="questionpoint != null">questionpoint,</if>
+            <if test="questiontitle != null">questiontitle,</if>
+            <if test="isenable != null">isenable,</if>
             <if test="questiontext != null">questiontext,</if>
             <if test="questionvoice != null">questionvoice,</if>
             <if test="nomatchtext != null">nomatchtext,</if>
@@ -99,18 +122,18 @@
             <if test="noclearlytext != null">noclearlytext,</if>
             <if test="noclearlyvoice != null">noclearlyvoice,</if>
             <if test="questiontype != null">questiontype,</if>
-            <if test="categoryname != null">categoryname,</if>
+            <if test="targetid != null">targetid,</if>
+            <if test="targetname != null">targetname,</if>
             <if test="targetoptions != null">targetoptions,</if>
             <if test="language != null">language,</if>
-            <if test="note != null">note,</if>
+            <if test="remark != null">remark,</if>
             <if test="version != null">version,</if>
-            <if test="isenable != null">isenable,</if>
-            <if test="isdel != null">isdel,</if>
+            <if test="usestate != null">usestate,</if>
             <if test="adduserid != null">adduserid,</if>
             <if test="addtime != null">addtime,</if>
             <if test="modifyuserid != null">modifyuserid,</if>
             <if test="modifytime != null">modifytime,</if>
-            <if test="groupid != null">groupid,</if>
+            <if test="assortid != null">assortid,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -119,10 +142,12 @@
             <if test="isupload != null">isupload,</if>
             <if test="uploadTime != null">upload_time,</if>
             <if test="orgid != null">orgid,</if>
-         </trim>
+            <if test="pid != null">pid,</if>
+            <if test="guid != null">guid,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="questionid != null">#{questionid},</if>
-            <if test="questionpoint != null">#{questionpoint},</if>
+            <if test="questiontitle != null">#{questiontitle},</if>
+            <if test="isenable != null">#{isenable},</if>
             <if test="questiontext != null">#{questiontext},</if>
             <if test="questionvoice != null">#{questionvoice},</if>
             <if test="nomatchtext != null">#{nomatchtext},</if>
@@ -134,18 +159,18 @@
             <if test="noclearlytext != null">#{noclearlytext},</if>
             <if test="noclearlyvoice != null">#{noclearlyvoice},</if>
             <if test="questiontype != null">#{questiontype},</if>
-            <if test="categoryname != null">#{categoryname},</if>
+            <if test="targetid != null">#{targetid},</if>
+            <if test="targetname != null">#{targetname},</if>
             <if test="targetoptions != null">#{targetoptions},</if>
             <if test="language != null">#{language},</if>
-            <if test="note != null">#{note},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="version != null">#{version},</if>
-            <if test="isenable != null">#{isenable},</if>
-            <if test="isdel != null">#{isdel},</if>
+            <if test="usestate != null">#{usestate},</if>
             <if test="adduserid != null">#{adduserid},</if>
             <if test="addtime != null">#{addtime},</if>
             <if test="modifyuserid != null">#{modifyuserid},</if>
             <if test="modifytime != null">#{modifytime},</if>
-            <if test="groupid != null">#{groupid},</if>
+            <if test="assortid != null">#{assortid},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -154,13 +179,16 @@
             <if test="isupload != null">#{isupload},</if>
             <if test="uploadTime != null">#{uploadTime},</if>
             <if test="orgid != null">#{orgid},</if>
-         </trim>
+            <if test="pid != null">#{pid},</if>
+            <if test="guid != null">#{guid},</if>
+        </trim>
     </insert>
 
-    <update id="updateIvrLibaScript" parameterType="IvrLibaScript">
+    <update id="updateIvrLibaScript" parameterType="com.smartor.domain.IvrLibaScript">
         update ivr_liba_script
         <trim prefix="SET" suffixOverrides=",">
-            <if test="questionpoint != null">questionpoint = #{questionpoint},</if>
+            <if test="questiontitle != null">questiontitle = #{questiontitle},</if>
+            <if test="isenable != null">isenable = #{isenable},</if>
             <if test="questiontext != null">questiontext = #{questiontext},</if>
             <if test="questionvoice != null">questionvoice = #{questionvoice},</if>
             <if test="nomatchtext != null">nomatchtext = #{nomatchtext},</if>
@@ -172,18 +200,18 @@
             <if test="noclearlytext != null">noclearlytext = #{noclearlytext},</if>
             <if test="noclearlyvoice != null">noclearlyvoice = #{noclearlyvoice},</if>
             <if test="questiontype != null">questiontype = #{questiontype},</if>
-            <if test="categoryname != null">categoryname = #{categoryname},</if>
+            <if test="targetid != null">targetid = #{targetid},</if>
+            <if test="targetname != null">targetname = #{targetname},</if>
             <if test="targetoptions != null">targetoptions = #{targetoptions},</if>
             <if test="language != null">language = #{language},</if>
-            <if test="note != null">note = #{note},</if>
+            <if test="remark != null">remark = #{remark},</if>
             <if test="version != null">version = #{version},</if>
-            <if test="isenable != null">isenable = #{isenable},</if>
-            <if test="isdel != null">isdel = #{isdel},</if>
+            <if test="usestate != null">usestate = #{usestate},</if>
             <if test="adduserid != null">adduserid = #{adduserid},</if>
             <if test="addtime != null">addtime = #{addtime},</if>
             <if test="modifyuserid != null">modifyuserid = #{modifyuserid},</if>
             <if test="modifytime != null">modifytime = #{modifytime},</if>
-            <if test="groupid != null">groupid = #{groupid},</if>
+            <if test="assortid != null">assortid = #{assortid},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -192,18 +220,16 @@
             <if test="isupload != null">isupload = #{isupload},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
             <if test="orgid != null">orgid = #{orgid},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="guid != null">guid = #{guid},</if>
         </trim>
-        where questionid = #{questionid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteIvrLibaScriptByQuestionid" parameterType="String">
-        delete from ivr_liba_script where questionid = #{questionid}
+    <delete id="deleteIvrLibaScriptByQuestionid" parameterType="Integer">
+        delete
+        from ivr_liba_script
+        where id = #{id}
     </delete>
 
-    <delete id="deleteIvrLibaScriptByQuestionids" parameterType="String">
-        delete from ivr_liba_script where questionid in 
-        <foreach item="questionid" collection="array" open="(" separator="," close=")">
-            #{questionid}
-        </foreach>
-    </delete>
 </mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml
new file mode 100644
index 0000000..b4e2daf
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml
@@ -0,0 +1,142 @@
+<?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.IvrLibaScriptTagMapper">
+
+    <resultMap type="com.smartor.domain.IvrLibaScriptTag" id="IvrLibaScriptTagResult">
+        <result property="id" column="id"/>
+        <result property="tagcategoryid" column="tagcategoryid"/>
+        <result property="tagid" column="tagid"/>
+        <result property="orgid" column="orgid"/>
+        <result property="scriptid" column="scriptid"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="targetid" column="targetid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
+        <result property="tagname" column="tagname"/>
+    </resultMap>
+
+    <sql id="selectIvrLibaScriptTagVo">
+        select id,
+               tagcategoryid,
+               tagid,
+               scriptid,
+               orgid,
+               del_flag,
+               update_by,
+               update_time,
+               create_by,
+               create_time,
+               isupload,
+               upload_time,
+               targetid,
+               pid,
+               guid,
+               tagname
+        from ivr_liba_script_tag
+    </sql>
+
+    <select id="selectIvrLibaScriptTagList" parameterType="com.smartor.domain.IvrLibaScriptTag"
+            resultMap="IvrLibaScriptTagResult">
+        <include refid="selectIvrLibaScriptTagVo"/>
+        <where>
+            <if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
+            <if test="scriptid != null ">and scriptid = #{scriptid}</if>
+            <if test="tagid != null ">and tagid = #{tagid}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="targetid != null ">and targetid = #{targetid}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
+        </where>
+    </select>
+
+    <select id="selectIvrLibaScriptTagById" parameterType="Long" resultMap="IvrLibaScriptTagResult">
+        <include refid="selectIvrLibaScriptTagVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertIvrLibaScriptTag" parameterType="com.smartor.domain.IvrLibaScriptTag" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into ivr_liba_script_tag
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tagcategoryid != null">tagcategoryid,</if>
+            <if test="tagid != null">tagid,</if>
+            <if test="scriptid != null">scriptid,</if>
+            <if test="orgid != null">orgid,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="isupload != null">isupload,</if>
+            <if test="uploadTime != null">upload_time,</if>
+            <if test="targetid != null">targetid,</if>
+            <if test="pid != null">pid,</if>
+            <if test="guid != null">guid,</if>
+            <if test="tagname != null">tagname,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tagcategoryid != null">#{tagcategoryid},</if>
+            <if test="tagid != null">#{tagid},</if>
+            <if test="scriptid != null">#{scriptid},</if>
+            <if test="orgid != null">#{orgid},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="isupload != null">#{isupload},</if>
+            <if test="uploadTime != null">#{uploadTime},</if>
+            <if test="targetid != null">#{targetid},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="guid != null">#{guid},</if>
+            <if test="tagname != null">#{tagname},</if>
+        </trim>
+    </insert>
+
+    <update id="updateIvrLibaScriptTag" parameterType="com.smartor.domain.IvrLibaScriptTag">
+        update ivr_liba_script_tag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tagcategoryid != null">tagcategoryid = #{tagcategoryid},</if>
+            <if test="tagid != null">tagid = #{tagid},</if>
+            <if test="scriptid != null">scriptid = #{scriptid},</if>
+            <if test="orgid != null">orgid = #{orgid},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="isupload != null">isupload = #{isupload},</if>
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="targetid != null">targetid = #{targetid},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="guid != null">guid = #{guid},</if>
+            <if test="tagname != null">tagname = #{tagname},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIvrLibaScriptTagById" parameterType="Long">
+        update ivr_liba_script_tag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
+        </trim>
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteIvrLibaScriptTagByIds" parameterType="String">
+        delete from ivr_liba_script_tag where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml
new file mode 100644
index 0000000..7955a0f
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml
@@ -0,0 +1,173 @@
+<?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.IvrLibaScriptTargetoptionMapper">
+
+    <resultMap type="com.smartor.domain.IvrLibaScriptTargetoption" id="IvrLibaScriptTargetoptionResult">
+        <result property="id" column="id"/>
+        <result property="targetid" column="targetid"/>
+        <result property="scriptid" column="scriptid"/>
+        <result property="targettype" column="targettype"/>
+        <result property="categoryName" column="categoryName"/>
+        <result property="targetvalue" column="targetvalue"/>
+        <result property="targetregex" column="targetregex"/>
+        <result property="optiondesc" column="optiondesc"/>
+        <result property="language" column="language"/>
+        <result property="version" column="version"/>
+        <result property="groupid" column="groupid"/>
+        <result property="isabnormal" column="isabnormal"/>
+        <result property="warnup" column="warnup"/>
+        <result property="warndown" column="warndown"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
+    </resultMap>
+
+    <sql id="selectIvrLibaScriptTargetoptionVo">
+        select id,
+               targetid,
+               scriptid,
+               targettype,
+               categoryName,
+               targetvalue,
+               targetregex,
+               optiondesc, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
+        from ivr_liba_script_targetoption
+    </sql>
+
+    <select id="selectIvrLibaScriptTargetoptionList" parameterType="com.smartor.domain.IvrLibaScriptTargetoption"
+            resultMap="IvrLibaScriptTargetoptionResult">
+        <include refid="selectIvrLibaScriptTargetoptionVo"/>
+        <where>
+            <if test="targetid != null  and targetid != ''">and targetid = #{targetid}</if>
+            <if test="scriptid != null ">and scriptid = #{scriptid}</if>
+            <if test="targettype != null  and targettype != ''">and targettype = #{targettype}</if>
+            <if test="categoryName != null  and categoryName != ''">and categoryName like concat('%', #{categoryName},
+                '%')
+            </if>
+            <if test="targetvalue != null  and targetvalue != ''">and targetvalue = #{targetvalue}</if>
+            <if test="targetregex != null  and targetregex != ''">and targetregex = #{targetregex}</if>
+            <if test="optiondesc != null  and optiondesc != ''">and optiondesc = #{optiondesc}</if>
+            <if test="language != null  and language != ''">and language = #{language}</if>
+            <if test="version != null ">and version = #{version}</if>
+            <if test="groupid != null  and groupid != ''">and groupid = #{groupid}</if>
+            <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
+            <if test="warnup != null ">and warnup = #{warnup}</if>
+            <if test="warndown != null ">and warndown = #{warndown}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
+        </where>
+    </select>
+
+    <select id="selectIvrLibaScriptTargetoptionByTargetoptionid" parameterType="String"
+            resultMap="IvrLibaScriptTargetoptionResult">
+        <include refid="selectIvrLibaScriptTargetoptionVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertIvrLibaScriptTargetoption" parameterType="com.smartor.domain.IvrLibaScriptTargetoption">
+        insert into ivr_liba_script_targetoption
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="targetid != null and targetid != ''">targetid,</if>
+            <if test="scriptid != null">scriptid,</if>
+            <if test="targettype != null and targettype != ''">targettype,</if>
+            <if test="categoryName != null and categoryName != ''">categoryName,</if>
+            <if test="targetvalue != null">targetvalue,</if>
+            <if test="targetregex != null">targetregex,</if>
+            <if test="optiondesc != null">optiondesc,</if>
+            <if test="language != null and language != ''">language,</if>
+            <if test="version != null">version,</if>
+            <if test="groupid != null">groupid,</if>
+            <if test="isabnormal != null">isabnormal,</if>
+            <if test="warnup != null">warnup,</if>
+            <if test="warndown != null">warndown,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="isupload != null">isupload,</if>
+            <if test="uploadTime != null">upload_time,</if>
+            <if test="orgid != null">orgid,</if>
+            <if test="pid != null">pid,</if>
+            <if test="guid != null">guid,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="targetid != null and targetid != ''">#{targetid},</if>
+            <if test="scriptid != null ">#{scriptid},</if>
+            <if test="targettype != null and targettype != ''">#{targettype},</if>
+            <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
+            <if test="targetvalue != null">#{targetvalue},</if>
+            <if test="targetregex != null">#{targetregex},</if>
+            <if test="optiondesc != null">#{optiondesc},</if>
+            <if test="language != null and language != ''">#{language},</if>
+            <if test="version != null">#{version},</if>
+            <if test="groupid != null">#{groupid},</if>
+            <if test="isabnormal != null">#{isabnormal},</if>
+            <if test="warnup != null">#{warnup},</if>
+            <if test="warndown != null">#{warndown},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="isupload != null">#{isupload},</if>
+            <if test="uploadTime != null">#{uploadTime},</if>
+            <if test="orgid != null">#{orgid},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="guid != null">#{guid},</if>
+        </trim>
+    </insert>
+
+    <update id="updateIvrLibaScriptTargetoption" parameterType="com.smartor.domain.IvrLibaScriptTargetoption">
+        update ivr_liba_script_targetoption
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="targetid != null and targetid != ''">targetid = #{targetid},</if>
+            <if test="scriptid != null">scriptid = #{scriptid},</if>
+            <if test="targettype != null and targettype != ''">targettype = #{targettype},</if>
+            <if test="categoryName != null and categoryName != ''">categoryName = #{categoryName},</if>
+            <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
+            <if test="targetregex != null">targetregex = #{targetregex},</if>
+            <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
+            <if test="language != null and language != ''">language = #{language},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="groupid != null">groupid = #{groupid},</if>
+            <if test="isabnormal != null">isabnormal = #{isabnormal},</if>
+            <if test="warnup != null">warnup = #{warnup},</if>
+            <if test="warndown != null">warndown = #{warndown},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="isupload != null">isupload = #{isupload},</if>
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="orgid != null">orgid = #{orgid},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="guid != null">guid = #{guid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIvrLibaScriptTargetoptionByTargetoptionid" parameterType="Long">
+        update ivr_liba_script_targetoption
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null and delFlag != ''">del_flag = 1</if>
+        </trim>
+        where id = #{id}
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScripttargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScripttargetMapper.xml
deleted file mode 100644
index ca38487..0000000
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScripttargetMapper.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?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.IvrLibaScripttargetMapper">
-    
-    <resultMap type="IvrLibaScripttarget" id="IvrLibaScripttargetResult">
-        <result property="questionTargetID"    column="questionTargetID"    />
-        <result property="questionID"    column="questionID"    />
-        <result property="targetID"    column="targetID"    />
-        <result property="targetType"    column="targetType"    />
-        <result property="categoryName"    column="categoryName"    />
-        <result property="targetValue"    column="targetValue"    />
-        <result property="basicRegex"    column="basicRegex"    />
-        <result property="selfRegex"    column="selfRegex"    />
-        <result property="regexUsedType"    column="regexUsedType"    />
-        <result property="sort"    column="sort"    />
-        <result property="version"    column="version"    />
-        <result property="isEnable"    column="isEnable"    />
-        <result property="isDel"    column="isDel"    />
-        <result property="tipsJson"    column="tipsJson"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="isupload"    column="isupload"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="orgid"    column="orgid"    />
-    </resultMap>
-
-    <sql id="selectIvrLibaScripttargetVo">
-        select questionTargetID, questionID, targetID, targetType, categoryName, targetValue, basicRegex, selfRegex, regexUsedType, sort, version, isEnable, isDel, tipsJson, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_scripttarget
-    </sql>
-
-    <select id="selectIvrLibaScripttargetList" parameterType="IvrLibaScripttarget" resultMap="IvrLibaScripttargetResult">
-        <include refid="selectIvrLibaScripttargetVo"/>
-        <where>  
-            <if test="questionID != null  and questionID != ''"> and questionID = #{questionID}</if>
-            <if test="targetID != null  and targetID != ''"> and targetID = #{targetID}</if>
-            <if test="targetType != null  and targetType != ''"> and targetType = #{targetType}</if>
-            <if test="categoryName != null  and categoryName != ''"> and categoryName like concat('%', #{categoryName}, '%')</if>
-            <if test="targetValue != null  and targetValue != ''"> and targetValue = #{targetValue}</if>
-            <if test="basicRegex != null  and basicRegex != ''"> and basicRegex = #{basicRegex}</if>
-            <if test="selfRegex != null  and selfRegex != ''"> and selfRegex = #{selfRegex}</if>
-            <if test="regexUsedType != null  and regexUsedType != ''"> and regexUsedType = #{regexUsedType}</if>
-            <if test="sort != null "> and sort = #{sort}</if>
-            <if test="version != null "> and version = #{version}</if>
-            <if test="isEnable != null "> and isEnable = #{isEnable}</if>
-            <if test="isDel != null "> and isDel = #{isDel}</if>
-            <if test="tipsJson != null  and tipsJson != ''"> and tipsJson = #{tipsJson}</if>
-            <if test="isupload != null "> and isupload = #{isupload}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
-        </where>
-    </select>
-    
-    <select id="selectIvrLibaScripttargetByQuestionTargetID" parameterType="String" resultMap="IvrLibaScripttargetResult">
-        <include refid="selectIvrLibaScripttargetVo"/>
-        where questionTargetID = #{questionTargetID}
-    </select>
-        
-    <insert id="insertIvrLibaScripttarget" parameterType="IvrLibaScripttarget">
-        insert into ivr_liba_scripttarget
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="questionTargetID != null">questionTargetID,</if>
-            <if test="questionID != null and questionID != ''">questionID,</if>
-            <if test="targetID != null">targetID,</if>
-            <if test="targetType != null">targetType,</if>
-            <if test="categoryName != null">categoryName,</if>
-            <if test="targetValue != null">targetValue,</if>
-            <if test="basicRegex != null">basicRegex,</if>
-            <if test="selfRegex != null">selfRegex,</if>
-            <if test="regexUsedType != null">regexUsedType,</if>
-            <if test="sort != null">sort,</if>
-            <if test="version != null">version,</if>
-            <if test="isEnable != null">isEnable,</if>
-            <if test="isDel != null">isDel,</if>
-            <if test="tipsJson != null">tipsJson,</if>
-            <if test="delFlag != null and delFlag != ''">del_flag,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="isupload != null">isupload,</if>
-            <if test="uploadTime != null">upload_time,</if>
-            <if test="orgid != null">orgid,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="questionTargetID != null">#{questionTargetID},</if>
-            <if test="questionID != null and questionID != ''">#{questionID},</if>
-            <if test="targetID != null">#{targetID},</if>
-            <if test="targetType != null">#{targetType},</if>
-            <if test="categoryName != null">#{categoryName},</if>
-            <if test="targetValue != null">#{targetValue},</if>
-            <if test="basicRegex != null">#{basicRegex},</if>
-            <if test="selfRegex != null">#{selfRegex},</if>
-            <if test="regexUsedType != null">#{regexUsedType},</if>
-            <if test="sort != null">#{sort},</if>
-            <if test="version != null">#{version},</if>
-            <if test="isEnable != null">#{isEnable},</if>
-            <if test="isDel != null">#{isDel},</if>
-            <if test="tipsJson != null">#{tipsJson},</if>
-            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="isupload != null">#{isupload},</if>
-            <if test="uploadTime != null">#{uploadTime},</if>
-            <if test="orgid != null">#{orgid},</if>
-         </trim>
-    </insert>
-
-    <update id="updateIvrLibaScripttarget" parameterType="IvrLibaScripttarget">
-        update ivr_liba_scripttarget
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="questionID != null and questionID != ''">questionID = #{questionID},</if>
-            <if test="targetID != null">targetID = #{targetID},</if>
-            <if test="targetType != null">targetType = #{targetType},</if>
-            <if test="categoryName != null">categoryName = #{categoryName},</if>
-            <if test="targetValue != null">targetValue = #{targetValue},</if>
-            <if test="basicRegex != null">basicRegex = #{basicRegex},</if>
-            <if test="selfRegex != null">selfRegex = #{selfRegex},</if>
-            <if test="regexUsedType != null">regexUsedType = #{regexUsedType},</if>
-            <if test="sort != null">sort = #{sort},</if>
-            <if test="version != null">version = #{version},</if>
-            <if test="isEnable != null">isEnable = #{isEnable},</if>
-            <if test="isDel != null">isDel = #{isDel},</if>
-            <if test="tipsJson != null">tipsJson = #{tipsJson},</if>
-            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="isupload != null">isupload = #{isupload},</if>
-            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
-            <if test="orgid != null">orgid = #{orgid},</if>
-        </trim>
-        where questionTargetID = #{questionTargetID}
-    </update>
-
-    <delete id="deleteIvrLibaScripttargetByQuestionTargetID" parameterType="String">
-        delete from ivr_liba_scripttarget where questionTargetID = #{questionTargetID}
-    </delete>
-
-    <delete id="deleteIvrLibaScripttargetByQuestionTargetIDs" parameterType="String">
-        delete from ivr_liba_scripttarget where questionTargetID in 
-        <foreach item="questionTargetID" collection="array" open="(" separator="," close=")">
-            #{questionTargetID}
-        </foreach>
-    </delete>
-</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
index 7bcdc08..0b07cc5 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
@@ -1,66 +1,187 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.IvrLibaTargetMapper">
-    
+
     <resultMap type="com.smartor.domain.IvrLibaTarget" id="IvrLibaTargetResult">
-        <result property="targetID"    column="targetID"    />
-        <result property="groupid"    column="groupid"    />
-        <result property="targettype"    column="targettype"    />
-        <result property="targetname"    column="targetname"    />
-        <result property="targetdesc"    column="targetdesc"    />
-        <result property="language"    column="language"    />
-        <result property="version"    column="version"    />
-        <result property="isenable"    column="isenable"    />
-        <result property="isabnormal"    column="isabnormal"    />
-        <result property="warnup"    column="warnup"    />
-        <result property="warndown"    column="warndown"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="isupload"    column="isupload"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="orgid"    column="orgid"    />
-        <result property="pid"    column="pid"    />
-        <result property="guid"    column="guid"    />
-        <result property="assortid"    column="assortid"    />
+        <result property="targetID" column="targetID"/>
+        <result property="groupid" column="groupid"/>
+        <result property="targettype" column="targettype"/>
+        <result property="targetname" column="targetname"/>
+        <result property="targetdesc" column="targetdesc"/>
+        <result property="language" column="language"/>
+        <result property="version" column="version"/>
+        <result property="isenable" column="isenable"/>
+        <result property="isabnormal" column="isabnormal"/>
+        <result property="warnup" column="warnup"/>
+        <result property="warndown" column="warndown"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
+        <result property="assortid" column="assortid"/>
+        <result property="isAvailable" column="isAvailable"/>
+        <result property="suitDisease" column="suitDisease"/>
+        <result property="suitWay" column="suitWay"/>
+    </resultMap>
+
+    <resultMap type="com.smartor.domain.IvrLibaTargetVO" id="IvrLibaTargetVOResult">
+        <result property="targetID" column="targetID"/>
+        <result property="groupid" column="groupid"/>
+        <result property="targettype" column="targettype"/>
+        <result property="targetname" column="targetname"/>
+        <result property="targetdesc" column="targetdesc"/>
+        <result property="language" column="language"/>
+        <result property="version" column="version"/>
+        <result property="isenable" column="isenable"/>
+        <result property="isabnormal" column="isabnormal"/>
+        <result property="warnup" column="warnup"/>
+        <result property="warndown" column="warndown"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
+        <result property="assortid" column="assortid"/>
+        <result property="isAvailable" column="isAvailable"/>
+        <result property="suitDisease" column="suitDisease"/>
+        <result property="suitWay" column="suitWay"/>
+        <collection property="targetoptionList" javaType="java.util.List" resultMap="IvrLibaTargetoptionResult"/>
+    </resultMap>
+
+    <resultMap type="com.smartor.domain.IvrLibaTargetoption" id="IvrLibaTargetoptionResult">
+        <result property="targetoptionid" column="targetoptionid"/>
+        <result property="targetid" column="targetid"/>
+        <result property="targettype" column="targettype"/>
+        <result property="categoryName" column="categoryName"/>
+        <result property="targetvalue" column="targetvalue"/>
+        <result property="targetregex" column="targetregex"/>
+        <result property="optiondesc" column="optiondesc"/>
+        <result property="language" column="language"/>
+        <result property="version" column="version"/>
+        <result property="groupid" column="groupid"/>
+        <result property="isabnormal" column="isabnormal"/>
+        <result property="warnup" column="warnup"/>
+        <result property="warndown" column="warndown"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
     </resultMap>
 
     <sql id="selectIvrLibaTargetVo">
-        select targetID, groupid, targettype, targetname, targetdesc, language, version, isenable, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, assortid from ivr_liba_target
+        select targetID,
+               groupid,
+               targettype,
+               targetname,
+               targetdesc, language, version, isenable, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, assortid,
+            isAvailable, suitDisease, suitWay
+        from ivr_liba_target
     </sql>
 
-    <select id="selectIvrLibaTargetList" parameterType="com.smartor.domain.IvrLibaTarget" resultMap="IvrLibaTargetResult">
+    <select id="selectIvrLibaTargetList" parameterType="com.smartor.domain.IvrLibaTarget"
+            resultMap="IvrLibaTargetResult">
         <include refid="selectIvrLibaTargetVo"/>
-        <where>  
-            <if test="groupid != null  and groupid != ''"> and groupid = #{groupid}</if>
-            <if test="targettype != null  and targettype != ''"> and targettype = #{targettype}</if>
-            <if test="targetname != null  and targetname != ''"> and targetname like concat('%', #{targetname}, '%')</if>
-            <if test="targetdesc != null  and targetdesc != ''"> and targetdesc = #{targetdesc}</if>
-            <if test="language != null  and language != ''"> and language = #{language}</if>
-            <if test="version != null "> and version = #{version}</if>
-            <if test="isenable != null "> and isenable = #{isenable}</if>
-            <if test="isabnormal != null "> and isabnormal = #{isabnormal}</if>
-            <if test="warnup != null "> and warnup = #{warnup}</if>
-            <if test="warndown != null "> and warndown = #{warndown}</if>
-            <if test="isupload != null "> and isupload = #{isupload}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
-            <if test="pid != null "> and pid = #{pid}</if>
-            <if test="guid != null  and guid != ''"> and guid = #{guid}</if>
-            <if test="assortid != null "> and assortid = #{assortid}</if>
+        <where>
+            del_flag != 1
+            <if test="groupid != null  and groupid != ''">and groupid = #{groupid}</if>
+            <if test="targettype != null  and targettype != ''">and targettype = #{targettype}</if>
+            <if test="targetname != null  and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
+            <if test="targetdesc != null  and targetdesc != ''">and targetdesc = #{targetdesc}</if>
+            <if test="language != null  and language != ''">and language = #{language}</if>
+            <if test="version != null ">and version = #{version}</if>
+            <if test="isenable != null ">and isenable = #{isenable}</if>
+            <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
+            <if test="warnup != null ">and warnup = #{warnup}</if>
+            <if test="warndown != null ">and warndown = #{warndown}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
+            <if test="assortid != null ">and assortid = #{assortid}</if>
+            <if test="isAvailable != null">and isAvailable=#{isAvailable},</if>
+            <if test="suitDisease != null and suitDisease != ''">and suitDisease = #{suitDisease},</if>
+            <if test="suitWay != null and suitWay != ''">and suitWay = #{suitWay},</if>
+
         </where>
     </select>
-    
+
+    <select id="targetInfo" parameterType="com.smartor.domain.IvrLibaTarget" resultMap="IvrLibaTargetVOResult">
+        select a.targetID,
+        a.groupid,
+        a.targettype,
+        a.targetname,
+        a.targetdesc,
+        a.language,
+        a.version,
+        a.isenable,
+        a.isabnormal,
+        a.warnup,
+        a.warndown,
+        a.orgid,
+        a.pid,
+        a.guid,
+        a.assortid,
+        a.isAvailable,
+        a.suitDisease,
+        a.suitWay,
+        b.targetoptionid,
+        b.targettype,
+        b.categoryName,
+        b.targetvalue,
+        b.targetregex,
+        b.optiondesc
+        from ivr_liba_target a
+        LEFT JOIN ivr_liba_targetoption b
+        on a.targetID = b.targetid
+        <where>
+            a.del_flag != 1 and b.del_flag != 1
+            <if test="groupid != null  and groupid != ''">and a.groupid = #{groupid}</if>
+            <if test="targettype != null  and targettype != ''">and a.targettype = #{targettype}</if>
+            <if test="targetname != null  and targetname != ''">and a.targetname like concat('%', #{targetname}, '%')
+            </if>
+            <if test="targetdesc != null  and targetdesc != ''">and a.targetdesc = #{targetdesc}</if>
+            <if test="language != null  and language != ''">and a.language = #{language}</if>
+            <if test="version != null ">and a.version = #{version}</if>
+            <if test="isenable != null ">and a.isenable = #{isenable}</if>
+            <if test="isabnormal != null ">and a.isabnormal = #{isabnormal}</if>
+            <if test="warnup != null ">and a.warnup = #{warnup}</if>
+            <if test="warndown != null ">and a.warndown = #{warndown}</if>
+            <if test="isupload != null ">and a.isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and a.upload_time = #{uploadTime}</if>
+            <if test="orgid != null  and orgid != ''">and a.orgid = #{orgid}</if>
+            <if test="pid != null ">and a.pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and a.guid = #{guid}</if>
+            <if test="assortid != null ">and a.assortid = #{assortid}</if>
+            <if test="isAvailable != null">a.isAvailable=#{isAvailable},</if>
+            <if test="suitDisease != null and suitDisease != ''">a.suitDisease = #{suitDisease},</if>
+            <if test="suitWay != null and suitWay != ''">a.suitWay = #{suitWay},</if>
+        </where>
+        ORDER BY a.targetID
+    </select>
+
     <select id="selectIvrLibaTargetByTargetID" parameterType="Long" resultMap="IvrLibaTargetResult">
         <include refid="selectIvrLibaTargetVo"/>
         where targetID = #{targetID}
     </select>
-        
-    <insert id="insertIvrLibaTarget" parameterType="com.smartor.domain.IvrLibaTarget" useGeneratedKeys="true" keyProperty="targetID">
+
+    <insert id="insertIvrLibaTarget" parameterType="com.smartor.domain.IvrLibaTarget" useGeneratedKeys="true"
+            keyProperty="targetID">
         insert into ivr_liba_target
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="groupid != null">groupid,</if>
@@ -84,7 +205,10 @@
             <if test="pid != null">pid,</if>
             <if test="guid != null">guid,</if>
             <if test="assortid != null">assortid,</if>
-         </trim>
+            <if test="isAvailable != null">isAvailable,</if>
+            <if test="suitDisease != null and suitDisease != ''">suitDisease,</if>
+            <if test="suitWay != null and suitWay != ''">suitWay,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="groupid != null">#{groupid},</if>
             <if test="targettype != null and targettype != ''">#{targettype},</if>
@@ -107,7 +231,10 @@
             <if test="pid != null">#{pid},</if>
             <if test="guid != null">#{guid},</if>
             <if test="assortid != null">#{assortid},</if>
-         </trim>
+            <if test="isAvailable != null">#{isAvailable},</if>
+            <if test="suitDisease != null and suitDisease != ''">#{suitDisease},</if>
+            <if test="suitWay != null and suitWay != ''">#{suitWay},</if>
+        </trim>
     </insert>
 
     <update id="updateIvrLibaTarget" parameterType="com.smartor.domain.IvrLibaTarget">
@@ -134,16 +261,21 @@
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="assortid != null">assortid = #{assortid},</if>
+            <if test="suitDisease != null and suitDisease != ''">suitDisease = #{suitDisease},</if>
+            <if test="suitWay != null and suitWay != ''">suitWay = #{suitWay},</if>
+            <if test="isAvailable != null and isAvailable != ''">isAvailable = #{isAvailable},</if>
         </trim>
         where targetID = #{targetID}
     </update>
 
     <delete id="deleteIvrLibaTargetByTargetID" parameterType="Long">
-        delete from ivr_liba_target where targetID = #{targetID}
+        delete
+        from ivr_liba_target
+        where targetID = #{targetID}
     </delete>
 
     <delete id="deleteIvrLibaTargetByTargetIDs" parameterType="String">
-        delete from ivr_liba_target where targetID in 
+        delete from ivr_liba_target where targetID in
         <foreach item="targetID" collection="array" open="(" separator="," close=")">
             #{targetID}
         </foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
new file mode 100644
index 0000000..d275617
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
@@ -0,0 +1,140 @@
+<?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.IvrLibaTargetTagMapper">
+
+    <resultMap type="com.smartor.domain.IvrLibaTargetTag" id="IvrLibaTargetTagResult">
+        <result property="id" column="id"/>
+        <result property="tagcategoryid" column="tagcategoryid"/>
+        <result property="tagid" column="tagid"/>
+        <result property="orgid" column="orgid"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="targetid" column="targetid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
+    </resultMap>
+
+    <sql id="selectIvrLibaTargetTagVo">
+        select id,
+               tagcategoryid,
+               tagid,
+               orgid,
+               del_flag,
+               update_by,
+               update_time,
+               create_by,
+               create_time,
+               isupload,
+               upload_time,
+               targetid,
+               pid,
+               guid
+        from ivr_liba_target_tag
+    </sql>
+
+    <select id="selectIvrLibaTargetTagList" parameterType="com.smartor.domain.IvrLibaTargetTag"
+            resultMap="IvrLibaTargetTagResult">
+        <include refid="selectIvrLibaTargetTagVo"/>
+        <where>
+            <if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
+            <if test="tagid != null ">and tagid = #{tagid}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="targetid != null ">and targetid = #{targetid}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
+        </where>
+    </select>
+
+    <select id="selectIvrLibaTargetTagById" parameterType="Long" resultMap="IvrLibaTargetTagResult">
+        <include refid="selectIvrLibaTargetTagVo"/>
+        where id = #{id}
+    </select>
+
+
+    <select id="selectTagName" parameterType="Long" resultType="com.smartor.domain.BaseTag">
+        select b.tagname, b.tagcategoryid, a.id as tagid
+        from ivr_liba_target_tag a,
+             base_tag b
+        where a.tagid = b.tagid
+          and a.del_flag!=1 and b.del_flag!=1
+          and targetid = #{targetid}
+    </select>
+
+
+    <insert id="insertIvrLibaTargetTag" parameterType="com.smartor.domain.IvrLibaTargetTag" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into ivr_liba_target_tag
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tagcategoryid != null">tagcategoryid,</if>
+            <if test="tagid != null">tagid,</if>
+            <if test="orgid != null">orgid,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="isupload != null">isupload,</if>
+            <if test="uploadTime != null">upload_time,</if>
+            <if test="targetid != null">targetid,</if>
+            <if test="pid != null">pid,</if>
+            <if test="guid != null">guid,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tagcategoryid != null">#{tagcategoryid},</if>
+            <if test="tagid != null">#{tagid},</if>
+            <if test="orgid != null">#{orgid},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="isupload != null">#{isupload},</if>
+            <if test="uploadTime != null">#{uploadTime},</if>
+            <if test="targetid != null">#{targetid},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="guid != null">#{guid},</if>
+        </trim>
+    </insert>
+
+    <update id="updateIvrLibaTargetTag" parameterType="com.smartor.domain.IvrLibaTargetTag">
+        update ivr_liba_target_tag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tagcategoryid != null">tagcategoryid = #{tagcategoryid},</if>
+            <if test="tagid != null">tagid = #{tagid},</if>
+            <if test="orgid != null">orgid = #{orgid},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="isupload != null">isupload = #{isupload},</if>
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="targetid != null">targetid = #{targetid},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="guid != null">guid = #{guid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIvrLibaTargetTagById" parameterType="Long">
+        update ivr_liba_target_tag
+        set del_flag = 1
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteIvrLibaTargetTagByIds" parameterType="String">
+        delete from ivr_liba_target_tag where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
index f1f8267..e9e73fe 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
@@ -45,6 +45,7 @@
             resultMap="IvrLibaTargetoptionResult">
         <include refid="selectIvrLibaTargetoptionVo"/>
         <where>
+            del_flag != 1
             <if test="targetid != null ">and targetid = #{targetid}</if>
             <if test="targettype != null  and targettype != ''">and targettype = #{targettype}</if>
             <if test="categoryName != null  and categoryName != ''">and categoryName like concat('%', #{categoryName},
@@ -64,7 +65,9 @@
             <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
             <if test="pid != null ">and pid = #{pid}</if>
             <if test="guid != null  and guid != ''">and guid = #{guid}</if>
+
         </where>
+        order by guid asc
     </select>
 
     <select id="selectIvrLibaTargetoptionByTargetoptionid" parameterType="Long" resultMap="IvrLibaTargetoptionResult">
@@ -155,8 +158,8 @@
     </update>
 
     <delete id="deleteIvrLibaTargetoptionByTargetoptionid" parameterType="Long">
-        delete
-        from ivr_liba_targetoption
+        update ivr_liba_targetoption
+        set del_flag = 1
         where targetoptionid = #{targetoptionid}
     </delete>
 
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
index 809d63e..aa51b20 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
@@ -1,88 +1,101 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.IvrLibaTemplateMapper">
-    
-    <resultMap type="IvrLibaTemplate" id="IvrLibaTemplateResult">
-        <result property="templateID"    column="templateID"    />
-        <result property="templateName"    column="templateName"    />
-        <result property="silencetime"    column="silencetime"    />
-        <result property="slienceRepeatTimes"    column="slienceRepeatTimes"    />
-        <result property="nomatchRepeatTimes"    column="nomatchRepeatTimes"    />
-        <result property="firstQuestionNum"    column="firstQuestionNum"    />
-        <result property="submodule"    column="submodule"    />
-        <result property="language"    column="language"    />
-        <result property="note"    column="note"    />
-        <result property="isEnable"    column="isEnable"    />
-        <result property="isDel"    column="isDel"    />
-        <result property="addUserID"    column="addUserID"    />
-        <result property="addTime"    column="addTime"    />
-        <result property="modifyUserID"    column="modifyUserID"    />
-        <result property="modifyTime"    column="modifyTime"    />
-        <result property="groupID"    column="groupID"    />
-        <result property="labelInfo"    column="labelInfo"    />
-        <result property="submoduleID"    column="submoduleID"    />
-        <result property="playType"    column="playType"    />
-        <result property="icd10code"    column="icd10code"    />
-        <result property="icd10codename"    column="icd10codename"    />
-        <result property="atuoTaskDayOffset"    column="atuoTaskDayOffset"    />
-        <result property="DeptIds"    column="DeptIds"    />
-        <result property="DeptNames"    column="DeptNames"    />
-        <result property="fKsdm"    column="F_KSDM"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="isupload"    column="isupload"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="orgid"    column="orgid"    />
+
+    <resultMap type="com.smartor.domain.IvrLibaTemplate" id="IvrLibaTemplateResult">
+        <result property="templateID" column="templateID"/>
+        <result property="templateName" column="templateName"/>
+        <result property="silencetime" column="silencetime"/>
+        <result property="slienceRepeatTimes" column="slienceRepeatTimes"/>
+        <result property="nomatchRepeatTimes" column="nomatchRepeatTimes"/>
+        <result property="firstQuestionNum" column="firstQuestionNum"/>
+        <result property="submodule" column="submodule"/>
+        <result property="language" column="language"/>
+        <result property="note" column="note"/>
+        <result property="isEnable" column="isEnable"/>
+        <result property="addUserID" column="addUserID"/>
+        <result property="addTime" column="addTime"/>
+        <result property="modifyUserID" column="modifyUserID"/>
+        <result property="modifyTime" column="modifyTime"/>
+        <result property="groupID" column="groupID"/>
+        <result property="labelInfo" column="labelInfo"/>
+        <result property="submoduleID" column="submoduleID"/>
+        <result property="playType" column="playType"/>
+        <result property="icd10code" column="icd10code"/>
+        <result property="icd10codename" column="icd10codename"/>
+        <result property="atuoTaskDayOffset" column="atuoTaskDayOffset"/>
+        <result property="deptIds" column="DeptIds"/>
+        <result property="deptNames" column="DeptNames"/>
+        <result property="fKsdm" column="F_KSDM"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="assortid" column="assortid"/>
     </resultMap>
 
     <sql id="selectIvrLibaTemplateVo">
-        select templateID, templateName, silencetime, slienceRepeatTimes, nomatchRepeatTimes, firstQuestionNum, submodule, language, note, isEnable, isDel, addUserID, addTime, modifyUserID, modifyTime, groupID, labelInfo, submoduleID, playType, icd10code, icd10codename, atuoTaskDayOffset, DeptIds, DeptNames, F_KSDM, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_template
+        select templateID,
+               templateName,
+               silencetime,
+               slienceRepeatTimes,
+               nomatchRepeatTimes,
+               firstQuestionNum,
+               submodule, language, note, isEnable, addUserID, addTime, modifyUserID, modifyTime, groupID, labelInfo, submoduleID, playType, icd10code, icd10codename, atuoTaskDayOffset, DeptIds, DeptNames, F_KSDM, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid
+        from ivr_liba_template
     </sql>
 
-    <select id="selectIvrLibaTemplateList" parameterType="IvrLibaTemplate" resultMap="IvrLibaTemplateResult">
+    <select id="selectIvrLibaTemplateList" parameterType="com.smartor.domain.IvrLibaTemplate"
+            resultMap="IvrLibaTemplateResult">
         <include refid="selectIvrLibaTemplateVo"/>
-        <where>  
-            <if test="templateName != null  and templateName != ''"> and templateName like concat('%', #{templateName}, '%')</if>
-            <if test="silencetime != null "> and silencetime = #{silencetime}</if>
-            <if test="slienceRepeatTimes != null "> and slienceRepeatTimes = #{slienceRepeatTimes}</if>
-            <if test="nomatchRepeatTimes != null "> and nomatchRepeatTimes = #{nomatchRepeatTimes}</if>
-            <if test="firstQuestionNum != null "> and firstQuestionNum = #{firstQuestionNum}</if>
-            <if test="submodule != null  and submodule != ''"> and submodule = #{submodule}</if>
-            <if test="language != null  and language != ''"> and language = #{language}</if>
-            <if test="note != null  and note != ''"> and note = #{note}</if>
-            <if test="isEnable != null "> and isEnable = #{isEnable}</if>
-            <if test="isDel != null "> and isDel = #{isDel}</if>
-            <if test="addUserID != null  and addUserID != ''"> and addUserID = #{addUserID}</if>
-            <if test="addTime != null "> and addTime = #{addTime}</if>
-            <if test="modifyUserID != null  and modifyUserID != ''"> and modifyUserID = #{modifyUserID}</if>
-            <if test="modifyTime != null "> and modifyTime = #{modifyTime}</if>
-            <if test="groupID != null  and groupID != ''"> and groupID = #{groupID}</if>
-            <if test="labelInfo != null  and labelInfo != ''"> and labelInfo = #{labelInfo}</if>
-            <if test="submoduleID != null  and submoduleID != ''"> and submoduleID = #{submoduleID}</if>
-            <if test="playType != null "> and playType = #{playType}</if>
-            <if test="icd10code != null  and icd10code != ''"> and icd10code = #{icd10code}</if>
-            <if test="icd10codename != null  and icd10codename != ''"> and icd10codename like concat('%', #{icd10codename}, '%')</if>
-            <if test="atuoTaskDayOffset != null "> and atuoTaskDayOffset = #{atuoTaskDayOffset}</if>
-            <if test="DeptIds != null  and DeptIds != ''"> and DeptIds = #{DeptIds}</if>
-            <if test="DeptNames != null  and DeptNames != ''"> and DeptNames = #{DeptNames}</if>
-            <if test="fKsdm != null  and fKsdm != ''"> and F_KSDM = #{fKsdm}</if>
-            <if test="isupload != null "> and isupload = #{isupload}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
+        <where>
+            <if test="templateName != null  and templateName != ''">and templateName like concat('%', #{templateName},
+                '%')
+            </if>
+            <if test="silencetime != null ">and silencetime = #{silencetime}</if>
+            <if test="slienceRepeatTimes != null ">and slienceRepeatTimes = #{slienceRepeatTimes}</if>
+            <if test="nomatchRepeatTimes != null ">and nomatchRepeatTimes = #{nomatchRepeatTimes}</if>
+            <if test="firstQuestionNum != null ">and firstQuestionNum = #{firstQuestionNum}</if>
+            <if test="submodule != null  and submodule != ''">and submodule = #{submodule}</if>
+            <if test="language != null  and language != ''">and language = #{language}</if>
+            <if test="note != null  and note != ''">and note = #{note}</if>
+            <if test="isEnable != null ">and isEnable = #{isEnable}</if>
+            <if test="isDel != null ">and isDel = #{isDel}</if>
+            <if test="addUserID != null  and addUserID != ''">and addUserID = #{addUserID}</if>
+            <if test="addTime != null ">and addTime = #{addTime}</if>
+            <if test="modifyUserID != null  and modifyUserID != ''">and modifyUserID = #{modifyUserID}</if>
+            <if test="modifyTime != null ">and modifyTime = #{modifyTime}</if>
+            <if test="groupID != null  and groupID != ''">and groupID = #{groupID}</if>
+            <if test="labelInfo != null  and labelInfo != ''">and labelInfo = #{labelInfo}</if>
+            <if test="submoduleID != null  and submoduleID != ''">and submoduleID = #{submoduleID}</if>
+            <if test="playType != null ">and playType = #{playType}</if>
+            <if test="icd10code != null  and icd10code != ''">and icd10code = #{icd10code}</if>
+            <if test="icd10codename != null  and icd10codename != ''">and icd10codename like concat('%',
+                #{icd10codename}, '%')
+            </if>
+            <if test="atuoTaskDayOffset != null ">and atuoTaskDayOffset = #{atuoTaskDayOffset}</if>
+            <if test="DeptIds != null  and DeptIds != ''">and DeptIds = #{DeptIds}</if>
+            <if test="DeptNames != null  and DeptNames != ''">and DeptNames = #{DeptNames}</if>
+            <if test="fKsdm != null  and fKsdm != ''">and F_KSDM = #{fKsdm}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="assortid != null">and assortid = #{assortid}</if>
         </where>
     </select>
-    
+
     <select id="selectIvrLibaTemplateByTemplateID" parameterType="String" resultMap="IvrLibaTemplateResult">
         <include refid="selectIvrLibaTemplateVo"/>
         where templateID = #{templateID}
     </select>
-        
-    <insert id="insertIvrLibaTemplate" parameterType="IvrLibaTemplate">
+
+    <insert id="insertIvrLibaTemplate" parameterType="com.smartor.domain.IvrLibaTemplate">
         insert into ivr_liba_template
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="templateID != null">templateID,</if>
@@ -95,7 +108,6 @@
             <if test="language != null and language != ''">language,</if>
             <if test="note != null">note,</if>
             <if test="isEnable != null">isEnable,</if>
-            <if test="isDel != null">isDel,</if>
             <if test="addUserID != null">addUserID,</if>
             <if test="addTime != null">addTime,</if>
             <if test="modifyUserID != null">modifyUserID,</if>
@@ -118,7 +130,8 @@
             <if test="isupload != null">isupload,</if>
             <if test="uploadTime != null">upload_time,</if>
             <if test="orgid != null">orgid,</if>
-         </trim>
+            <if test="assortid != null">assortid,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="templateID != null">#{templateID},</if>
             <if test="templateName != null and templateName != ''">#{templateName},</if>
@@ -130,7 +143,6 @@
             <if test="language != null and language != ''">#{language},</if>
             <if test="note != null">#{note},</if>
             <if test="isEnable != null">#{isEnable},</if>
-            <if test="isDel != null">#{isDel},</if>
             <if test="addUserID != null">#{addUserID},</if>
             <if test="addTime != null">#{addTime},</if>
             <if test="modifyUserID != null">#{modifyUserID},</if>
@@ -153,10 +165,11 @@
             <if test="isupload != null">#{isupload},</if>
             <if test="uploadTime != null">#{uploadTime},</if>
             <if test="orgid != null">#{orgid},</if>
-         </trim>
+            <if test="assortid != null">#{assortid},</if>
+        </trim>
     </insert>
 
-    <update id="updateIvrLibaTemplate" parameterType="IvrLibaTemplate">
+    <update id="updateIvrLibaTemplate" parameterType="com.smartor.domain.IvrLibaTemplate">
         update ivr_liba_template
         <trim prefix="SET" suffixOverrides=",">
             <if test="templateName != null and templateName != ''">templateName = #{templateName},</if>
@@ -168,7 +181,6 @@
             <if test="language != null and language != ''">language = #{language},</if>
             <if test="note != null">note = #{note},</if>
             <if test="isEnable != null">isEnable = #{isEnable},</if>
-            <if test="isDel != null">isDel = #{isDel},</if>
             <if test="addUserID != null">addUserID = #{addUserID},</if>
             <if test="addTime != null">addTime = #{addTime},</if>
             <if test="modifyUserID != null">modifyUserID = #{modifyUserID},</if>
@@ -191,16 +203,19 @@
             <if test="isupload != null">isupload = #{isupload},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
             <if test="orgid != null">orgid = #{orgid},</if>
+            <if test="assortid != null">orgid = #{assortid},</if>
         </trim>
         where templateID = #{templateID}
     </update>
 
     <delete id="deleteIvrLibaTemplateByTemplateID" parameterType="String">
-        delete from ivr_liba_template where templateID = #{templateID}
+        delete
+        from ivr_liba_template
+        where templateID = #{templateID}
     </delete>
 
     <delete id="deleteIvrLibaTemplateByTemplateIDs" parameterType="String">
-        delete from ivr_liba_template where templateID in 
+        delete from ivr_liba_template where templateID in
         <foreach item="templateID" collection="array" open="(" separator="," close=")">
             #{templateID}
         </foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatescriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatescriptMapper.xml
index 2b24f8e..958558b 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatescriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatescriptMapper.xml
@@ -4,7 +4,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.IvrLibaTemplatescriptMapper">
     
-    <resultMap type="IvrLibaTemplatescript" id="IvrLibaTemplatescriptResult">
+    <resultMap type="com.smartor.domain.IvrLibaTemplatescript" id="IvrLibaTemplatescriptResult">
         <result property="templateQuestionID"    column="templateQuestionID"    />
         <result property="templateQuestionNum"    column="templateQuestionNum"    />
         <result property="templateID"    column="templateID"    />
@@ -34,13 +34,14 @@
         <result property="isupload"    column="isupload"    />
         <result property="uploadTime"    column="upload_time"    />
         <result property="orgid"    column="orgid"    />
+        <result property="templateTargetID"    column="templateTargetID"    />
     </resultMap>
 
     <sql id="selectIvrLibaTemplatescriptVo">
-        select templateQuestionID, templateQuestionNum, templateID, questionID, questionPoint, questionText, questionVoice, noMatchText, noMatchVoice, slienceText, slienceVoice, submoduleText, submoduleVoice, noClearlyText, noClearlyVoice, categoryName, targetOptions, language, playWavOnly, isEnable, isDel, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_templatescript
+        select templateQuestionID, templateQuestionNum, templateID, templateTargetID,questionID, questionPoint, questionText, questionVoice, noMatchText, noMatchVoice, slienceText, slienceVoice, submoduleText, submoduleVoice, noClearlyText, noClearlyVoice, categoryName, targetOptions, language, playWavOnly, isEnable, isDel, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_templatescript
     </sql>
 
-    <select id="selectIvrLibaTemplatescriptList" parameterType="IvrLibaTemplatescript" resultMap="IvrLibaTemplatescriptResult">
+    <select id="selectIvrLibaTemplatescriptList" parameterType="com.smartor.domain.IvrLibaTemplatescript" resultMap="IvrLibaTemplatescriptResult">
         <include refid="selectIvrLibaTemplatescriptVo"/>
         <where>  
             <if test="templateQuestionNum != null "> and templateQuestionNum = #{templateQuestionNum}</if>
@@ -66,6 +67,7 @@
             <if test="isupload != null "> and isupload = #{isupload}</if>
             <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
             <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
+            <if test="templateTargetID != null  and templateTargetID != ''"> and templateTargetID = #{templateTargetID}</if>
         </where>
     </select>
     
@@ -74,12 +76,13 @@
         where templateQuestionID = #{templateQuestionID}
     </select>
         
-    <insert id="insertIvrLibaTemplatescript" parameterType="IvrLibaTemplatescript">
+    <insert id="insertIvrLibaTemplatescript" parameterType="com.smartor.domain.IvrLibaTemplatescript">
         insert into ivr_liba_templatescript
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="templateQuestionID != null">templateQuestionID,</if>
             <if test="templateQuestionNum != null">templateQuestionNum,</if>
             <if test="templateID != null and templateID != ''">templateID,</if>
+            <if test="templateTargetID != null and templateTargetID != ''">templateTargetID,</if>
             <if test="questionID != null and questionID != ''">questionID,</if>
             <if test="questionPoint != null and questionPoint != ''">questionPoint,</if>
             <if test="questionText != null">questionText,</if>
@@ -111,6 +114,8 @@
             <if test="templateQuestionID != null">#{templateQuestionID},</if>
             <if test="templateQuestionNum != null">#{templateQuestionNum},</if>
             <if test="templateID != null and templateID != ''">#{templateID},</if>
+            <if test="templateTargetID != null and templateTargetID != ''">#{templateTargetID},</if>
+            <if test="templateTargetID != null and templateTargetID != ''">#{templateTargetID},</if>
             <if test="questionID != null and questionID != ''">#{questionID},</if>
             <if test="questionPoint != null and questionPoint != ''">#{questionPoint},</if>
             <if test="questionText != null">#{questionText},</if>
@@ -140,11 +145,12 @@
          </trim>
     </insert>
 
-    <update id="updateIvrLibaTemplatescript" parameterType="IvrLibaTemplatescript">
+    <update id="updateIvrLibaTemplatescript" parameterType="com.smartor.domain.IvrLibaTemplatescript">
         update ivr_liba_templatescript
         <trim prefix="SET" suffixOverrides=",">
             <if test="templateQuestionNum != null">templateQuestionNum = #{templateQuestionNum},</if>
             <if test="templateID != null and templateID != ''">templateID = #{templateID},</if>
+            <if test="templateTargetID != null and templateTargetID != ''">templateTargetID = #{templateTargetID},</if>
             <if test="questionID != null and questionID != ''">questionID = #{questionID},</if>
             <if test="questionPoint != null and questionPoint != ''">questionPoint = #{questionPoint},</if>
             <if test="questionText != null">questionText = #{questionText},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetAssortMapper.xml
new file mode 100644
index 0000000..76be772
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetAssortMapper.xml
@@ -0,0 +1,82 @@
+<?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.IvrLibaTemplatetargetAssortMapper">
+
+    <resultMap type="com.smartor.domain.IvrLibaTemplatetargetAssort" id="IvrLibaTemplatetargetAssortResult">
+        <result property="id" column="id"/>
+        <result property="indexAssortName" column="index_assort_name"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="pid" column="pid"/>
+    </resultMap>
+
+    <sql id="selectIvrLibaTemplatetargetAssortVo">
+        select id, index_assort_name, del_flag, create_time, update_time, pid
+        from ivr_liba_templatetarget_assort
+    </sql>
+
+    <select id="selectIvrLibaTemplatetargetAssortList" parameterType="com.smartor.domain.IvrLibaTemplatetargetAssort"
+            resultMap="IvrLibaTemplatetargetAssortResult">
+        <include refid="selectIvrLibaTemplatetargetAssortVo"/>
+        <where>
+            <if test="indexAssortName != null  and indexAssortName != ''">and index_assort_name like concat('%',
+                #{indexAssortName}, '%')
+            </if>
+            <if test="pid != null ">and pid = #{pid}</if>
+        </where>
+    </select>
+
+    <select id="selectIvrLibaTemplatetargetAssortById" parameterType="Long"
+            resultMap="IvrLibaTemplatetargetAssortResult">
+        <include refid="selectIvrLibaTemplatetargetAssortVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertIvrLibaTemplatetargetAssort" parameterType="com.smartor.domain.IvrLibaTemplatetargetAssort">
+        insert into ivr_liba_templatetarget_assort
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="indexAssortName != null and indexAssortName != ''">index_assort_name,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="pid != null">pid,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="indexAssortName != null and indexAssortName != ''">#{indexAssortName},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="pid != null">#{pid},</if>
+        </trim>
+    </insert>
+
+    <update id="updateIvrLibaTemplatetargetAssort" parameterType="com.smartor.domain.IvrLibaTemplatetargetAssort">
+        update ivr_liba_templatetarget_assort
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="indexAssortName != null and indexAssortName != ''">index_assort_name = #{indexAssortName},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="pid != null">pid = #{pid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIvrLibaTemplatetargetAssortById" parameterType="Long">
+        delete
+        from ivr_liba_templatetarget_assort
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteIvrLibaTemplatetargetAssortByIds" parameterType="String">
+        delete from ivr_liba_templatetarget_assort where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetMapper.xml
index 3b805ad..20b8ad2 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplatetargetMapper.xml
@@ -1,82 +1,109 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.IvrLibaTemplatetargetMapper">
-    
-    <resultMap type="IvrLibaTemplatetarget" id="IvrLibaTemplatetargetResult">
-        <result property="templateTargetID"    column="templateTargetID"    />
-        <result property="templateQuestionID"    column="templateQuestionID"    />
-        <result property="templateQuestionNum"    column="templateQuestionNum"    />
-        <result property="nextQuestionNum"    column="nextQuestionNum"    />
-        <result property="templateID"    column="templateID"    />
-        <result property="switchID"    column="switchID"    />
-        <result property="switchDescription"    column="switchDescription"    />
-        <result property="switchText"    column="switchText"    />
-        <result property="switchWav"    column="switchWav"    />
-        <result property="switchTempWav"    column="switchTempWav"    />
-        <result property="targetType"    column="targetType"    />
-        <result property="categoryName"    column="categoryName"    />
-        <result property="targetValue"    column="targetValue"    />
-        <result property="targetID"    column="targetID"    />
-        <result property="questionTargetID"    column="questionTargetID"    />
-        <result property="basicRegex"    column="basicRegex"    />
-        <result property="selfRegex"    column="selfRegex"    />
-        <result property="regexUsedType"    column="regexUsedType"    />
-        <result property="language"    column="language"    />
-        <result property="isEnable"    column="isEnable"    />
-        <result property="isDel"    column="isDel"    />
-        <result property="playType"    column="playType"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="isupload"    column="isupload"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="orgid"    column="orgid"    />
+
+    <resultMap type="com.smartor.domain.IvrLibaTemplatetarget" id="IvrLibaTemplatetargetResult">
+        <result property="templateTargetID" column="templateTargetID"/>
+        <result property="templateQuestionID" column="templateQuestionID"/>
+        <result property="templateQuestionNum" column="templateQuestionNum"/>
+        <result property="nextQuestionNum" column="nextQuestionNum"/>
+        <result property="templateID" column="templateID"/>
+        <result property="switchID" column="switchID"/>
+        <result property="switchDescription" column="switchDescription"/>
+        <result property="switchText" column="switchText"/>
+        <result property="switchWav" column="switchWav"/>
+        <result property="switchTempWav" column="switchTempWav"/>
+        <result property="targetType" column="targetType"/>
+        <result property="categoryName" column="categoryName"/>
+        <result property="targetValue" column="targetValue"/>
+        <result property="targetID" column="targetID"/>
+        <result property="questionTargetID" column="questionTargetID"/>
+        <result property="basicRegex" column="basicRegex"/>
+        <result property="selfRegex" column="selfRegex"/>
+        <result property="regexUsedType" column="regexUsedType"/>
+        <result property="language" column="language"/>
+        <result property="isEnable" column="isEnable"/>
+        <result property="isDel" column="isDel"/>
+        <result property="playType" column="playType"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
     </resultMap>
 
     <sql id="selectIvrLibaTemplatetargetVo">
-        select templateTargetID, templateQuestionID, templateQuestionNum, nextQuestionNum, templateID, switchID, switchDescription, switchText, switchWav, switchTempWav, targetType, categoryName, targetValue, targetID, questionTargetID, basicRegex, selfRegex, regexUsedType, language, isEnable, isDel, playType, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_liba_templatetarget
+        select templateTargetID,
+               templateQuestionID,
+               templateQuestionNum,
+               nextQuestionNum,
+               templateID,
+               switchID,
+               switchDescription,
+               switchText,
+               switchWav,
+               switchTempWav,
+               targetType,
+               categoryName,
+               targetValue,
+               targetID,
+               questionTargetID,
+               basicRegex,
+               selfRegex,
+               regexUsedType, language, isEnable, isDel, playType, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid
+        from ivr_liba_templatetarget
     </sql>
 
-    <select id="selectIvrLibaTemplatetargetList" parameterType="IvrLibaTemplatetarget" resultMap="IvrLibaTemplatetargetResult">
+    <select id="selectIvrLibaTemplatetargetList" parameterType="com.smartor.domain.IvrLibaTemplatetarget"
+            resultMap="IvrLibaTemplatetargetResult">
         <include refid="selectIvrLibaTemplatetargetVo"/>
-        <where>  
-            <if test="templateQuestionID != null  and templateQuestionID != ''"> and templateQuestionID = #{templateQuestionID}</if>
-            <if test="templateQuestionNum != null "> and templateQuestionNum = #{templateQuestionNum}</if>
-            <if test="nextQuestionNum != null "> and nextQuestionNum = #{nextQuestionNum}</if>
-            <if test="templateID != null  and templateID != ''"> and templateID = #{templateID}</if>
-            <if test="switchID != null "> and switchID = #{switchID}</if>
-            <if test="switchDescription != null  and switchDescription != ''"> and switchDescription = #{switchDescription}</if>
-            <if test="switchText != null  and switchText != ''"> and switchText = #{switchText}</if>
-            <if test="switchWav != null  and switchWav != ''"> and switchWav = #{switchWav}</if>
-            <if test="switchTempWav != null  and switchTempWav != ''"> and switchTempWav = #{switchTempWav}</if>
-            <if test="targetType != null  and targetType != ''"> and targetType = #{targetType}</if>
-            <if test="categoryName != null  and categoryName != ''"> and categoryName like concat('%', #{categoryName}, '%')</if>
-            <if test="targetValue != null  and targetValue != ''"> and targetValue = #{targetValue}</if>
-            <if test="targetID != null  and targetID != ''"> and targetID = #{targetID}</if>
-            <if test="questionTargetID != null  and questionTargetID != ''"> and questionTargetID = #{questionTargetID}</if>
-            <if test="basicRegex != null  and basicRegex != ''"> and basicRegex = #{basicRegex}</if>
-            <if test="selfRegex != null  and selfRegex != ''"> and selfRegex = #{selfRegex}</if>
-            <if test="regexUsedType != null  and regexUsedType != ''"> and regexUsedType = #{regexUsedType}</if>
-            <if test="language != null  and language != ''"> and language = #{language}</if>
-            <if test="isEnable != null "> and isEnable = #{isEnable}</if>
-            <if test="isDel != null "> and isDel = #{isDel}</if>
-            <if test="playType != null "> and playType = #{playType}</if>
-            <if test="isupload != null "> and isupload = #{isupload}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
+        <where>
+            <if test="templateQuestionID != null  and templateQuestionID != ''">and templateQuestionID =
+                #{templateQuestionID}
+            </if>
+            <if test="templateQuestionNum != null ">and templateQuestionNum = #{templateQuestionNum}</if>
+            <if test="nextQuestionNum != null ">and nextQuestionNum = #{nextQuestionNum}</if>
+            <if test="templateID != null  and templateID != ''">and templateID = #{templateID}</if>
+            <if test="switchID != null ">and switchID = #{switchID}</if>
+            <if test="switchDescription != null  and switchDescription != ''">and switchDescription =
+                #{switchDescription}
+            </if>
+            <if test="switchText != null  and switchText != ''">and switchText = #{switchText}</if>
+            <if test="switchWav != null  and switchWav != ''">and switchWav = #{switchWav}</if>
+            <if test="switchTempWav != null  and switchTempWav != ''">and switchTempWav = #{switchTempWav}</if>
+            <if test="targetType != null  and targetType != ''">and targetType = #{targetType}</if>
+            <if test="categoryName != null  and categoryName != ''">and categoryName like concat('%', #{categoryName},
+                '%')
+            </if>
+            <if test="targetValue != null  and targetValue != ''">and targetValue = #{targetValue}</if>
+            <if test="targetID != null  and targetID != ''">and targetID = #{targetID}</if>
+            <if test="questionTargetID != null  and questionTargetID != ''">and questionTargetID = #{questionTargetID}
+            </if>
+            <if test="basicRegex != null  and basicRegex != ''">and basicRegex = #{basicRegex}</if>
+            <if test="selfRegex != null  and selfRegex != ''">and selfRegex = #{selfRegex}</if>
+            <if test="regexUsedType != null  and regexUsedType != ''">and regexUsedType = #{regexUsedType}</if>
+            <if test="language != null  and language != ''">and language = #{language}</if>
+            <if test="isEnable != null ">and isEnable = #{isEnable}</if>
+            <if test="isDel != null ">and isDel = #{isDel}</if>
+            <if test="playType != null ">and playType = #{playType}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
         </where>
     </select>
-    
-    <select id="selectIvrLibaTemplatetargetByTemplateTargetID" parameterType="String" resultMap="IvrLibaTemplatetargetResult">
+
+    <select id="selectIvrLibaTemplatetargetByTemplateTargetID" parameterType="String"
+            resultMap="IvrLibaTemplatetargetResult">
         <include refid="selectIvrLibaTemplatetargetVo"/>
         where templateTargetID = #{templateTargetID}
     </select>
-        
-    <insert id="insertIvrLibaTemplatetarget" parameterType="IvrLibaTemplatetarget">
+
+    <insert id="insertIvrLibaTemplatetarget" parameterType="com.smartor.domain.IvrLibaTemplatetarget">
         insert into ivr_liba_templatetarget
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="templateTargetID != null">templateTargetID,</if>
@@ -109,7 +136,7 @@
             <if test="isupload != null">isupload,</if>
             <if test="uploadTime != null">upload_time,</if>
             <if test="orgid != null">orgid,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="templateTargetID != null">#{templateTargetID},</if>
             <if test="templateQuestionID != null and templateQuestionID != ''">#{templateQuestionID},</if>
@@ -141,13 +168,15 @@
             <if test="isupload != null">#{isupload},</if>
             <if test="uploadTime != null">#{uploadTime},</if>
             <if test="orgid != null">#{orgid},</if>
-         </trim>
+        </trim>
     </insert>
 
-    <update id="updateIvrLibaTemplatetarget" parameterType="IvrLibaTemplatetarget">
+    <update id="updateIvrLibaTemplatetarget" parameterType="com.smartor.domain.IvrLibaTemplatetarget">
         update ivr_liba_templatetarget
         <trim prefix="SET" suffixOverrides=",">
-            <if test="templateQuestionID != null and templateQuestionID != ''">templateQuestionID = #{templateQuestionID},</if>
+            <if test="templateQuestionID != null and templateQuestionID != ''">templateQuestionID =
+                #{templateQuestionID},
+            </if>
             <if test="templateQuestionNum != null">templateQuestionNum = #{templateQuestionNum},</if>
             <if test="nextQuestionNum != null">nextQuestionNum = #{nextQuestionNum},</if>
             <if test="templateID != null and templateID != ''">templateID = #{templateID},</if>
@@ -181,11 +210,13 @@
     </update>
 
     <delete id="deleteIvrLibaTemplatetargetByTemplateTargetID" parameterType="String">
-        delete from ivr_liba_templatetarget where templateTargetID = #{templateTargetID}
+        delete
+        from ivr_liba_templatetarget
+        where templateTargetID = #{templateTargetID}
     </delete>
 
     <delete id="deleteIvrLibaTemplatetargetByTemplateTargetIDs" parameterType="String">
-        delete from ivr_liba_templatetarget where templateTargetID in 
+        delete from ivr_liba_templatetarget where templateTargetID in
         <foreach item="templateTargetID" collection="array" open="(" separator="," close=")">
             #{templateTargetID}
         </foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index e423628..60a78b3 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -216,6 +216,7 @@
 
         select
         c.tagname as tag,
+        b.tagid as tagid,
         a.patid,
         a.name,
         a.sex,
@@ -266,6 +267,7 @@
 
         select
         c.tagname as tag,
+        b.tagid as tagid,
         a.patid,
         a.name,
         a.sex,
@@ -333,6 +335,7 @@
 
         select
         c.tagname as tag,
+        b.tagid as tagid,
         a.patid,
         a.name,
         a.sex,
@@ -397,6 +400,7 @@
 
         select
         c.tagname as tag,
+        b.tagid as tagid,
         a.patid,
         a.name,
         a.sex,
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
index 94f2bee..840cd9e 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
@@ -32,6 +32,7 @@
                create_time,
                isupload,
                upload_time,
+               tagname,
                patid
         from pat_archivetag
     </sql>
@@ -74,6 +75,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="tagcategoryid != null">tagcategoryid,</if>
             <if test="tagid != null">tagid,</if>
+            <if test="tagname != null">tagname,</if>
             <if test="orgid != null">orgid,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="updateBy != null">update_by,</if>
@@ -87,6 +89,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tagcategoryid != null">#{tagcategoryid},</if>
             <if test="tagid != null">#{tagid},</if>
+            <if test="tagname != null">#{tagname},</if>
             <if test="orgid != null">#{orgid},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -104,6 +107,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="tagcategoryid != null">tagcategoryid = #{tagcategoryid},</if>
             <if test="tagid != null">tagid = #{tagid},</if>
+            <if test="tagname != null">tagname = #{tagname},</if>
             <if test="orgid != null">orgid = #{orgid},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -117,10 +121,15 @@
         where id = #{id}
     </update>
 
-    <delete id="deletePatArchivetagById" parameterType="Long">
-        delete
-        from pat_archivetag
-        where id = #{id}
+    <delete id="deletePatArchivetagById" parameterType="com.smartor.domain.PatArchivetag">
+        update pat_archivetag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        <where>
+            <if test="tagid != null">and tagid = #{tagid}</if>
+            <if test="patid != null">and patid = #{patid}</if>
+        </where>
     </delete>
 
     <delete id="deletePatArchivetagByIds" parameterType="String">

--
Gitblit v1.9.3