From afb277a81e060c6275f11e9f9f102b5dcfd80a72 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 27 六月 2024 09:46:05 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/Icd10Association.java | 103 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java | 32
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 89 +-
smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml | 17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java | 98 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java | 34
smartor/src/main/java/com/smartor/domain/SvyTaskVO.java | 32 +
smartor/src/main/java/com/smartor/service/IIcd10AssociationService.java | 63 ++
smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java | 8
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateTargetoption.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 26
smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java | 4
smartor/src/main/java/com/smartor/domain/SvyTask.java | 27
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml | 14
smartor/src/main/java/com/smartor/domain/SvyTaskSingle.java | 4
smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java | 8
smartor/src/main/java/com/smartor/mapper/Icd10AssociationMapper.java | 38
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java | 14
smartor/src/main/java/com/smartor/domain/SvyTaskSingleVO.java | 452 +++++++++++++++
smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml | 48 +
/dev/null | 138 ----
smartor/src/main/java/com/smartor/service/impl/Icd10AssociationServiceImpl.java | 97 +++
smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml | 147 +++-
smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 2
smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java | 18
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 99 ++
smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml | 18
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java | 36
smartor/src/main/java/com/smartor/service/ISvyTaskSingleService.java | 7
31 files changed, 1,275 insertions(+), 410 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 28b5edb..b9295e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -284,12 +284,12 @@
String patid = rsaPublicKeyExample.encryptedData(svyTaskSingle1.getPatid().toString(), pub_key);
SendMagParam sendMagParam = new SendMagParam();
sendMagParam.setType("5");
- sendMagParam.setUrl(req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + svyTask.getTaskname());
- log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + svyTask.getTaskname());
+ sendMagParam.setUrl(req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + svyTask.getTaskName());
+ log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + svyTask.getTaskName());
//杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
Map map = new HashMap();
- map.put("first", svyTask.getTaskname());
+ map.put("first", svyTask.getTaskName());
sendMagParam.setContent(JSON.toJSONString(map));
sendService.sendMsg(sendMagParam);
}
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/Icd10AssociationController.java
similarity index 64%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaOutIcd10Controller.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java
index ba2f949..229caa0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaOutIcd10Controller.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10AssociationController.java
@@ -7,8 +7,8 @@
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 com.smartor.domain.Icd10Association;
+import com.smartor.service.IIcd10AssociationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +27,9 @@
@Api(description = "鎸囨爣鐤剧梾")
@RestController
@RequestMapping("/smartor/outicd10")
-public class IvrLibaOutIcd10Controller extends BaseController {
+public class Icd10AssociationController extends BaseController {
@Autowired
- private IIvrLibaOutIcd10Service ivrLibaOutIcd10Service;
+ private IIcd10AssociationService iIcd10AssociationService;
/**
* 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
@@ -37,9 +37,9 @@
@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);
+ public TableDataInfo list(@RequestBody Icd10Association icd10Association) {
+ PageUtils.startPageByPost(icd10Association.getPageNum(), icd10Association.getPageSize());
+ List<Icd10Association> list = iIcd10AssociationService.selectIcd10AssociationList(icd10Association);
return getDataTable(list);
}
@@ -50,9 +50,9 @@
@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);
+ public void export(HttpServletResponse response, Icd10Association Icd10Association) {
+ List<Icd10Association> list = iIcd10AssociationService.selectIcd10AssociationList(Icd10Association);
+ ExcelUtil<Icd10Association> util = new ExcelUtil<Icd10Association>(Icd10Association.class);
util.exportExcel(response, list, "鎸囨爣鐤剧梾鏁版嵁");
}
@@ -63,7 +63,7 @@
@PreAuthorize("@ss.hasPermi('system:icd10:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(ivrLibaOutIcd10Service.selectIvrLibaTargetIcd10ById(id));
+ return success(iIcd10AssociationService.selectIcd10AssociationById(id));
}
/**
@@ -73,8 +73,8 @@
@PreAuthorize("@ss.hasPermi('system:icd10:add')")
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public AjaxResult add(@RequestBody IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
- return toAjax(ivrLibaOutIcd10Service.insertIvrLibaTargetIcd10(ivrLibaTargetIcd10));
+ public AjaxResult add(@RequestBody Icd10Association Icd10Association) {
+ return toAjax(iIcd10AssociationService.insertIcd10Association(Icd10Association));
}
/**
@@ -84,8 +84,8 @@
@PreAuthorize("@ss.hasPermi('system:icd10:edit')")
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
- return toAjax(ivrLibaOutIcd10Service.updateIvrLibaTargetIcd10(ivrLibaTargetIcd10));
+ public AjaxResult edit(@RequestBody Icd10Association Icd10Association) {
+ return toAjax(iIcd10AssociationService.updateIcd10Association(Icd10Association));
}
/**
@@ -96,6 +96,6 @@
@Log(title = "鎸囨爣鐤剧梾", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(ivrLibaOutIcd10Service.deleteIvrLibaTargetIcd10ByIds(ids));
+ return toAjax(iIcd10AssociationService.deleteIcd10AssociationByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
index cab5eea..43b92ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
@@ -28,7 +28,7 @@
*/
@Api(description = "闂嵎妯℃澘")
@RestController
-@RequestMapping("/smartor/svyTemplate")
+@RequestMapping("/smartor/svyLibTemplate")
public class SvyLibTemplateController extends BaseController {
@Autowired
private ISvyLibTemplateService svyLibTemplateService;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
index 355329f..ca8e739 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
@@ -1,98 +1,138 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
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.DtoConversionUtils;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.SvyTask;
+import com.smartor.domain.*;
import com.smartor.service.ISvyTaskService;
+import com.smartor.service.ISvyTaskSingleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
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;
+import java.util.stream.Collectors;
/**
- * 缁煎悎闂嵎浠诲姟锛堜换鍔★級Controller
+ * 闂嵎浠诲姟锛堜换鍔★級Controller
*
* @author ruoyi
* @date 2024-06-12
*/
+@Api(description = " 闂嵎浠诲姟锛堜换鍔★級")
@RestController
@RequestMapping("/smartor/svytask")
-public class SvyTaskController extends BaseController
-{
+public class SvyTaskController extends BaseController {
@Autowired
private ISvyTaskService svyTaskService;
+ @Autowired
+ private ISvyTaskSingleService iSvyTaskSingleService;
/**
- * 鏌ヨ缁煎悎闂嵎浠诲姟锛堜换鍔★級鍒楄〃
+ * 鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃
*/
+ @ApiOperation("鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:task:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyTask svyTask)
- {
- startPage();
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyTask svyTask) {
+ PageUtils.startPageByPost(svyTask.getPageNum(), svyTask.getPageSize());
List<SvyTask> list = svyTaskService.selectSvyTaskList(svyTask);
- return getDataTable(list);
+ List<SvyTaskVO> svyTaskVOS = DtoConversionUtils.sourceToTarget(list, SvyTaskVO.class);
+ if (CollectionUtils.isNotEmpty(svyTaskVOS)) {
+ for (SvyTaskVO svyTaskVO : svyTaskVOS) {
+ SvyTaskSingle svyTaskSingle = new SvyTaskSingle();
+ svyTaskSingle.setTaskid(svyTaskVO.getTaskid());
+ List<SvyTaskSingle> svyTaskSingles = iSvyTaskSingleService.selectSvyTaskSingleList(svyTaskSingle);
+ if (CollectionUtils.isNotEmpty(svyTaskSingles)) {
+ //宸插彂閫�
+ long yfs = svyTaskSingles.stream().filter(svyTaskcall1 -> svyTaskcall1.getSendstate() != null && svyTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
+ //鏈彂閫�
+ long wfs = svyTaskSingles.stream().filter(svyTaskcall1 -> svyTaskcall1.getSendstate() != null && svyTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
+ svyTaskVO.setYfs(yfs);
+ svyTaskVO.setWfs(wfs);
+
+ }
+ }
+ //鑾峰彇total
+ long total = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ svyTask.setPageNum(null);
+ svyTask.setPageSize(null);
+ svyTaskService.selectSvyTaskList(svyTask);
+ }
+ });
+
+ return getDataTable2(total, svyTaskVOS);
+
+ }
+
+ return getDataTable2(0, list);
}
/**
- * 瀵煎嚭缁煎悎闂嵎浠诲姟锛堜换鍔★級鍒楄〃
+ * 瀵煎嚭闂嵎浠诲姟锛堜换鍔★級鍒楄〃
*/
+ @ApiOperation("瀵煎嚭闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:task:export')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyTask svyTask)
- {
+ public void export(HttpServletResponse response, SvyTask svyTask) {
List<SvyTask> list = svyTaskService.selectSvyTaskList(svyTask);
ExcelUtil<SvyTask> util = new ExcelUtil<SvyTask>(SvyTask.class);
util.exportExcel(response, list, "缁煎悎闂嵎浠诲姟锛堜换鍔★級鏁版嵁");
}
/**
- * 鑾峰彇缁煎悎闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅
+ * 鑾峰彇闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('system:task:query')")
@GetMapping(value = "/{taskid}")
- public AjaxResult getInfo(@PathVariable("taskid") Long taskid)
- {
+ public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
return success(svyTaskService.selectSvyTaskByTaskid(taskid));
}
/**
- * 鏂板缁煎悎闂嵎浠诲姟锛堜换鍔★級
+ * 鏂板闂嵎浠诲姟锛堜换鍔★級
*/
+ @ApiOperation("鏂板闂嵎浠诲姟锛堜换鍔★級")
@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SvyTask svyTask)
- {
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody SvyTask svyTask) {
return toAjax(svyTaskService.insertSvyTask(svyTask));
}
/**
- * 淇敼缁煎悎闂嵎浠诲姟锛堜换鍔★級
+ * 淇敼闂嵎浠诲姟锛堜换鍔★級
*/
+ @ApiOperation("淇敼闂嵎浠诲姟锛堜换鍔★級")
@PreAuthorize("@ss.hasPermi('system:task:edit')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SvyTask svyTask)
- {
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody SvyTask svyTask) {
return toAjax(svyTaskService.updateSvyTask(svyTask));
}
/**
- * 鍒犻櫎缁煎悎闂嵎浠诲姟锛堜换鍔★級
+ * 鍒犻櫎闂嵎浠诲姟锛堜换鍔★級
*/
+ @ApiOperation("鍒犻櫎闂嵎浠诲姟锛堜换鍔★級")
@PreAuthorize("@ss.hasPermi('system:task:remove')")
- @Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.DELETE)
- @DeleteMapping("/{taskids}")
- public AjaxResult remove(@PathVariable Long[] taskids)
- {
+ @Log(title = "闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.DELETE)
+ @GetMapping("/{taskids}")
+ public AjaxResult remove(@PathVariable Long[] taskids) {
return toAjax(svyTaskService.deleteSvyTaskByTaskids(taskids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java
index 4dd7aa2..d38671d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskScriptController.java
@@ -8,6 +8,8 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.SvyTaskScript;
import com.smartor.service.ISvyTaskScriptService;
+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.*;
@@ -21,20 +23,20 @@
* @author ruoyi
* @date 2024-06-12
*/
+@Api(description = "浠诲姟闂嵎棰樼洰")
@RestController
@RequestMapping("/smartor/svyTaskScript")
-public class SvyTaskScriptController extends BaseController
-{
+public class SvyTaskScriptController extends BaseController {
@Autowired
private ISvyTaskScriptService svyTaskScriptService;
/**
* 鏌ヨ浠诲姟闂嵎棰樼洰鍒楄〃
*/
+ @ApiOperation("鏌ヨ浠诲姟闂嵎棰樼洰鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:script:list')")
@GetMapping("/list")
- public TableDataInfo list(SvyTaskScript svyTaskScript)
- {
+ public TableDataInfo list(SvyTaskScript svyTaskScript) {
startPage();
List<SvyTaskScript> list = svyTaskScriptService.selectSvyTaskScriptList(svyTaskScript);
return getDataTable(list);
@@ -43,11 +45,11 @@
/**
* 瀵煎嚭浠诲姟闂嵎棰樼洰鍒楄〃
*/
+ @ApiOperation("瀵煎嚭浠诲姟闂嵎棰樼洰鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:script:export')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyTaskScript svyTaskScript)
- {
+ public void export(HttpServletResponse response, SvyTaskScript svyTaskScript) {
List<SvyTaskScript> list = svyTaskScriptService.selectSvyTaskScriptList(svyTaskScript);
ExcelUtil<SvyTaskScript> util = new ExcelUtil<SvyTaskScript>(SvyTaskScript.class);
util.exportExcel(response, list, "浠诲姟闂嵎棰樼洰鏁版嵁");
@@ -56,43 +58,43 @@
/**
* 鑾峰彇浠诲姟闂嵎棰樼洰璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇浠诲姟闂嵎棰樼洰璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('system:script:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyTaskScriptService.selectSvyTaskScriptById(id));
}
/**
* 鏂板浠诲姟闂嵎棰樼洰
*/
+ @ApiOperation("鏂板浠诲姟闂嵎棰樼洰")
@PreAuthorize("@ss.hasPermi('system:script:add')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SvyTaskScript svyTaskScript)
- {
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody SvyTaskScript svyTaskScript) {
return toAjax(svyTaskScriptService.insertSvyTaskScript(svyTaskScript));
}
/**
* 淇敼浠诲姟闂嵎棰樼洰
*/
+ @ApiOperation("淇敼浠诲姟闂嵎棰樼洰")
@PreAuthorize("@ss.hasPermi('system:script:edit')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SvyTaskScript svyTaskScript)
- {
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody SvyTaskScript svyTaskScript) {
return toAjax(svyTaskScriptService.updateSvyTaskScript(svyTaskScript));
}
/**
* 鍒犻櫎浠诲姟闂嵎棰樼洰
*/
+ @ApiOperation("瀵煎嚭缁煎悎闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:script:remove')")
@Log(title = "浠诲姟闂嵎棰樼洰", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyTaskScriptService.deleteSvyTaskScriptByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
index f5e8108..f72d878 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
@@ -7,11 +7,11 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.IvrTaskVO;
-import com.smartor.domain.SvyTaskSingle;
-import com.smartor.domain.SvyTaskVO;
+import com.smartor.domain.*;
import com.smartor.service.ISvyTaskSingleService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,6 +26,7 @@
* @author ruoyi
* @date 2024-06-12
*/
+@Api(description = "鍗曚竴浠诲姟锛堥棶鍗凤級")
@RestController
@RequestMapping("/smartor/svysingle")
public class SvyTaskSingleController extends BaseController {
@@ -35,6 +36,7 @@
/**
* 鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃
*/
+ @ApiOperation("鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:single:list')")
@GetMapping("/list")
public TableDataInfo list(SvyTaskSingle svyTaskSingle) {
@@ -46,6 +48,7 @@
/**
* 瀵煎嚭鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃
*/
+ @ApiOperation("瀵煎嚭鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:single:export')")
@Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -58,8 +61,9 @@
/**
* 鑾峰彇鍗曚竴浠诲姟锛堥棶鍗凤級璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇鍗曚竴浠诲姟锛堥棶鍗凤級璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('system:single:query')")
- @GetMapping(value = "/{id}")
+ @GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyTaskSingleService.selectSvyTaskSingleById(id));
}
@@ -67,9 +71,10 @@
/**
* 鏂板鍗曚竴浠诲姟锛堥棶鍗凤級
*/
+ @ApiOperation("鏂板鍗曚竴浠诲姟锛堥棶鍗凤級")
@PreAuthorize("@ss.hasPermi('system:single:add')")
@Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyTaskSingle svyTaskSingle) {
return toAjax(svyTaskSingleService.insertSvyTaskSingle(svyTaskSingle));
}
@@ -77,9 +82,10 @@
/**
* 淇敼鍗曚竴浠诲姟锛堥棶鍗凤級
*/
+ @ApiOperation("淇敼鍗曚竴浠诲姟锛堥棶鍗凤級")
@PreAuthorize("@ss.hasPermi('system:single:edit')")
@Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskSingle svyTaskSingle) {
return toAjax(svyTaskSingleService.updateSvyTaskSingle(svyTaskSingle));
}
@@ -87,9 +93,10 @@
/**
* 鍒犻櫎鍗曚竴浠诲姟锛堥棶鍗凤級
*/
+ @ApiOperation(" 鍒犻櫎鍗曚竴浠诲姟锛堥棶鍗凤級")
@PreAuthorize("@ss.hasPermi('system:single:remove')")
@Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyTaskSingleService.deleteSvyTaskSingleByIds(ids));
}
@@ -101,10 +108,21 @@
@PreAuthorize("@ss.hasPermi('system:task:add')")
@PostMapping("/insertOrUpdateSvyTask")
public AjaxResult insertOrUpdateSvyTask(@RequestBody SvyTaskVO svyTaskVO) {
-
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
svyTaskVO.setCreateBy(user.getNickName());
return toAjax(svyTaskSingleService.insertOrUpdateSvyTask(svyTaskVO));
}
+
+ /**
+ * 鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅
+ */
+ @ApiOperation("鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅")
+ @PostMapping("/queryTaskByCondition")
+ public AjaxResult queryTaskByCondition(@RequestBody SvyTaskSingleVO svyTaskSingleVO) {
+ //鏍规嵁鍏ュ弬鏌ヨ淇℃伅
+ SvyTaskSingle svyTaskSingle = DtoConversionUtils.sourceToTarget(svyTaskSingleVO, SvyTaskSingle.class);
+ SvyTaskVO svyTaskVO = svyTaskSingleService.queryTaskByCondition(svyTaskSingle);
+ return success(svyTaskVO);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java
index 41d382b..87ac99b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskTemplateController.java
@@ -10,6 +10,7 @@
import com.smartor.domain.SvyTaskTemplate;
import com.smartor.domain.SvyTaskTemplateVO;
import com.smartor.service.ISvyTaskTemplateService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,8 +25,9 @@
* @author ruoyi
* @date 2024-06-12
*/
+@Api(description = "浠诲姟闂嵎妯℃澘")
@RestController
-@RequestMapping("/smartor/svytemplate")
+@RequestMapping("/smartor/svytemplateTask")
public class SvyTaskTemplateController extends BaseController {
@Autowired
private ISvyTaskTemplateService svyTaskTemplateService;
@@ -34,6 +36,7 @@
* 鏌ヨ浠诲姟闂嵎妯℃澘鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:template:list')")
+ @ApiOperation("鏌ヨ浠诲姟闂嵎妯℃澘鍒楄〃")
@GetMapping("/list")
public TableDataInfo list(SvyTaskTemplate svyTaskTemplate) {
startPage();
@@ -44,6 +47,7 @@
/**
* 瀵煎嚭浠诲姟闂嵎妯℃澘鍒楄〃
*/
+ @ApiOperation("瀵煎嚭浠诲姟闂嵎妯℃澘鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:template:export')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -56,6 +60,7 @@
/**
* 鑾峰彇浠诲姟闂嵎妯℃澘璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇浠诲姟闂嵎妯℃澘璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('system:template:query')")
@GetMapping(value = "/{svyid}")
public AjaxResult getInfo(@PathVariable("svyid") Long svyid) {
@@ -65,6 +70,7 @@
/**
* 鏂板浠诲姟闂嵎妯℃澘
*/
+ @ApiOperation("鏂板浠诲姟闂嵎妯℃澘")
@PreAuthorize("@ss.hasPermi('system:template:add')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.INSERT)
@PostMapping
@@ -75,9 +81,10 @@
/**
* 淇敼浠诲姟闂嵎妯℃澘
*/
+ @ApiOperation("淇敼浠诲姟闂嵎妯℃澘")
@PreAuthorize("@ss.hasPermi('system:template:edit')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTaskTemplate svyTaskTemplate) {
return toAjax(svyTaskTemplateService.updateSvyTaskTemplate(svyTaskTemplate));
}
@@ -85,9 +92,10 @@
/**
* 鍒犻櫎浠诲姟闂嵎妯℃澘
*/
+ @ApiOperation("鍒犻櫎浠诲姟闂嵎妯℃澘")
@PreAuthorize("@ss.hasPermi('system:template:remove')")
@Log(title = "浠诲姟闂嵎妯℃澘", businessType = BusinessType.DELETE)
- @DeleteMapping("/{svyids}")
+ @GetMapping("/remove/{svyids}")
public AjaxResult remove(@PathVariable Long[] svyids) {
return toAjax(svyTaskTemplateService.deleteSvyTaskTemplateBySvyids(svyids));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index f21f888..73a3604 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,21 +1,5 @@
package com.ruoyi.web.controller.system;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -32,6 +16,16 @@
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛淇℃伅
diff --git a/smartor/src/main/java/com/smartor/domain/Icd10Association.java b/smartor/src/main/java/com/smartor/domain/Icd10Association.java
index 22e9ee1..f001993 100644
--- a/smartor/src/main/java/com/smartor/domain/Icd10Association.java
+++ b/smartor/src/main/java/com/smartor/domain/Icd10Association.java
@@ -1,5 +1,7 @@
package com.smartor.domain;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,18 +11,29 @@
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
-import java.util.Date;
-
/**
- * 鐤剧梾鍏宠仈瀵硅薄 icd10_association
+ * 鎸囨爣鐤剧梾瀵硅薄 ivr_liba_target_icd10
*
* @author ruoyi
- * @date 2023-06-26
+ * @date 2023-12-20
*/
@Data
-@ApiModel(value = "Icd10Association", description = "鐤剧梾鍏宠仈瀵硅薄")
-public class Icd10Association {
+@ApiModel(value = "Icd10Association", description = "鎸囨爣鐤剧梾瀵硅薄")
+public class Icd10Association extends BaseEntity {
private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+
+ /**
+ * 鐤剧梾id
+ */
+ @ApiModelProperty(value = "鐤剧梾id")
+ @Excel(name = "鐤剧梾id")
+ private Long icd10id;
/**
* 鐤剧梾缂栫爜
@@ -36,19 +49,75 @@
@Excel(name = "鐤剧梾鍚嶇О")
private String icd10name;
- /**
- * 闂嵎ID
- */
- @ApiModelProperty(value = "闂嵎ID")
- @Excel(name = "闂嵎ID")
- private Long svyid;
-
/**
- * 鏇存柊鏃堕棿
+ * 鏈烘瀯ID
*/
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updatetime;
+ @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,闅忚璇濇湳 3,闅忚妯＄増 4,闂嵎璇濇湳 锛�5,闂嵎妯＄増 6,瀹ｆ暀
+ */
+ @ApiModelProperty(value = "1,鎸囨爣 2,闅忚璇濇湳 3,闅忚妯＄増 4,闂嵎璇濇湳 锛�5,闂嵎妯＄増 6,瀹ｆ暀")
+ @Excel(name = "1,鎸囨爣 2,闅忚璇濇湳 3,闅忚妯＄増 4,闂嵎璇濇湳 锛�5,闂嵎妯＄増 6,瀹ｆ暀")
+ 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/IvrLibaTargetIcd10.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetIcd10.java
deleted file mode 100644
index ce8fc99..0000000
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetIcd10.java
+++ /dev/null
@@ -1,123 +0,0 @@
-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,闅忚璇濇湳 3,闅忚妯＄増 4,闂嵎璇濇湳 锛�5,闂嵎妯＄増 6,瀹ｆ暀
- */
- @ApiModelProperty(value = "1,鎸囨爣 2,闅忚璇濇湳 3,闅忚妯＄増 4,闂嵎璇濇湳 锛�5,闂嵎妯＄増 6,瀹ｆ暀")
- @Excel(name = "1,鎸囨爣 2,闅忚璇濇湳 3,闅忚妯＄増 4,闂嵎璇濇湳 锛�5,闂嵎妯＄増 6,瀹ｆ暀")
- 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/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
index e60f263..0e21fef 100644
--- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
+++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
@@ -121,8 +121,8 @@
/**
* 鐥呭巻鍙�
*/
- @Excel(name = "鍙戦�佺姸鎬�")
- @ApiModelProperty("鍙戦�佺姸鎬�")
+ @Excel(name = "鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
+ @ApiModelProperty("鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
private Integer sendStatus;
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
index 35600e0..7f024a7 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
@@ -1,16 +1,16 @@
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.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
/**
* 闂嵎瀵硅薄 svy_lib_Template
@@ -150,8 +150,8 @@
/**
* 鐤剧梾ID
*/
- @ApiModelProperty(value = "鐤剧梾ID")
- private List<String> icdID;
+ @ApiModelProperty(value = "鐤剧梾鍏宠仈琛�")
+ private List<Icd10Association> icd10Associations;
/**
* 闂嵎棰樼洰闆嗗悎
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
index bfc0933..b21fd9f 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
@@ -42,6 +42,12 @@
@Excel(name = "鎸囨爣鍚嶇О")
@ApiModelProperty(value = "鎸囨爣鍚嶇О")
private String targetname;
+ /**
+ * 鎸囨爣鍚嶇О
+ */
+ @Excel(name = "鍒嗘暟")
+ @ApiModelProperty(value = "鍒嗘暟")
+ private String score;
/**
* 妯℃澘ID
@@ -125,7 +131,7 @@
*/
@Excel(name = "閫夐」鎻忚堪")
@ApiModelProperty(value = "閫夐」鎻忚堪")
- private String optiondesc;
+ private String optioncontent;
/**
* 璇█
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTask.java b/smartor/src/main/java/com/smartor/domain/SvyTask.java
index e2c8858..d259347 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTask.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTask.java
@@ -38,7 +38,14 @@
*/
@Excel(name = " ")
@ApiModelProperty(value = "浠诲姟鍚嶇О")
- private String taskname;
+ private String taskName;
+
+ /**
+ *
+ */
+ @Excel(name = " ")
+ @ApiModelProperty(value = "浠诲姟鎻忚堪")
+ private String taskDesc;
/**
* 妯℃澘ID
@@ -239,10 +246,10 @@
private Long sendType;
/**
- * 鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛
+ * 鍙戦�佺姸鎬�: 1鏂板缓 2鎵ц涓� 3鏆傚仠 4缁堟 5瀹屾垚
*/
- @Excel(name = "鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛")
- @ApiModelProperty(value = "鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛")
+ @Excel(name = "鍙戦�佺姸鎬�: 1鏂板缓 2鎵ц涓� 3鏆傚仠 4缁堟 5瀹屾垚")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬�: 1鏂板缓 2鎵ц涓� 3鏆傚仠 4缁堟 5瀹屾垚")
private String sendState;
/**
@@ -297,4 +304,16 @@
@Excel(name = "妯℃澘搴撴ā鐗圛D")
private String libtemplateid;
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskSingle.java b/smartor/src/main/java/com/smartor/domain/SvyTaskSingle.java
index 506a364..8060c2a 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskSingle.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskSingle.java
@@ -164,7 +164,7 @@
* 鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�
*/
@Excel(name = " 鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫� 4 缁堟")
private Long sendstate;
/**
@@ -356,7 +356,7 @@
*/
@Excel(name = "鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鏃堕棿鐐� 3 鍗冲埢鍙戦��")
@ApiModelProperty(value = "鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鏃堕棿鐐� 3 鍗冲埢鍙戦��")
- private String sendType;
+ private Long sendType;
/**
* 鍙戦�佹椂闂存
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskSingleVO.java b/smartor/src/main/java/com/smartor/domain/SvyTaskSingleVO.java
new file mode 100644
index 0000000..5562574
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskSingleVO.java
@@ -0,0 +1,452 @@
+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.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍗曚竴浠诲姟锛堥棶鍗凤級瀵硅薄 svy_task_single
+ *
+ * @author ruoyi
+ * @date 2024-06-12
+ */
+@Data
+public class SvyTaskSingleVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 璁板綍鍏抽敭鍊糏D
+ */
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+
+ /**
+ * 鍙戦�佷汉 锛堟偅鑰咃級
+ */
+ @Excel(name = " 鍙戦�佷汉 ", readConverterExp = "鎮�=鑰�")
+ @ApiModelProperty(value = "鍙戦�佷汉 锛堟偅鑰咃級")
+ private String sendname;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @Excel(name = " 鎵嬫満鍙� ")
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+
+ /**
+ * 鎮ｈ�匢D
+ */
+ @Excel(name = " 鎮ｈ�匢D ")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private Long patid;
+
+ /**
+ * 鎬у埆
+ */
+ @Excel(name = " 鎬у埆")
+ @ApiModelProperty(value = "鎬у埆")
+ private String sex;
+
+ /**
+ * 骞撮緞
+ */
+ @Excel(name = " 骞撮緞 ")
+ @ApiModelProperty(value = "骞撮緞")
+ private Long age;
+
+ /**
+ * 韬唤璇佸彿
+ */
+ @Excel(name = " 韬唤璇佸彿 ")
+ @ApiModelProperty(value = "韬唤璇佸彿")
+ private String sfzh;
+
+ /**
+ * 鍦板潃
+ */
+ @Excel(name = " 鍦板潃 ")
+ @ApiModelProperty(value = "鍦板潃")
+ private String addr;
+
+ /**
+ * 鍙戦�佷汉璇︽儏
+ */
+ @Excel(name = " 鍙戦�佷汉璇︽儏")
+ @ApiModelProperty(value = "鍙戦�佷汉璇︽儏")
+ private String senderdetail;
+
+ /**
+ * 浠诲姟绫诲瀷(0閫氱煡銆�1瀹ｆ暀銆�2闂ㄨ瘖銆�3鍑洪櫌銆�4澶嶈瘖銆�5浣撴銆�6闂嵎銆�7鍖绘妧鈥︹��)
+ */
+ @Excel(name = "浠诲姟绫诲瀷(0閫氱煡銆�1瀹ｆ暀銆�2闂ㄨ瘖銆�3鍑洪櫌銆�4澶嶈瘖銆�5浣撴銆�6闂嵎銆�7鍖绘妧鈥︹��)")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷(0閫氱煡銆�1瀹ｆ暀銆�2闂ㄨ瘖銆�3鍑洪櫌銆�4澶嶈瘖銆�5浣撴銆�6闂嵎銆�7鍖绘妧鈥︹��)")
+ private String type;
+
+ /**
+ * 浠诲姟ID
+ */
+ @Excel(name = " 浠诲姟ID ")
+ @ApiModelProperty(value = "浠诲姟ID")
+ private Long taskid;
+
+ /**
+ * 妯℃澘ID
+ */
+ @Excel(name = " 妯℃澘ID")
+ @ApiModelProperty(value = "妯℃澘ID")
+ private String templateid;
+
+ /**
+ * 妯℃澘鍚�
+ */
+ @Excel(name = " 妯℃澘鍚� ")
+ @ApiModelProperty(value = "妯℃澘鍚�")
+ private String templatename;
+
+ /**
+ * 鍙戦�佹棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍙戦�佹棩鏈�")
+ private Date senddate;
+
+ /**
+ * 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ @ApiModelProperty(value = "涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitabegin;
+
+ /**
+ * 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ @ApiModelProperty(value = "涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitaend;
+
+ /**
+ * 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ @ApiModelProperty(value = "涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitpbegin;
+
+ /**
+ * 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ @ApiModelProperty(value = "涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitpend;
+
+ /**
+ * 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ @ApiModelProperty(value = "鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�")
+ private String sendlimitnbegin;
+
+ /**
+ * 鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒�
+ */
+ @Excel(name = " 鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ @ApiModelProperty(value = "鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒�")
+ private String sendlimitnend;
+
+ /**
+ * 鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�
+ */
+ @Excel(name = " 鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
+ private Long sendstate;
+
+ /**
+ * 鍙戦�乁UID
+ */
+ @Excel(name = " 鍙戦�乁UID ")
+ @ApiModelProperty(value = "鍙戦�乁UID")
+ private String senduuid;
+
+ /**
+ * 缁撴灉
+ */
+ @Excel(name = " 缁撴灉 ")
+ @ApiModelProperty(value = "缁撴灉")
+ private String result;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+ private Date finishtime;
+
+ /**
+ * 鐢ㄦ埛ID
+ */
+ @Excel(name = " 鐢ㄦ埛ID ")
+ @ApiModelProperty(value = "鐢ㄦ埛ID")
+ private String userid;
+
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ @Excel(name = " 鐢ㄦ埛鍚� ")
+ @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ private String username;
+
+ /**
+ *
+ */
+ @Excel(name = " ")
+ @ApiModelProperty(value = "澶栧懠UUID")
+ private String outbounduuid;
+
+ /**
+ * 灏辫瘖璁板綍缂栧彿 锛堝搴斺�滄偅鑰呭嚭闄㈣褰曚富閿�濄�佲�滄偅鑰呴棬璇婅褰曚富閿�濓級
+ */
+ @Excel(name = " 灏辫瘖璁板綍缂栧彿 ", readConverterExp = "瀵�=搴斺�滄偅鑰呭嚭闄㈣褰曚富閿�濄�佲�滄偅鑰呴棬璇婅褰曚富閿��")
+ @ApiModelProperty(value = "灏辫瘖璁板綍缂栧彿 锛堝搴斺�滄偅鑰呭嚭闄㈣褰曚富閿�濄�佲�滄偅鑰呴棬璇婅褰曚富閿�濓級")
+ private Long recordid;
+
+ /**
+ * 閲嶆嫧鎬绘暟
+ */
+ @Excel(name = " 閲嶆嫧鎬绘暟 ")
+ @ApiModelProperty(value = "閲嶆嫧鎬绘暟")
+ private Long recallcount;
+
+ /**
+ * 褰撳墠閲嶆嫧娆℃暟
+ */
+ @Excel(name = " 褰撳墠閲嶆嫧娆℃暟 ")
+ @ApiModelProperty(value = "褰撳墠閲嶆嫧娆℃暟")
+ private Long exrecallcount;
+
+ /**
+ * 鎷夊彇鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鎷夊彇鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鎷夊彇鏃堕棿")
+ private Date pulltime;
+
+ /**
+ *
+ */
+ @Excel(name = " ")
+ @ApiModelProperty(value = "")
+ private Long bqsms;
+
+ /**
+ *
+ */
+ @Excel(name = " ")
+ @ApiModelProperty(value = "")
+ private Long bhsms;
+
+ /**
+ * 閮ㄩ棬code
+ */
+ @Excel(name = " 閮ㄩ棬code")
+ @ApiModelProperty(value = "閮ㄩ棬code")
+ private String deptcode;
+
+ /**
+ * 鏍囩鐘舵��
+ */
+ @Excel(name = " 鏍囩鐘舵��")
+ @ApiModelProperty(value = "鏍囩鐘舵��")
+ private Long labelstatus;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @Excel(name = " 涓婁紶鏍囪 ")
+ @ApiModelProperty(value = "涓婁紶鏍囪")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ 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;
+
+ /**
+ * 鏂囨湰鍙橀噺鍙傛暟
+ */
+ @Excel(name = "鏂囨湰鍙橀噺鍙傛暟")
+ @ApiModelProperty(value = "鏂囨湰鍙橀噺鍙傛暟")
+ private String textParam;
+
+ /**
+ * 1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.閾炬帴 7.閽夐拤 8.寰俊
+ */
+ @Excel(name = " 1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.閾炬帴 7.閽夐拤 8.寰俊")
+ @ApiModelProperty(value = "1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.閾炬帴 7.閽夐拤 8.寰俊")
+ private String serviceform;
+
+ /**
+ * 搴婂彿
+ */
+ @Excel(name = "搴婂彿")
+ @ApiModelProperty(value = "搴婂彿")
+ private String badNo;
+
+ /**
+ * 鐤剧梾鍚嶇О
+ */
+ @Excel(name = "鐤剧梾鍚嶇О")
+ @ApiModelProperty(value = "鐤剧梾鍚嶇О")
+ private String icdName;
+
+ /**
+ * 鐥呭巻鍙�
+ */
+ @Excel(name = "鐥呭巻鍙�")
+ @ApiModelProperty(value = "鐥呭巻鍙�")
+ private String medicalRecordNo;
+
+ /**
+ * 瀹ｆ暀鍐呭
+ */
+ @Excel(name = "瀹ｆ暀鍐呭")
+ @ApiModelProperty(value = "瀹ｆ暀鍐呭")
+ private String preachcontent;
+
+ /**
+ * 鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鏃堕棿鐐� 3 鍗冲埢鍙戦��
+ */
+ @Excel(name = "鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鏃堕棿鐐� 3 鍗冲埢鍙戦��")
+ @ApiModelProperty(value = "鍙戦�佺被鍨�: 1 鏃堕棿娈� 2 鏃堕棿鐐� 3 鍗冲埢鍙戦��")
+ private Long sendType;
+
+ /**
+ * 鍙戦�佹椂闂存
+ */
+ @Excel(name = "鍙戦�佹椂闂存")
+ @ApiModelProperty(value = "鍙戦�佹椂闂存")
+ private String sendTimeSlot;
+
+ /**
+ * 浠诲姟鍚嶇О
+ */
+ @Excel(name = "浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ private String taskName;
+
+ /**
+ * 浠诲姟鎻忚堪
+ */
+ @Excel(name = "浠诲姟鎻忚堪")
+ @ApiModelProperty(value = "浠诲姟鎻忚堪")
+ private String taskDesc;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @Excel(name = "鍒涘缓浜�")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String operator;
+
+ /**
+ * 鍒涘缓浜虹紪鍙�
+ */
+ @Excel(name = "鍒涘缓浜虹紪鍙�")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鍙�")
+ private String operatorNo;
+
+ /**
+ * 灏辫瘖缂栧彿锛堝搴旂殑outhospno銆乮nhospno锛�
+ */
+ @Excel(name = "灏辫瘖缂栧彿", readConverterExp = "瀵�=搴旂殑outhospno銆乮nhospno")
+ @ApiModelProperty(value = "灏辫瘖缂栧彿")
+ private String hospno;
+
+ /**
+ * 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�
+ */
+ @Excel(name = "灏辫瘖绫诲瀷", readConverterExp = "1=闂ㄨ瘖,2=鍑洪櫌")
+ @ApiModelProperty(value = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
+ private String hospType;
+
+ /**
+ * 寰俊
+ */
+ @Excel(name = "寰俊")
+ @ApiModelProperty(value = "寰俊")
+ private String wechat;
+
+ /**
+ * 璇婃柇鍚嶇О
+ */
+ @Excel(name = "璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
+ private String diagname;
+
+ /**
+ * 绉戝鍚嶇О
+ */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
+
+ /**
+ * 灏辫瘖鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "灏辫瘖鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "灏辫瘖鏃ユ湡")
+ private Date admindate;
+
+ /**
+ * 鐥呮埧鍙�
+ */
+ @Excel(name = "鐥呮埧鍙�")
+ @ApiModelProperty(value = "鐥呮埧鍙�")
+ private String roomno;
+
+ /**
+ * 鐥呭簥鍙�
+ */
+ @Excel(name = "鐥呭簥鍙�")
+ @ApiModelProperty(value = "鐥呭簥鍙�")
+ private String bedno;
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateTargetoption.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateTargetoption.java
index c6cd019..23f04c0 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateTargetoption.java
@@ -85,7 +85,7 @@
* 閫夐」鎻忚堪
*/
@ApiModelProperty(value = "閫夐」鎻忚堪")
- private String optiondesc;
+ private String optioncontent;
/**
* 璇█
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskVO.java b/smartor/src/main/java/com/smartor/domain/SvyTaskVO.java
index 86fb3c8..3714066 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskVO.java
@@ -38,7 +38,13 @@
*/
@Excel(name = " ")
@ApiModelProperty(value = "浠诲姟鍚嶇О")
- private String taskname;
+ private String taskName;
+ /**
+ *
+ */
+ @Excel(name = " ")
+ @ApiModelProperty(value = "浠诲姟鎻忚堪")
+ private String taskDesc;
/**
* 妯℃澘ID
@@ -277,7 +283,7 @@
*/
@Excel(name = "鏂囨湰鍙橀噺鍙傛暟")
@ApiModelProperty(value = "鏂囨湰鍙橀噺鍙傛暟")
- private String textParam;
+ private Map<String, Map<String, String>> textParam;
/**
* 鏆傚仠鐘舵�� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1
@@ -315,4 +321,26 @@
*/
@Excel(name = "妯℃澘搴撴ā鐗圛D")
private String libtemplateid;
+
+
+ /**
+ * 宸插彂閫�
+ */
+ @Excel(name = " 宸插彂閫� ")
+ private Long yfs;
+
+ /**
+ * 鏈彂閫�
+ */
+ @Excel(name = " 鏈彂閫� ")
+ private Long wfs;
+
+ /**
+ * 鏄惁鍙戦�� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦��
+ */
+ @Excel(name = "鏄惁鍙戦�� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦�� ")
+ @ApiModelProperty(value = "鏄惁鍙戦�� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦��")
+ private Long sendType;
+
+
}
diff --git a/smartor/src/main/java/com/smartor/mapper/Icd10AssociationMapper.java b/smartor/src/main/java/com/smartor/mapper/Icd10AssociationMapper.java
index c67bc6d..1f812d4 100644
--- a/smartor/src/main/java/com/smartor/mapper/Icd10AssociationMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/Icd10AssociationMapper.java
@@ -6,58 +6,58 @@
import java.util.List;
/**
- * 鐤剧梾鍏宠仈Mapper鎺ュ彛
+ * 鎸囨爣鐤剧梾Mapper鎺ュ彛
*
* @author ruoyi
- * @date 2023-06-26
+ * @date 2023-12-20
*/
@Mapper
public interface Icd10AssociationMapper {
/**
- * 鏌ヨ鐤剧梾鍏宠仈
+ * 鏌ヨ鎸囨爣鐤剧梾
*
- * @param icd10code 鐤剧梾鍏宠仈涓婚敭
- * @return 鐤剧梾鍏宠仈
+ * @param id 鎸囨爣鐤剧梾涓婚敭
+ * @return 鎸囨爣鐤剧梾
*/
- public Icd10Association selectIcd10AssociationByIcd10code(String icd10code);
+ public Icd10Association selectIcd10AssociationById(Long id);
/**
- * 鏌ヨ鐤剧梾鍏宠仈鍒楄〃
+ * 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
*
- * @param icd10Association 鐤剧梾鍏宠仈
- * @return 鐤剧梾鍏宠仈闆嗗悎
+ * @param icd10Association 鎸囨爣鐤剧梾
+ * @return 鎸囨爣鐤剧梾闆嗗悎
*/
public List<Icd10Association> selectIcd10AssociationList(Icd10Association icd10Association);
/**
- * 鏂板鐤剧梾鍏宠仈
+ * 鏂板鎸囨爣鐤剧梾
*
- * @param icd10Association 鐤剧梾鍏宠仈
+ * @param icd10Association 鎸囨爣鐤剧梾
* @return 缁撴灉
*/
public int insertIcd10Association(Icd10Association icd10Association);
/**
- * 淇敼鐤剧梾鍏宠仈
+ * 淇敼鎸囨爣鐤剧梾
*
- * @param icd10Association 鐤剧梾鍏宠仈
+ * @param icd10Association 鎸囨爣鐤剧梾
* @return 缁撴灉
*/
public int updateIcd10Association(Icd10Association icd10Association);
/**
- * 鍒犻櫎鐤剧梾鍏宠仈
+ * 鍒犻櫎鎸囨爣鐤剧梾
*
- * @param icd10code 鐤剧梾鍏宠仈涓婚敭
+ * @param id 鎸囨爣鐤剧梾涓婚敭
* @return 缁撴灉
*/
- public int deleteIcd10AssociationByIcd10code(String icd10code);
+ public int deleteIcd10AssociationById(Long id);
/**
- * 鎵归噺鍒犻櫎鐤剧梾鍏宠仈
+ * 鎵归噺鍒犻櫎鎸囨爣鐤剧梾
*
- * @param icd10codes 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteIcd10AssociationByIcd10codes(String[] icd10codes);
+ public int deleteIcd10AssociationByIds(Long[] ids);
}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaOutIcd10Mapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaOutIcd10Mapper.java
deleted file mode 100644
index 7ee6c45..0000000
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaOutIcd10Mapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-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/service/IIcd10AssociationService.java b/smartor/src/main/java/com/smartor/service/IIcd10AssociationService.java
new file mode 100644
index 0000000..8c61664
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IIcd10AssociationService.java
@@ -0,0 +1,63 @@
+package com.smartor.service;
+
+import com.smartor.domain.Icd10Association;
+import com.smartor.domain.Icd10Association;
+
+import java.util.List;
+
+/**
+ * 鎸囨爣鐤剧梾Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-12-20
+ */
+public interface IIcd10AssociationService
+{
+ /**
+ * 鏌ヨ鎸囨爣鐤剧梾
+ *
+ * @param id 鎸囨爣鐤剧梾涓婚敭
+ * @return 鎸囨爣鐤剧梾
+ */
+ public Icd10Association selectIcd10AssociationById(Long id);
+
+ /**
+ * 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
+ *
+ * @param icd10Association 鎸囨爣鐤剧梾
+ * @return 鎸囨爣鐤剧梾闆嗗悎
+ */
+ public List<Icd10Association> selectIcd10AssociationList(Icd10Association icd10Association);
+
+ /**
+ * 鏂板鎸囨爣鐤剧梾
+ *
+ * @param icd10Association 鎸囨爣鐤剧梾
+ * @return 缁撴灉
+ */
+ public int insertIcd10Association(Icd10Association icd10Association);
+
+ /**
+ * 淇敼鎸囨爣鐤剧梾
+ *
+ * @param icd10Association 鎸囨爣鐤剧梾
+ * @return 缁撴灉
+ */
+ public int updateIcd10Association(Icd10Association icd10Association);
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囨爣鐤剧梾
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣鐤剧梾涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteIcd10AssociationByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鎸囨爣鐤剧梾淇℃伅
+ *
+ * @param id 鎸囨爣鐤剧梾涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteIcd10AssociationById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaOutIcd10Service.java b/smartor/src/main/java/com/smartor/service/IIvrLibaOutIcd10Service.java
deleted file mode 100644
index f27af09..0000000
--- a/smartor/src/main/java/com/smartor/service/IIvrLibaOutIcd10Service.java
+++ /dev/null
@@ -1,62 +0,0 @@
-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/ISvyTaskSingleService.java b/smartor/src/main/java/com/smartor/service/ISvyTaskSingleService.java
index 86ea32d..3c576d0 100644
--- a/smartor/src/main/java/com/smartor/service/ISvyTaskSingleService.java
+++ b/smartor/src/main/java/com/smartor/service/ISvyTaskSingleService.java
@@ -1,5 +1,7 @@
package com.smartor.service;
+import com.smartor.domain.IvrTaskSingle;
+import com.smartor.domain.IvrTaskVO;
import com.smartor.domain.SvyTaskSingle;
import com.smartor.domain.SvyTaskVO;
@@ -11,8 +13,7 @@
* @author ruoyi
* @date 2024-06-12
*/
-public interface ISvyTaskSingleService
-{
+public interface ISvyTaskSingleService {
/**
* 鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級
*
@@ -65,4 +66,6 @@
* 鏂板鎴栦慨鏀瑰垹闄ら棶鍗蜂换鍔�
*/
public int insertOrUpdateSvyTask(SvyTaskVO svyTaskVO);
+
+ public SvyTaskVO queryTaskByCondition(SvyTaskSingle svyTaskSingle);
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/Icd10AssociationServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/Icd10AssociationServiceImpl.java
new file mode 100644
index 0000000..cdf57a3
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/Icd10AssociationServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.Icd10Association;
+import com.smartor.mapper.Icd10AssociationMapper;
+import com.smartor.service.IIcd10AssociationService;
+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 Icd10AssociationServiceImpl implements IIcd10AssociationService
+{
+ @Autowired
+ private Icd10AssociationMapper icd10AssociationMapper;
+
+ /**
+ * 鏌ヨ鎸囨爣鐤剧梾
+ *
+ * @param id 鎸囨爣鐤剧梾涓婚敭
+ * @return 鎸囨爣鐤剧梾
+ */
+ @Override
+ public Icd10Association selectIcd10AssociationById(Long id)
+ {
+ return icd10AssociationMapper.selectIcd10AssociationById(id);
+ }
+
+ /**
+ * 鏌ヨ鎸囨爣鐤剧梾鍒楄〃
+ *
+ * @param icd10Association 鎸囨爣鐤剧梾
+ * @return 鎸囨爣鐤剧梾
+ */
+ @Override
+ public List<Icd10Association> selectIcd10AssociationList(Icd10Association icd10Association)
+ {
+ return icd10AssociationMapper.selectIcd10AssociationList(icd10Association);
+ }
+
+ /**
+ * 鏂板鎸囨爣鐤剧梾
+ *
+ * @param icd10Association 鎸囨爣鐤剧梾
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertIcd10Association(Icd10Association icd10Association)
+ {
+ icd10Association.setCreateTime(DateUtils.getNowDate());
+ return icd10AssociationMapper.insertIcd10Association(icd10Association);
+ }
+
+ /**
+ * 淇敼鎸囨爣鐤剧梾
+ *
+ * @param icd10Association 鎸囨爣鐤剧梾
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateIcd10Association(Icd10Association icd10Association)
+ {
+ icd10Association.setUpdateTime(DateUtils.getNowDate());
+ return icd10AssociationMapper.updateIcd10Association(icd10Association);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囨爣鐤剧梾
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎸囨爣鐤剧梾涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteIcd10AssociationByIds(Long[] ids)
+ {
+ return icd10AssociationMapper.deleteIcd10AssociationByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鎸囨爣鐤剧梾淇℃伅
+ *
+ * @param id 鎸囨爣鐤剧梾涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteIcd10AssociationById(Long id)
+ {
+ return icd10AssociationMapper.deleteIcd10AssociationById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaOutIcd10ServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaOutIcd10ServiceImpl.java
deleted file mode 100644
index 4c3c627..0000000
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaOutIcd10ServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-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/IvrTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
index 158c85a..c6bb3b5 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java
@@ -229,7 +229,7 @@
ivrTaskcall.setAddr(patTaskRelevance.getAddr());
ivrTaskcall.setPatid(patTaskRelevance.getPatid());
ivrTaskcall.setCreateTime(DateUtils.getNowDate());
- ivrTaskcall.setCreateTime(DateUtils.getNowDate());
+ ivrTaskcall.setSendstate(1L);
ivrTaskcall.setType(ivrTaskVO.getHospType());
ivrTaskSingleMapper.insertIvrTaskcall(ivrTaskcall);
integer = ivrTaskcall.getId().intValue();
@@ -258,11 +258,15 @@
ivrTaskcall.setPatid(patTaskRelevance.getPatid());
ivrTaskcall.setType(ivrTaskVO.getHospType());
ivrTaskcall.setCreateTime(DateUtils.getNowDate());
+
ivrTaskcall.setTextParam(new Gson().toJson(ivrTaskVO.getTextParam()));
if (patTaskRelevance.getIsoperation() != null) {
if (patTaskRelevance.getIsoperation() == 2)
ivrTaskSingleMapper.updateIvrTaskcallByCondition(ivrTaskcall);
- if (patTaskRelevance.getIsoperation() == 1) ivrTaskSingleMapper.insertIvrTaskcall(ivrTaskcall);
+ if (patTaskRelevance.getIsoperation() == 1) {
+ ivrTaskcall.setSendstate(1L);
+ ivrTaskSingleMapper.insertIvrTaskcall(ivrTaskcall);
+ }
if (patTaskRelevance.getIsoperation() == 3)
// 閫氳繃taskid鍜宲atid鍘诲垹闄よ鏉℃暟鎹�
ivrTaskSingleMapper.deleteIvrTaskcallByCondition(ivrTaskVO.getTaskid(), patTaskRelevance.getPatid());
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
index 55c43c6..55016ea 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -149,59 +149,43 @@
if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 1) {
//鏂板
svyLibTemplate.setCreateTime(DateUtils.getNowDate());
- i = svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
+ svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
} else if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 2) {
//淇敼
svyLibTemplate.setUpdateTime(DateUtils.getNowDate());
- i = svyLibTemplateMapper.updateSvyLibTemplate(svyLibTemplate);
+ svyLibTemplateMapper.updateSvyLibTemplate(svyLibTemplate);
} else if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 3) {
//鍒犻櫎
- i = svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyLibTemplate.getSvyid());
-
+ svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyLibTemplate.getSvyid());
}
+ i = svyLibTemplate.getSvyid().intValue();
//澶勭悊棰樼洰
if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibScripts())) {
for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyLibScripts()) {
-// SvyLibTemplateScript svyLibTemplateScript = DtoConversionUtils.sourceToTarget(svyLibScript, SvyLibTemplateScript.class);
//瀵归鐩繘琛屽鐞�
- if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 1) {
- //鏂板
- svyLibScript.setSvyid(svyLibTemplate.getSvyid());
- svyLibScript.setId(null);
- svyLibScript.setCreateTime(new Date());
- svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibScript);
-
- } else if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 2) {
- //淇敼
- svyLibScript.setSvyid(svyLibTemplate.getSvyid());
- svyLibScript.setUpdateTime(new Date());
- svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibScript);
- } else if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 3) {
- svyLibTemplateScriptMapper.deleteSvyLibTemplateScriptByTopicid(svyLibScript.getId());
+ if (svyLibScript.getIsoperation() != null) {
+ //闂鐨勬搷浣滀笉涓虹┖
+ scriptHandle(svyLibTemplate.getSvyid(), svyLibScript, svyLibScript.getIsoperation());
+ } else if (svyLibScript.getIsoperation() == null && svyLibTemplate.getIsoperation() != null) {
+ //妯℃澘鐨勬搷浣滀笉涓虹┖
+ scriptHandle(svyLibTemplate.getSvyid(), svyLibScript, svyLibTemplate.getIsoperation());
}
-
//瀵归鐩�夐」杩涜澶勭悊
if (CollectionUtils.isNotEmpty(svyLibScript.getSvyLibTemplateTargetoptions())) {
for (SvyLibTemplateTargetoption svyLibTemplateTargetoption : svyLibScript.getSvyLibTemplateTargetoptions()) {
- if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 1) {
- //鏂板
- svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
- svyLibTemplateTargetoption.setCreateTime(new Date());
- svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
- } else if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 2) {
- //淇敼
- svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
- svyLibTemplateTargetoption.setUpdateTime(new Date());
- svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
- } else if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 3) {
- //鍒犻櫎
- svyLibTemplateTargetoptionMapper.deleteSvyLibTemplateTargetoptionById(svyLibTemplateTargetoption.getId());
+ if (svyLibTemplateTargetoption.getIsoperation() != null) {
+ //閫夐�夐」鐨勬搷浣滀笉涓虹┖
+ optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibTemplateTargetoption.getIsoperation());
+ } else if (svyLibTemplateTargetoption.getIsoperation() == null && svyLibScript.getIsoperation() != null) {
+ //闂鐨勬搷浣滀笉涓虹┖
+ optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibScript.getIsoperation());
+ } else if (svyLibTemplateTargetoption.getIsoperation() == null && svyLibScript.getIsoperation() == null && svyLibTemplate.getIsoperation() != null) {
+ //妯℃澘鐨勬搷浣滀笉涓虹┖
+ optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibTemplate.getIsoperation());
}
}
-
}
-
}
}
@@ -254,4 +238,39 @@
public int deleteSvyLibTemplateBySvyid(Long svyid) {
return svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyid);
}
+
+ private void scriptHandle(Long svyid, SvyLibTemplateScript svyLibScript, Integer isoperation) {
+ if (isoperation == 1) {
+ //鏂板
+ svyLibScript.setSvyid(svyid);
+ svyLibScript.setId(null);
+ svyLibScript.setCreateTime(new Date());
+ svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibScript);
+
+ } else if (isoperation == 2) {
+ //淇敼
+ svyLibScript.setSvyid(svyid);
+ svyLibScript.setUpdateTime(new Date());
+ svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibScript);
+ } else if (isoperation == 3) {
+ svyLibTemplateScriptMapper.deleteSvyLibTemplateScriptByTopicid(svyLibScript.getId());
+ }
+ }
+
+ private void optionHandle(SvyLibTemplateTargetoption svyLibTemplateTargetoption, Long scriptId, Integer isoperation) {
+ if (isoperation == 1) {
+ //鏂板
+ svyLibTemplateTargetoption.setScriptid(scriptId);
+ svyLibTemplateTargetoption.setCreateTime(new Date());
+ svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
+ } else if (isoperation == 2) {
+ //淇敼
+ svyLibTemplateTargetoption.setScriptid(scriptId);
+ svyLibTemplateTargetoption.setUpdateTime(new Date());
+ svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
+ } else if (isoperation == 3) {
+ //鍒犻櫎
+ svyLibTemplateTargetoptionMapper.deleteSvyLibTemplateTargetoptionById(svyLibTemplateTargetoption.getId());
+ }
+ }
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index 7ec6671..ec35965 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -1,14 +1,13 @@
package com.smartor.service.impl;
import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
-import com.smartor.domain.PatTaskRelevance;
-import com.smartor.domain.SvyTask;
-import com.smartor.domain.SvyTaskSingle;
-import com.smartor.domain.SvyTaskVO;
+import com.smartor.domain.*;
import com.smartor.mapper.SvyTaskSingleMapper;
import com.smartor.service.ISvyTaskService;
import com.smartor.service.ISvyTaskSingleService;
@@ -18,7 +17,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 鍗曚竴浠诲姟锛堥棶鍗凤級Service涓氬姟灞傚鐞�
@@ -133,7 +135,7 @@
svyTaskSingle.setPhone(patTaskRelevance.getPhone());
svyTaskSingle.setAddr(patTaskRelevance.getAddr());
svyTaskSingle.setPatid(patTaskRelevance.getPatid());
- svyTaskSingle.setCreateTime(DateUtils.getNowDate());
+ svyTaskSingle.setSendstate(1L);
svyTaskSingle.setCreateTime(DateUtils.getNowDate());
svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
integer = svyTaskSingle.getId().intValue();
@@ -163,20 +165,89 @@
svyTaskSingle.setCreateTime(DateUtils.getNowDate());
svyTaskSingle.setTextParam(new Gson().toJson(svyTaskVO.getTextParamMap()));
if (patTaskRelevance.getIsoperation() != null) {
- if (patTaskRelevance.getIsoperation() == 2)
- svyTaskSingleMapper.updateSvyTaskSingle(svyTaskSingle);
- if (patTaskRelevance.getIsoperation() == 1)
- svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
- if (patTaskRelevance.getIsoperation() == 3)
- // 閫氳繃taskid鍜宲atid鍘诲垹闄よ鏉℃暟鎹�
- svyTaskSingleMapper.deleteSvyTaskcallByCondition(svyTaskVO.getTaskid(), patTaskRelevance.getPatid());
+ optionHandle(svyTaskSingle, svyTaskVO.getTaskid(), patTaskRelevance.getIsoperation(), patTaskRelevance.getPatid());
+ } else if (patTaskRelevance.getIsoperation() == null) {
+ optionHandle(svyTaskSingle, svyTaskVO.getTaskid(), svyTaskVO.getIsoperation(), patTaskRelevance.getPatid());
}
integer = svyTaskSingle.getTaskid().intValue();
}
}
}
-
-
return integer;
}
+
+ @Override
+ public SvyTaskVO queryTaskByCondition(SvyTaskSingle svyTaskSingle) {
+ //瀹氫箟鎮ｈ�呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚�
+ List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
+ List<SvyTaskSingle> list = selectSvyTaskSingleList(svyTaskSingle);
+ if (CollectionUtils.isEmpty(list) || list.size() == 0) {
+ return new SvyTaskVO();
+ }
+ SvyTask svyTask = svyTaskService.selectSvyTaskByTaskid(svyTaskSingle.getTaskid());
+ //灏嗘煡鍑烘潵鐨勬暟鎹�掑叆ivrTasksingleVO涓�
+ SvyTaskVO svyTaskVO = DtoConversionUtils.sourceToTarget(list.get(0), SvyTaskVO.class);
+ svyTaskVO.setShowDate(svyTask.getShowDate());
+ svyTaskVO.setShowTimeMorn(svyTask.getShowTimeMorn());
+ svyTaskVO.setShowTimeNoon(svyTask.getShowTimeNoon());
+ svyTaskVO.setShowTimeNight(svyTask.getShowTimeNight());
+ svyTaskVO.setPreachform(svyTask.getPreachform());
+ String sendTimeSlot = svyTask.getSendTimeSlot();
+ ObjectMapper objectMapper = new ObjectMapper();
+ try {
+ //鑾峰彇鍒板彂閫佹椂闂寸殑闆嗗悎
+ if (com.ruoyi.common.utils.StringUtils.isNotEmpty(sendTimeSlot)) {
+ List<TaskSendTimeVO> taskSendTimeVOList = objectMapper.readValue(sendTimeSlot, List.class);
+ svyTaskVO.setSendTimeSlot(taskSendTimeVOList);
+ svyTaskVO.setSendType(svyTask.getSendType());
+ }
+ //鏂囨湰鍙橀噺鍙傛暟
+ if (com.ruoyi.common.utils.StringUtils.isNotEmpty(svyTask.getTextParam())) {
+ Map<String, Map<String, String>> textParam = objectMapper.readValue(svyTask.getTextParam(), Map.class);
+ svyTaskVO.setTextParam(textParam);
+ }
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+
+ for (SvyTaskSingle svyTaskSingle1 : list) {
+ PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
+ if (!svyTaskSingle1.getHospType().equals("2")) {
+ log.info("闅忚鏌ヨ涓嶄负鍑洪櫌锛寋}", svyTaskSingle1.getHospType());
+ //鑾峰彇鍒版偅鑰呬俊鎭紝骞舵斁鍏ュ埌闆嗗悎涓�
+ patTaskRelevance.setName(svyTaskSingle1.getSendname());
+ patTaskRelevance.setAge(svyTaskSingle1.getAge());
+ patTaskRelevance.setSfzh(svyTaskSingle1.getSfzh());
+ patTaskRelevance.setPhone(svyTaskSingle1.getPhone());
+ patTaskRelevance.setAddr(svyTaskSingle1.getAddr());
+ patTaskRelevance.setDiagname(svyTaskSingle1.getDiagname());
+ patTaskRelevance.setPatid(svyTaskSingle1.getPatid());
+ patTaskRelevances.add(patTaskRelevance);
+ }
+ if (svyTaskSingle1.getHospType().equals("2")) {
+ log.info("闅忚鏌ヨ涓哄嚭闄紝{}", svyTaskSingle1.getHospType());
+ patTaskRelevance.setName(svyTaskSingle1.getSendname());
+ patTaskRelevance.setAge(svyTaskSingle1.getAge());
+ patTaskRelevance.setSfzh(svyTaskSingle1.getSfzh());
+ patTaskRelevance.setPhone(svyTaskSingle1.getPhone());
+ patTaskRelevance.setAddr(svyTaskSingle1.getAddr());
+ patTaskRelevance.setDeptName(svyTaskSingle1.getDeptname());
+ patTaskRelevance.setBedNo(svyTaskSingle1.getBedno());
+ patTaskRelevance.setDiagname(svyTaskSingle1.getDiagname());
+ patTaskRelevance.setPatid(svyTaskSingle1.getPatid());
+ patTaskRelevances.add(patTaskRelevance);
+ }
+ }
+
+ svyTaskVO.setPatTaskRelevances(patTaskRelevances);
+ return svyTaskVO;
+ }
+
+ private void optionHandle(SvyTaskSingle svyTaskSingle, Long taskId, Integer isoperation, Long patid) {
+ if (isoperation == 1) {
+ svyTaskSingle.setSendstate(1L);
+ svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
+ } else if (isoperation == 2) svyTaskSingleMapper.updateSvyTaskSingle(svyTaskSingle);
+ else if (isoperation == 3) svyTaskSingleMapper.deleteSvyTaskcallByCondition(taskId, patid);
+ }
}
diff --git a/smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml b/smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml
index f4da9d9..1a941e4 100644
--- a/smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml
@@ -1,69 +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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.Icd10AssociationMapper">
-
+
<resultMap type="com.smartor.domain.Icd10Association" id="Icd10AssociationResult">
- <result property="icd10code" column="icd10code" />
- <result property="icd10name" column="icd10name" />
- <result property="svyid" column="svyid" />
- <result property="updatetime" column="updatetime" />
+ <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="selectIcd10AssociationVo">
- select icd10code, icd10name, svyid, updatetime from icd10_association
+ select id,
+ icd10id,
+ icd10code,
+ icd10name,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ type,
+ outid,
+ pid,
+ guid
+ from icd10_association
</sql>
- <select id="selectIcd10AssociationList" parameterType="com.smartor.domain.Icd10Association" resultMap="Icd10AssociationResult">
+ <select id="selectIcd10AssociationList" parameterType="com.smartor.domain.Icd10Association"
+ resultMap="Icd10AssociationResult">
<include refid="selectIcd10AssociationVo"/>
- <where>
- <if test="icd10code != null and icd10code != ''"> and icd10code = #{icd10code}</if>
- <if test="icd10name != null and icd10name != ''"> and icd10name like concat('%', #{icd10name}, '%')</if>
- <if test="svyid != null "> and svyid = #{svyid}</if>
- <if test="updatetime != null "> and updatetime = #{updatetime}</if>
+ <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="selectIcd10AssociationByIcd10code" parameterType="String" resultMap="Icd10AssociationResult">
+
+ <select id="selectIcd10AssociationById" parameterType="Long" resultMap="Icd10AssociationResult">
<include refid="selectIcd10AssociationVo"/>
- where icd10code = #{icd10code}
+ where id = #{id}
</select>
-
- <insert id="insertIcd10Association" parameterType="com.smartor.domain.Icd10Association">
+
+ <insert id="insertIcd10Association" parameterType="com.smartor.domain.Icd10Association" useGeneratedKeys="true"
+ keyProperty="id">
insert into icd10_association
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="icd10code != null and icd10code != ''">icd10code,</if>
+ <if test="icd10id != null">icd10id,</if>
+ <if test="icd10code != null">icd10code,</if>
<if test="icd10name != null">icd10name,</if>
- <if test="svyid != null">svyid,</if>
- <if test="updatetime != null">updatetime,</if>
- </trim>
+ <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="icd10code != null and icd10code != ''">#{icd10code},</if>
+ <if test="icd10id != null">#{icd10id},</if>
+ <if test="icd10code != null">#{icd10code},</if>
<if test="icd10name != null">#{icd10name},</if>
- <if test="svyid != null">#{svyid},</if>
- <if test="updatetime != null">#{updatetime},</if>
- </trim>
+ <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="updateIcd10Association" parameterType="Icd10Association">
+ <update id="updateIcd10Association" parameterType="com.smartor.domain.Icd10Association">
update icd10_association
<trim prefix="SET" suffixOverrides=",">
- <if test="icd10name != null">icd10name = #{icd10name},</if>
- <if test="svyid != null">svyid = #{svyid},</if>
- <if test="updatetime != null">updatetime = #{updatetime},</if>
+ <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 icd10code = #{icd10code}
+ where id = #{id}
</update>
- <delete id="deleteIcd10AssociationByIcd10code" parameterType="String">
- delete from icd10_association where icd10code = #{icd10code}
+ <delete id="deleteIcd10AssociationById" parameterType="Long">
+ delete
+ from icd10_association
+ where id = #{id}
</delete>
- <delete id="deleteIcd10AssociationByIcd10codes" parameterType="String">
- delete from icd10_association where icd10code in
- <foreach item="icd10code" collection="array" open="(" separator="," close=")">
- #{icd10code}
+ <delete id="deleteIcd10AssociationByIds" parameterType="String">
+ delete from icd10_association where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaOutIcd10Mapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaOutIcd10Mapper.xml
deleted file mode 100644
index 63ec04e..0000000
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaOutIcd10Mapper.xml
+++ /dev/null
@@ -1,138 +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.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/SvyLibTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
index d94cfbd..6fdf155 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -73,16 +73,46 @@
<select id="selectSvyLibTemplateList" parameterType="com.smartor.domain.SvyLibTemplateReq"
resultMap="SvyLibTemplateResult">
- select a.svyid, a.categoryid, a.svycode, a.svyname, a.description, a.introduce,a.submitprompt, a.templateid,
- a.version,a.centerlibrarycode, a.centerlibraryid, a.islocal, a.isenable, a.orgid, a.del_flag, a.create_by,
- a.create_time, a.update_by, a.update_time, a.isupload,
- a.upload_time,a.dept_names,a.value_type,a.label_info,a.reply,
- a.campus,a.suitway,a.script_score,a.score_type,a.otherdata
- ,c.icdname from svy_lib_template
- a,icd10_association b,icd10 c
+ SELECT
+ a.svyid,
+ a.categoryid,
+ a.svycode,
+ a.svyname,
+ a.description,
+ a.introduce,
+ a.submitprompt,
+ a.templateid,
+ a.version,
+ a.centerlibrarycode,
+ a.centerlibraryid,
+ a.islocal,
+ a.isenable,
+ a.orgid,
+ a.del_flag,
+ a.create_by,
+ a.create_time,
+ a.update_by,
+ a.update_time,
+ a.isupload,
+ a.upload_time,
+ a.dept_names,
+ a.value_type,
+ a.label_info,
+ a.reply,
+ a.campus,
+ a.suitway,
+ a.script_score,
+ a.score_type,
+ a.otherdata,
+ b.icd10code,
+ b.icd10name
+ FROM
+ svy_lib_template a
+ JOIN (select outid,GROUP_CONCAT(icd10code) as icd10code,GROUP_CONCAT(icd10name) as icd10name from
+ icd10_association group by outid) b ON a.del_flag = 0
+ AND a.svyid = b.outid
<where>
- a.del_flag=0 and
- a.svyid=b.SVYID and b.ICD10CODE=c.icdcode
+ a.del_flag=0
<if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
<if test="svyid != null ">and a.svyid = #{svyid}</if>
<if test="svyname != null and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml
index 717664c..220ac30 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml
@@ -21,7 +21,7 @@
<result property="targetregex2" column="targetregex2"/>
<result property="dynamiccruxsJson" column="dynamiccruxs"/>
<result property="nodynamiccruxsJson" column="nodynamiccruxs"/>
- <result property="optiondesc" column="optiondesc"/>
+ <result property="optioncontent" column="optioncontent"/>
<result property="nextQuestion" column="next_question"/>
<result property="language" column="language"/>
<result property="version" column="version"/>
@@ -36,11 +36,13 @@
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="picturePath" column="picture_path"/>
+ <result property="score" column="score"/>
</resultMap>
<sql id="selectSvyLibTemplateTargetoptionVo">
select id,
groupid,
+ score,
categoryName,
scriptid,
templateID,
@@ -55,7 +57,7 @@
targetregex2,
dynamiccruxs,
nodynamiccruxs,
- optiondesc,
+ optioncontent,
next_question, language, version, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, picture_path
from svy_lib_template_targetoption
</sql>
@@ -84,7 +86,7 @@
<if test="nodynamiccruxsJson != null and nodynamiccruxsJson != ''">and nodynamiccruxs =
#{nodynamiccruxsJson}
</if>
- <if test="optiondesc != null and optiondesc != ''">and optiondesc = #{optiondesc}</if>
+ <if test="optioncontent != null and optioncontent != ''">and optioncontent = #{optioncontent}</if>
<if test="nextQuestion != null ">and next_question = #{nextQuestion}</if>
<if test="language != null and language != ''">and language = #{language}</if>
<if test="version != null and version != ''">and version = #{version}</if>
@@ -93,6 +95,7 @@
<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="score != null and score != ''">and score = #{score}</if>
<if test="picturePath != null and picturePath != ''">and picture_path = #{picturePath}</if>
</where>
</select>
@@ -121,7 +124,7 @@
<if test="targetregex2 != null">targetregex2,</if>
<if test="dynamiccruxs != null">dynamiccruxs,</if>
<if test="nodynamiccruxs != null">nodynamiccruxs,</if>
- <if test="optiondesc != null">optiondesc,</if>
+ <if test="optioncontent != null">optioncontent,</if>
<if test="nextQuestion != null">next_question,</if>
<if test="language != null">language,</if>
<if test="version != null">version,</if>
@@ -136,6 +139,7 @@
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="picturePath != null">picture_path,</if>
+ <if test="score != null">score,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="groupid != null">#{groupid},</if>
@@ -153,7 +157,7 @@
<if test="targetregex2 != null">#{targetregex2},</if>
<if test="dynamiccruxs != null">#{dynamiccruxsJson},</if>
<if test="nodynamiccruxs != null">#{nodynamiccruxsJson},</if>
- <if test="optiondesc != null">#{optiondesc},</if>
+ <if test="optioncontent != null">#{optioncontent},</if>
<if test="nextQuestion != null">#{nextQuestion},</if>
<if test="language != null">#{language},</if>
<if test="version != null">#{version},</if>
@@ -168,6 +172,7 @@
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="picturePath != null">#{picturePath},</if>
+ <if test="score != null">#{score},</if>
</trim>
</insert>
@@ -189,7 +194,7 @@
<if test="targetregex2 != null">targetregex2 = #{targetregex2},</if>
<if test="dynamiccruxs != null">dynamiccruxs = #{dynamiccruxsJson},</if>
<if test="nodynamiccruxs != null">nodynamiccruxs = #{nodynamiccruxsJson},</if>
- <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
+ <if test="optioncontent != null">optioncontent = #{optioncontent},</if>
<if test="nextQuestion != null">next_question = #{nextQuestion},</if>
<if test="language != null">language = #{language},</if>
<if test="version != null">version = #{version},</if>
@@ -204,6 +209,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="picturePath != null">picture_path = #{picturePath},</if>
+ <if test="score != null">score = #{score},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
index 63918a0..6d2da2b 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
@@ -7,7 +7,7 @@
<resultMap type="com.smartor.domain.SvyTask" id="SvyTaskResult">
<result property="taskid" column="taskid"/>
<result property="svrtaskid" column="svrtaskid"/>
- <result property="taskname" column="taskname"/>
+ <result property="taskName" column="task_name"/>
<result property="templateid" column="templateid"/>
<result property="templatename" column="templatename"/>
<result property="labelinfo" column="labelinfo"/>
@@ -51,6 +51,7 @@
<result property="sendTimeSlot" column="send_time_slot"/>
<result property="libtemplateid" column="libtemplateid"/>
<result property="libtemplatename" column="libtemplatename"/>
+ <result property="taskDesc" column="task_desc"/>
</resultMap>
<sql id="selectSvyTaskVo">
@@ -59,13 +60,14 @@
libtemplateid,
libtemplatename,
show_date,
+ task_desc,
show_time_morn,
show_time_noon,
show_time_night,
stop_state,
svrtaskid,
text_param,
- taskname,
+ task_name,
templateid,
templatename,
labelinfo,
@@ -107,7 +109,7 @@
<include refid="selectSvyTaskVo"/>
<where>
<if test="svrtaskid != null ">and svrtaskid = #{svrtaskid}</if>
- <if test="taskname != null and taskname != ''">and taskname like concat('%', #{taskname}, '%')</if>
+ <if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
<if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
<if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
'%')
@@ -160,7 +162,7 @@
insert into svy_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="svrtaskid != null">svrtaskid,</if>
- <if test="taskname != null">taskname,</if>
+ <if test="taskName != null">task_name,</if>
<if test="templateid != null">templateid,</if>
<if test="templatename != null">templatename,</if>
<if test="labelinfo != null">labelinfo,</if>
@@ -204,10 +206,11 @@
<if test="showTimeMorn != null and showTimeMorn != ''">show_time_morn,</if>
<if test="libtemplateid != null ">libtemplateid,</if>
<if test="libtemplatename != null and libtemplatename != ''">libtemplatename,</if>
+ <if test="taskDesc != null and taskDesc != ''">task_desc,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="svrtaskid != null">#{svrtaskid},</if>
- <if test="taskname != null">#{taskname},</if>
+ <if test="taskName != null">#{taskName},</if>
<if test="templateid != null">#{templateid},</if>
<if test="templatename != null">#{templatename},</if>
<if test="labelinfo != null">#{labelinfo},</if>
@@ -251,6 +254,7 @@
<if test="showTimeMorn != null and showTimeMorn != ''">#{showTimeMorn},</if>
<if test="libtemplateid != null ">#{libtemplateid},</if>
<if test="libtemplatename != null and libtemplatename != ''">#{libtemplatename},</if>
+ <if test="taskDesc != null and taskDesc != ''">#{taskDesc},</if>
</trim>
</insert>
@@ -258,7 +262,7 @@
update svy_task
<trim prefix="SET" suffixOverrides=",">
<if test="svrtaskid != null">svrtaskid = #{svrtaskid},</if>
- <if test="taskname != null">taskname = #{taskname},</if>
+ <if test="taskName != null">task_name = #{taskName},</if>
<if test="templateid != null">templateid = #{templateid},</if>
<if test="templatename != null">templatename = #{templatename},</if>
<if test="labelinfo != null">labelinfo = #{labelinfo},</if>
@@ -302,6 +306,7 @@
<if test="showTimeMorn != null and showTimeMorn != ''">show_time_morn=#{showTimeMorn},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null and libtemplatename != ''">libtemplatename = #{libtemplatename},</if>
+ <if test="taskDesc != null and taskDesc != ''">task_desc=#{taskDesc},</if>
</trim>
where taskid = #{taskid}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml
index b77c87f..dd787d7 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml
@@ -192,7 +192,7 @@
<if test="medicalRecordNo != null and medicalRecordNo != ''">and medical_record_no = #{medicalRecordNo}
</if>
<if test="preachcontent != null and preachcontent != ''">and preachcontent = #{preachcontent}</if>
- <if test="sendType != null and sendType != ''">and send_type = #{sendType}</if>
+ <if test="sendType != null ">and send_type = #{sendType}</if>
<if test="sendTimeSlot != null and sendTimeSlot != ''">and send_time_slot = #{sendTimeSlot}</if>
<if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
<if test="taskDesc != null and taskDesc != ''">and task_desc = #{taskDesc}</if>
@@ -420,7 +420,7 @@
<if test="bedno != null">bedno = #{bedno},</if>
<if test="patid != null">patid = #{patid},</if>
</trim>
- where id = #{id}
+ where patid = #{patid} and taskid = #{taskid}
</update>
<delete id="deleteSvyTaskSingleById" parameterType="Long">
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
index 19c0318..e42a465 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
@@ -15,7 +15,7 @@
<result property="targetvalue" column="targetvalue" />
<result property="targetregex2" column="targetregex2" />
<result property="targetregex" column="targetregex" />
- <result property="optiondesc" column="optiondesc" />
+ <result property="optioncontent" column="optioncontent" />
<result property="language" column="language" />
<result property="version" column="version" />
<result property="groupid" column="groupid" />
@@ -40,10 +40,10 @@
</resultMap>
<sql id="selectSvyTaskTemplateTargetoptionVo">
- select id, taskid, templateID, targetid, targetname, targettype, categoryName, targetvalue, targetregex2, targetregex, optiondesc, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, scriptid, nodynamiccruxs, dynamiccruxs, next_question, picture_path from svy_task_template_targetoption
+ select id, taskid, templateID, targetid, targetname, targettype, categoryName, targetvalue, targetregex2, targetregex, optioncontent, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, scriptid, nodynamiccruxs, dynamiccruxs, next_question, picture_path from svy_task_template_targetoption
</sql>
- <select id="selectSvyTaskTemplateTargetoptionList" parameterType="SvyTaskTemplateTargetoption" resultMap="SvyTaskTemplateTargetoptionResult">
+ <select id="selectSvyTaskTemplateTargetoptionList" parameterType="com.smartor.domain.SvyTaskTemplateTargetoption" resultMap="SvyTaskTemplateTargetoptionResult">
<include refid="selectSvyTaskTemplateTargetoptionVo"/>
<where>
<if test="taskid != null "> and taskid = #{taskid}</if>
@@ -55,7 +55,7 @@
<if test="targetvalue != null and targetvalue != ''"> and targetvalue = #{targetvalue}</if>
<if test="targetregex2 != null and targetregex2 != ''"> and targetregex2 = #{targetregex2}</if>
<if test="targetregex != null and targetregex != ''"> and targetregex = #{targetregex}</if>
- <if test="optiondesc != null and optiondesc != ''"> and optiondesc = #{optiondesc}</if>
+ <if test="optioncontent != null and optioncontent != ''"> and optioncontent = #{optioncontent}</if>
<if test="language != null and language != ''"> and language = #{language}</if>
<if test="version != null and version != ''"> and version = #{version}</if>
<if test="groupid != null and groupid != ''"> and groupid = #{groupid}</if>
@@ -92,7 +92,7 @@
<if test="targetvalue != null">targetvalue,</if>
<if test="targetregex2 != null">targetregex2,</if>
<if test="targetregex != null">targetregex,</if>
- <if test="optiondesc != null">optiondesc,</if>
+ <if test="optioncontent != null">optioncontent,</if>
<if test="language != null">language,</if>
<if test="version != null">version,</if>
<if test="groupid != null">groupid,</if>
@@ -125,7 +125,7 @@
<if test="targetvalue != null">#{targetvalue},</if>
<if test="targetregex2 != null">#{targetregex2},</if>
<if test="targetregex != null">#{targetregex},</if>
- <if test="optiondesc != null">#{optiondesc},</if>
+ <if test="optioncontent != null">#{optioncontent},</if>
<if test="language != null">#{language},</if>
<if test="version != null">#{version},</if>
<if test="groupid != null">#{groupid},</if>
@@ -162,7 +162,7 @@
<if test="targetvalue != null">targetvalue = #{targetvalue},</if>
<if test="targetregex2 != null">targetregex2 = #{targetregex2},</if>
<if test="targetregex != null">targetregex = #{targetregex},</if>
- <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
+ <if test="optioncontent != null">optioncontent = #{optioncontent},</if>
<if test="language != null">language = #{language},</if>
<if test="version != null">version = #{version},</if>
<if test="groupid != null">groupid = #{groupid},</if>
--
Gitblit v1.9.3