From 718bd7efbc0d959d0b9050c34be2fd639a1f74b6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 二月 2025 18:03:27 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java              |   30 
 smartor/src/main/java/com/smartor/domain/Icd10.java                                         |   12 
 smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java                                 |    7 
 smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml                             |   10 
 smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml                                   |   91 ++-
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java |   26 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java   |    2 
 smartor/src/main/resources/mapper/smartor/BaseDictOperationMapper.xml                       |  433 +++++++++---------
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java                                |   26 +
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java               |  155 ++++--
 ruoyi-admin/src/main/resources/application-druid.yml                                        |   12 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java   |    2 
 smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml                         |  325 +++++++------
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java       |   38 +
 smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java                               |   83 ++-
 smartor/src/main/java/com/smartor/domain/BaseDictOperation.java                             |  103 ++-
 16 files changed, 782 insertions(+), 573 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
index 38490eb..070221f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseDictOperationController.java
@@ -1,9 +1,12 @@
 package com.ruoyi.web.controller.smartor;
 
 import java.util.List;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,8 +35,7 @@
 @Api("鎵嬫湳鍩虹淇℃伅")
 @RestController
 @RequestMapping("/smartor/baseopera")
-public class BaseDictOperationController extends BaseController
-{
+public class BaseDictOperationController extends BaseController {
     @Autowired
     private IBaseDictOperationService baseDictOperationService;
 
@@ -43,8 +45,7 @@
     @ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞瓙鍒楄〃")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
     @PostMapping("/list")
-    public TableDataInfo list(BaseDictOperation baseDictOperation)
-    {
+    public TableDataInfo list(@RequestBody BaseDictOperation baseDictOperation) {
         startPage();
         List<BaseDictOperation> list = baseDictOperationService.selectBaseDictOperationList(baseDictOperation);
         return getDataTable(list);
@@ -57,8 +58,7 @@
     //@PreAuthorize("@ss.hasPermi('smartor:operation:export')")
     @Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BaseDictOperation baseDictOperation)
-    {
+    public void export(HttpServletResponse response, BaseDictOperation baseDictOperation) {
         List<BaseDictOperation> list = baseDictOperationService.selectBaseDictOperationList(baseDictOperation);
         ExcelUtil<BaseDictOperation> util = new ExcelUtil<BaseDictOperation>(BaseDictOperation.class);
         util.exportExcel(response, list, "鎮ｈ�呮鏌ユ楠岃褰曞瓙鏁版嵁");
@@ -70,8 +70,7 @@
     @ApiOperation("鑾峰彇鎮ｈ�呮鏌ユ楠岃褰曞瓙璇︾粏淇℃伅")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:query')")
     @GetMapping(value = "/getInfo/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(baseDictOperationService.selectBaseDictOperationById(id));
     }
 
@@ -82,8 +81,7 @@
     //@PreAuthorize("@ss.hasPermi('smartor:operation:add')")
     @Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody BaseDictOperation baseDictOperation)
-    {
+    public AjaxResult add(@RequestBody BaseDictOperation baseDictOperation) {
         return toAjax(baseDictOperationService.insertBaseDictOperation(baseDictOperation));
     }
 
@@ -94,8 +92,7 @@
     //@PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
     @Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody BaseDictOperation baseDictOperation)
-    {
+    public AjaxResult edit(@RequestBody BaseDictOperation baseDictOperation) {
         return toAjax(baseDictOperationService.updateBaseDictOperation(baseDictOperation));
     }
 
@@ -105,9 +102,8 @@
     @ApiOperation("鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰曞瓙")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:remove')")
     @Log(title = "鎮ｈ�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.DELETE)
-	@GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(baseDictOperationService.deleteBaseDictOperationByIds(ids));
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index 43786ea..a50c0e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -84,18 +84,32 @@
 
         if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
             for (ServiceTaskVO ServiceTaskVO : serviceTaskVOS) {
-                ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
-                serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
-                serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
-                serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
-                List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
-                if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
-                    //宸插彂閫�
-                    long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
-                    //鏈彂閫�
-                    long wfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
-                    ServiceTaskVO.setYfs(yfs);
-                    ServiceTaskVO.setWfs(wfs);
+                if (serviceTask.getAppltype().equals("1") || serviceTask.getAppltype().equals("2")) {
+                    ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+                    serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
+                    serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
+                    serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
+                    List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
+                    if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
+                        //宸插彂閫�
+                        long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
+                        //鏈彂閫�
+                        long wfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
+                        ServiceTaskVO.setYfs(yfs);
+                        ServiceTaskVO.setWfs(wfs);
+                    }
+                } else if (serviceTask.getAppltype().equals("3") || serviceTask.getAppltype().equals("4")) {
+                    ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+                    serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
+                    List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
+                    if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
+                        //宸插彂閫�
+                        long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
+                        //鏈彂閫�
+                        long wfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
+                        ServiceTaskVO.setYfs(yfs);
+                        ServiceTaskVO.setWfs(wfs);
+                    }
                 }
             }
             //鑾峰彇total
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
index 03dae7c..189d684 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
@@ -29,7 +29,7 @@
  * @author lihu
  * @date 2025-02-24
  */
-@Api("妯℃澘绉戝鍏宠仈")
+@Api("璇婃柇妯℃澘绉戝鍏宠仈")
 @RestController
 @RequestMapping("/smartor/taskdiag")
 public class ServiceTaskdiagController extends BaseController
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
index df4a3da..95bfa2e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
@@ -29,7 +29,7 @@
  * @author lihu
  * @date 2025-02-25
  */
-@Api("妯℃澘绉戝鍏宠仈")
+@Api("鎵嬫湳妯℃澘绉戝鍏宠仈")
 @RestController
 @RequestMapping("/smartor/taskoper")
 public class ServiceTaskoperController extends BaseController
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index b9380a5..ebc02bd 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -14,14 +14,14 @@
         #        url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         #        涓芥按
 #        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-      #        username: smartor
-      #        password: Smartor.2023
-      #        driverClassName: com.mysql.cj.jdbc.Driver
+#        username: smartor
+#        password: Smartor.2023
+#        driverClassName: com.mysql.cj.jdbc.Driver
         # 鏂板崕
 #        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        #        username: smartor
-        #        password: Smartor.2023
-        #        driverClassName: com.mysql.cj.jdbc.Driver
+#        username: smartor
+#        password: Smartor.2023
+#        driverClassName: com.mysql.cj.jdbc.Driver
 
         #        鍏徃浜�
         url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index ab247f4..ad7ae73 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -366,8 +366,30 @@
                     //绾歌川
                 } else if (descByCode.equals("寰俊灏忕▼搴�")) {
                     //寰俊灏忕▼搴�
-                    for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
-                        log.error("寰俊灏忕▼搴忔湡浠诲姟鍙戦��---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
+                    if (ivrTask1.getPatCycle() == 1) {
+                        //璇存槑璇ヤ换鍔＄殑鎮ｈ�呮槸寰幆鎵ц鐨�
+                        ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+                        serviceSubtaskVO.setTaskid(ivrTask1.getTaskid());
+                        List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+                        //杩欓噷闇�瑕佹牴鎹韩浠借瘉鍘婚噸
+                        List<ServiceSubtask> serviceSubtaskListFilter = new ArrayList<>();
+                        aa:
+                        for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+                            for (ServiceSubtask ss : serviceSubtaskListFilter) {
+                                if (ss.getSfzh().equals(serviceSubtask.getSfzh())) {
+                                    continue aa;
+                                }
+                            }
+                            serviceSubtaskListFilter.add(serviceSubtask);
+                        }
+                        for (ServiceSubtask serviceSubtask : serviceSubtaskListFilter) {
+                            //灏嗗瓙浠诲姟ID鍒犻櫎 銆乻endstate鏀规垚3
+                            serviceSubtask.setSendstate(3L);
+                            serviceSubtask.setId(null);
+                            serviceSubtask.setCreateTime(new Date());
+                            serviceSubtask.setUpdateTime(new Date());
+                            serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+                        }
                     }
                 } else if (descByCode.equals("鐭俊")) {
                     RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
diff --git a/smartor/src/main/java/com/smartor/domain/BaseDictOperation.java b/smartor/src/main/java/com/smartor/domain/BaseDictOperation.java
index 5099800..87f0132 100644
--- a/smartor/src/main/java/com/smartor/domain/BaseDictOperation.java
+++ b/smartor/src/main/java/com/smartor/domain/BaseDictOperation.java
@@ -17,89 +17,120 @@
  */
 @Data
 @ApiModel("鎮ｈ�呮鏌ユ楠岃褰曞瓙")
-public class BaseDictOperation extends BaseEntity
-        {
-private static final long serialVersionUID = 1L;
+public class BaseDictOperation extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 鑷ID */
+    /**
+     * 鑷ID
+     */
     @ApiModelProperty("鑷ID")
-        //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+    //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
     private Long id;
 
-    /** his鎵嬫湳id */
+    /**
+     * his鎵嬫湳id
+     */
     @ApiModelProperty("his鎵嬫湳id")
-            @Excel(name = "his鎵嬫湳id")
+    @Excel(name = "his鎵嬫湳id")
     private Long opid;
 
-    /** 鎵嬫湳鍚嶇ОID */
+    /**
+     * 鎵嬫湳鍚嶇ОID
+     */
     @ApiModelProperty("鎵嬫湳鍚嶇ОID")
-            @Excel(name = "鎵嬫湳鍚嶇ОID")
+    @Excel(name = "鎵嬫湳鍚嶇ОID")
     private String opcode;
 
-    /** 鎵嬫湳鍚嶇О */
+    /**
+     * 鎵嬫湳鍚嶇О
+     */
     @ApiModelProperty("鎵嬫湳鍚嶇О")
-            @Excel(name = "鎵嬫湳鍚嶇О")
+    @Excel(name = "鎵嬫湳鍚嶇О")
     private String opdesc;
 
-    /** 鍒囧彛绫诲埆浠ｇ爜 */
+    /**
+     * 鍒囧彛绫诲埆浠ｇ爜
+     */
     @ApiModelProperty("鍒囧彛绫诲埆浠ｇ爜")
-            @Excel(name = "鍒囧彛绫诲埆浠ｇ爜")
+    @Excel(name = "鍒囧彛绫诲埆浠ｇ爜")
     private String incitypecode;
 
-    /** 鍒囧彛绫诲埆鍚嶇О */
+    /**
+     * 鍒囧彛绫诲埆鍚嶇О
+     */
     @ApiModelProperty("鍒囧彛绫诲埆鍚嶇О")
-            @Excel(name = "鍒囧彛绫诲埆鍚嶇О")
+    @Excel(name = "鍒囧彛绫诲埆鍚嶇О")
     private String incitypedesc;
 
-    /** 鎵嬫湳绾у埆浠ｇ爜 */
+    /**
+     * 鎵嬫湳绾у埆浠ｇ爜
+     */
     @ApiModelProperty("鎵嬫湳绾у埆浠ｇ爜")
-            @Excel(name = "鎵嬫湳绾у埆浠ｇ爜")
+    @Excel(name = "鎵嬫湳绾у埆浠ｇ爜")
     private String oplevelcode;
 
-    /** 鎵嬫湳绾у埆鍚嶇О */
+    /**
+     * 鎵嬫湳绾у埆鍚嶇О
+     */
     @ApiModelProperty("鎵嬫湳绾у埆鍚嶇О")
-            @Excel(name = "鎵嬫湳绾у埆鍚嶇О")
+    @Excel(name = "鎵嬫湳绾у埆鍚嶇О")
     private String opleveldesc;
 
-    /** 鎵嬫湳閮ㄤ綅 */
+    /**
+     * 鎵嬫湳閮ㄤ綅
+     */
     @ApiModelProperty("鎵嬫湳閮ㄤ綅")
-            @Excel(name = "鎵嬫湳閮ㄤ綅")
+    @Excel(name = "鎵嬫湳閮ㄤ綅")
     private String opposition;
 
-    /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+    /**
+     * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+     */
     @ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
     private String delFlag;
 
-    /** 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛� */
+    /**
+     * 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�
+     */
     @ApiModelProperty("涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�")
-            @Excel(name = "涓婁紶鏍囧織", readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
+    @Excel(name = "涓婁紶鏍囧織", readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
     private Long isupload;
 
-    /** 涓婁紶鏃堕棿 */
+    /**
+     * 涓婁紶鏃堕棿
+     */
     @ApiModelProperty("涓婁紶鏃堕棿")
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-            @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date uploadTime;
 
-    /** 鍖婚櫌鏈烘瀯ID */
+    /**
+     * 鍖婚櫌鏈烘瀯ID
+     */
     @ApiModelProperty("鍖婚櫌鏈烘瀯ID")
-            @Excel(name = "鍖婚櫌鏈烘瀯ID")
+    @Excel(name = "鍖婚櫌鏈烘瀯ID")
     private String orgid;
 
-    /** 鐖禛UID */
+    /**
+     * 鐖禛UID
+     */
     @ApiModelProperty("鐖禛UID")
-            @Excel(name = "鐖禛UID")
+    @Excel(name = "鐖禛UID")
     private String pguid;
 
-    /** GUID */
+    /**
+     * GUID
+     */
     @ApiModelProperty("GUID")
-            @Excel(name = "GUID")
+    @Excel(name = "GUID")
     private String guid;
 
-    /** 鐖禝D */
+    /**
+     * 鐖禝D
+     */
     @ApiModelProperty("鐖禝D")
-            @Excel(name = "鐖禝D")
+    @Excel(name = "鐖禝D")
     private Long pid;
 
-        }
+}
 
diff --git a/smartor/src/main/java/com/smartor/domain/Icd10.java b/smartor/src/main/java/com/smartor/domain/Icd10.java
index faf983c..3d7f303 100644
--- a/smartor/src/main/java/com/smartor/domain/Icd10.java
+++ b/smartor/src/main/java/com/smartor/domain/Icd10.java
@@ -92,5 +92,17 @@
     @ApiModelProperty("pageSize")
     private Integer pageSize;
 
+    /**
+     * 鏈骇鏍囧織
+     */
+    @ApiModelProperty("lastflag")
+    private String lastflag;
+
+    /**
+     * 涓尰鏍囧織
+     */
+    @ApiModelProperty("chimedflag")
+    private String chimedflag;
+
 
 }
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index e9a8499..c2cbc01 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -402,4 +402,11 @@
     @ApiModelProperty("鎵嬫湳鍚嶇О")
     @Excel(name = "鎵嬫湳鍚嶇О")
     private String opdesc;
+
+    /**
+     * 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷
+     */
+    @ApiModelProperty("閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
+    @Excel(name = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
+    private String appltype;
 }
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java
index ffc8dcc..b3e76f2 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java
@@ -14,73 +14,98 @@
  */
 @Data
 @ApiModel("妯℃澘绉戝鍏宠仈")
-public class ServiceTaskdiag extends BaseEntity
-        {
-private static final long serialVersionUID = 1L;
+public class ServiceTaskdiag extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 妯℃澘搴撳拰绉戝鍏宠仈id */
+    /**
+     * 妯℃澘搴撳拰绉戝鍏宠仈id
+     */
     @ApiModelProperty("妯℃澘搴撳拰绉戝鍏宠仈id")
-        //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+    //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
     private Long id;
 
-    /** 浠诲姟id */
+    /**
+     * 浠诲姟id
+     */
     @ApiModelProperty("浠诲姟id")
-            @Excel(name = "浠诲姟id")
+    @Excel(name = "浠诲姟id")
     private Long taskId;
 
-    /** 鏄惁鏄暱鏈熸ā鏉匡細  0锛氫笉鏄�    1锛氭槸 */
+    /**
+     * 鏄惁鏄暱鏈熸ā鏉匡細  0锛氫笉鏄�    1锛氭槸
+     */
     @ApiModelProperty("鏄惁鏄暱鏈熸ā鏉匡細  0锛氫笉鏄�    1锛氭槸")
-            @Excel(name = "鏄惁鏄暱鏈熸ā鏉匡細  0锛氫笉鏄�    1锛氭槸")
+    @Excel(name = "鏄惁鏄暱鏈熸ā鏉匡細  0锛氫笉鏄�    1锛氭槸")
     private Long longtask;
 
-    /** 浠诲姟鍚嶇О */
+    /**
+     * 浠诲姟鍚嶇О
+     */
     @ApiModelProperty("浠诲姟鍚嶇О")
-            @Excel(name = "浠诲姟鍚嶇О")
+    @Excel(name = "浠诲姟鍚嶇О")
     private String taskName;
 
-    /** 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡) */
+    /**
+     * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+     */
     @ApiModelProperty("鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
-            @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
+    @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
     private String serviceType;
 
-    /** 绉戝id */
+    /**
+     * 绉戝id
+     */
     @ApiModelProperty("绉戝id")
-            @Excel(name = "绉戝id")
+    @Excel(name = "绉戝id")
     private Long icd10id;
 
-    /** 閮ㄩ棬缂栫爜 */
+    /**
+     * 閮ㄩ棬缂栫爜
+     */
     @ApiModelProperty("閮ㄩ棬缂栫爜")
-            @Excel(name = "閮ㄩ棬缂栫爜")
+    @Excel(name = "閮ㄩ棬缂栫爜")
     private String icd10code;
 
-    /** 閮ㄩ棬鍚嶇О */
+    /**
+     * 閮ㄩ棬鍚嶇О
+     */
     @ApiModelProperty("閮ㄩ棬鍚嶇О")
-            @Excel(name = "閮ㄩ棬鍚嶇О")
+    @Excel(name = "閮ㄩ棬鍚嶇О")
     private String icd10name;
 
-    /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+    /**
+     * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+     */
     @ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
     private Integer delFlag;
 
-    /** 鍖婚櫌鏈烘瀯ID */
+    /**
+     * 鍖婚櫌鏈烘瀯ID
+     */
     @ApiModelProperty("鍖婚櫌鏈烘瀯ID")
-            @Excel(name = "鍖婚櫌鏈烘瀯ID")
+    @Excel(name = "鍖婚櫌鏈烘瀯ID")
     private String orgid;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
-            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String guid;
 
-    /** 鐖禛UID */
+    /**
+     * 鐖禛UID
+     */
     @ApiModelProperty("鐖禛UID")
-            @Excel(name = "鐖禛UID")
+    @Excel(name = "鐖禛UID")
     private String pguid;
 
-    /** 鐖禝D */
+    /**
+     * 鐖禝D
+     */
     @ApiModelProperty("鐖禝D")
-            @Excel(name = "鐖禝D")
+    @Excel(name = "鐖禝D")
     private Long pid;
 
-        }
+}
 
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 30ea393..81ba025 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -49,7 +49,7 @@
     @Autowired
     private PatMedOperationItemMapper patMedOperationItemMapper;
     @Autowired
-    private Icd10AssociationMapper icd10AssociationMapper;
+    private Icd10Mapper icd10Mapper;
 
     @Value("${defaultPwd}")
     private String defaultPwd;
@@ -337,20 +337,20 @@
         Map yeWuXX = (Map) dataMap.get("YeWuXX");
         Map<String, Object> JiBing = (Map<String, Object>) yeWuXX.get("JiBing");
         ExternalDiseaseInfo externalDiseaseInfo = BeanUtil.mapToBean(JiBing, ExternalDiseaseInfo.class, true);
-        Icd10Association icd10Association = new Icd10Association();
-        icd10Association.setIcd10code(externalDiseaseInfo.getJiBingID());
-        icd10Association.setIcd10name(externalDiseaseInfo.getJiBingMC());
-        icd10Association.setGuid(externalDiseaseInfo.getZuZhiJGID());
-        icd10Association.setOrgid(externalDiseaseInfo.getZuZhiJGID());
-        icd10Association.setPid(externalDiseaseInfo.getFUJIBID());
-        icd10Association.setIcd10AssortCode(externalDiseaseInfo.getJiBingFLDM());
-        icd10Association.setIcd10AssortName(externalDiseaseInfo.getJiBingFLMC());
-        icd10Association.setChineseMedicineDiagnoseSign(externalDiseaseInfo.getZhongYiZDBZ());
-        icd10Association.setChineseMedicineDiagnoseAssortCode(externalDiseaseInfo.getZhongYiZDFLDM());
-        icd10Association.setChineseMedicineDiagnoseAssortName(externalDiseaseInfo.getZhongYiZDFLMC());
-        icd10Association.setOutpatientUseAssort(externalDiseaseInfo.getMenZhenSYBZ());
-        icd10Association.setInpatientUseAssort(externalDiseaseInfo.getZhuYuanSYBZ());
-        icd10AssociationMapper.insertIcd10Association(icd10Association);
+        Icd10 icd10 = new Icd10();
+        icd10.setIcdcode(externalDiseaseInfo.getJiBingID());
+        icd10.setIcdname(externalDiseaseInfo.getJiBingMC());
+        icd10.setGuid(externalDiseaseInfo.getZuZhiJGID());
+        icd10.setOrgid(externalDiseaseInfo.getZuZhiJGID());
+        icd10.setLastflag(externalDiseaseInfo.getMOJIBZ());
+        icd10.setChimedflag("" + externalDiseaseInfo.getZhongYiZDBZ());
+//        icd10Association.setIcd10AssortName(externalDiseaseInfo.getJiBingFLMC());
+//        icd10Association.setChineseMedicineDiagnoseSign(externalDiseaseInfo.getZhongYiZDBZ());
+//        icd10Association.setChineseMedicineDiagnoseAssortCode(externalDiseaseInfo.getZhongYiZDFLDM());
+//        icd10Association.setChineseMedicineDiagnoseAssortName(externalDiseaseInfo.getZhongYiZDFLMC());
+//        icd10Association.setOutpatientUseAssort(externalDiseaseInfo.getMenZhenSYBZ());
+//        icd10Association.setInpatientUseAssort(externalDiseaseInfo.getZhuYuanSYBZ());
+        icd10Mapper.insertIcd10(icd10);
         return true;
     }
 
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 3a3416b..fcb5559 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -383,37 +383,41 @@
             serviceTask.setTemplatename(tempName);
             serviceTask.setLeaveldeptcodes(serviceTaskVO.getLeaveldeptcodes());
             serviceTask.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
-            if (serviceTaskVO.getLongTask() == 1L) {
-                serviceTask.setSendState(2L);
-                serviceTaskService.insertServiceTask(serviceTask);
-                if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+            serviceTask.setSendState(2L);
+            serviceTaskService.insertServiceTask(serviceTask);
+            log.error("----serviceTaskVO.getAppltype()鐨勫�间负锛歿}", serviceTaskVO.getAppltype());
+            if (StringUtils.isNotEmpty(serviceTaskVO.getAppltype())) {
+                if (serviceTaskVO.getAppltype().equals("3")) {
                     ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
                     serviceTaskdiag.setTaskId(serviceTask.getTaskid());
                     serviceTaskdiag.setTaskName(serviceTask.getTaskName());
-                    serviceTaskdiag.setLongtask(1L);
+                    serviceTaskdiag.setLongtask(0L);
+                    if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
+                    serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
+                    serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
                     serviceTaskdiag.setGuid(serviceTask.getGuid());
                     serviceTaskdiag.setOrgid(serviceTask.getOrgid());
                     serviceTaskdiag.setCreateTime(new Date());
+                    log.error("----serviceTaskdiag鐨勫�间负锛歿}", serviceTaskdiag);
                     serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
-                } else if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
+                } else if (serviceTaskVO.getAppltype().equals("4")) {
                     ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
                     serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
                     serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
                     serviceTaskoper.setTaskId(serviceTask.getTaskid());
                     serviceTaskoper.setTaskName(serviceTask.getTaskName());
-                    serviceTaskoper.setLongtask(1L);
+                    serviceTaskoper.setLongtask(0L);
+                    if (serviceTaskVO.getLongTask() == 1) serviceTaskoper.setLongtask(1L);
                     serviceTaskoper.setGuid(serviceTask.getGuid());
                     serviceTaskoper.setOrgid(serviceTask.getOrgid());
                     serviceTaskoper.setCreateTime(new Date());
+                    log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
                     serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
                 } else {
                     ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                     serviceTaskdept.setTaskId(serviceTask.getTaskid());
                     serviceTaskdept.setTaskName(serviceTask.getTaskName());
-                    serviceTaskdept.setLongtask(1L);
-                    serviceTaskdept.setGuid(serviceTask.getGuid());
-                    serviceTaskdept.setOrgid(serviceTask.getOrgid());
-                    serviceTaskdept.setOrgid(serviceTask.getOrgid());
+                    serviceTaskdept.setLongtask(0L);
                     if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
                     if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
                         String[] deptcodes = serviceTaskVO.getDeptcode().split(",");
@@ -433,15 +437,12 @@
                             serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                         }
                     }
-
                 }
-                if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1 && serviceTaskVO.getPatCycle() == 0L) {
-                    Map<String, Integer> map = new HashMap<>();
-                    map.put("taskId", serviceTask.getTaskid().intValue());
-                    return map;
-                }
-            } else {
-                serviceTaskService.insertServiceTask(serviceTask);
+            }
+            if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1 && serviceTaskVO.getPatCycle() == 0L) {
+                Map<String, Integer> map = new HashMap<>();
+                map.put("taskId", serviceTask.getTaskid().intValue());
+                return map;
             }
 
             //灏嗕换鍔′俊鎭斁鍒版湇鍔¤〃涓�
@@ -497,46 +498,90 @@
             serviceTask.setTemplateid(serviceTaskVO.getTemplateid());
             serviceTask.setLongTask(serviceTaskVO.getLongTask());
             serviceTaskService.updateServiceTask(serviceTask);
-            ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
-            serviceTaskdept.setTaskId(serviceTask.getTaskid());
-            serviceTaskdept.setTaskName(serviceTask.getTaskName());
-            serviceTaskdept.setLongtask(0L);
-            if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
-            if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
-                String[] deptcodes = serviceTaskVO.getDeptcode().split(",");
-                for (String deptCode : deptcodes) {
-                    serviceTaskdept.setDeptCode(deptCode);
-                    serviceTaskdept.setDeptType("1");
-                    serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
-
-                    ServiceTaskdept st = new ServiceTaskdept();
-                    st.setDeptCode(deptCode);
-                    st.setTaskId(serviceTask.getTaskid());
-                    List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
-                    if (CollectionUtils.isEmpty(serviceTaskdepts)) {
-                        serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
-                    } else {
-                        serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
+            if (serviceTaskVO.getAppltype().equals("1") || serviceTaskVO.getAppltype().equals("2")) {
+                ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+                serviceTaskdept.setTaskId(serviceTask.getTaskid());
+                serviceTaskdept.setTaskName(serviceTask.getTaskName());
+                serviceTaskdept.setLongtask(0L);
+                if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
+                if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
+                    String[] deptcodes = serviceTaskVO.getDeptcode().split(",");
+                    for (String deptCode : deptcodes) {
+                        serviceTaskdept.setDeptCode(deptCode);
+                        serviceTaskdept.setDeptType("1");
+                        serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
+                        ServiceTaskdept st = new ServiceTaskdept();
+                        st.setDeptCode(deptCode);
+                        st.setTaskId(serviceTask.getTaskid());
+                        List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
+                        if (CollectionUtils.isEmpty(serviceTaskdepts)) {
+                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
+                        } else {
+                            serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
+                        }
                     }
                 }
-            }
-            if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
-                String[] leavehospitaldistrictcodes = serviceTaskVO.getLeavehospitaldistrictcode().split(",");
-                for (String districtcode : leavehospitaldistrictcodes) {
-                    serviceTaskdept.setDeptCode(districtcode);
-                    serviceTaskdept.setDeptType("2");
-                    serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
-                    //鍏堥�氳繃浠诲姟ID銆侀儴闂╟ode,鍒ゆ柇ServiceTaskdept鏄惁瀛樺湪锛屼笉瀛樺湪鍒欐柊澧烇紝瀛樺湪鍒欎慨鏀�
-                    ServiceTaskdept st = new ServiceTaskdept();
-                    st.setDeptCode(districtcode);
-                    st.setTaskId(serviceTask.getTaskid());
-                    List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
-                    if (CollectionUtils.isEmpty(serviceTaskdepts)) {
-                        serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
-                    } else {
-                        serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
+                if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
+                    String[] leavehospitaldistrictcodes = serviceTaskVO.getLeavehospitaldistrictcode().split(",");
+                    for (String districtcode : leavehospitaldistrictcodes) {
+                        serviceTaskdept.setDeptCode(districtcode);
+                        serviceTaskdept.setDeptType("2");
+                        serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
+                        //鍏堥�氳繃浠诲姟ID銆侀儴闂╟ode,鍒ゆ柇ServiceTaskdept鏄惁瀛樺湪锛屼笉瀛樺湪鍒欐柊澧烇紝瀛樺湪鍒欎慨鏀�
+                        ServiceTaskdept st = new ServiceTaskdept();
+                        st.setDeptCode(districtcode);
+                        st.setTaskId(serviceTask.getTaskid());
+                        List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
+                        if (CollectionUtils.isEmpty(serviceTaskdepts)) {
+                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
+                        } else {
+                            serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
+                        }
                     }
                 }
+            } else if (serviceTaskVO.getAppltype().equals("3")) {
+                ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
+                serviceTaskdiag.setTaskId(serviceTask.getTaskid());
+                serviceTaskdiag.setTaskName(serviceTask.getTaskName());
+                if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
+                    throw new BaseException("鐤剧梾缂栫爜涓虹┖");
+                }
+                serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
+                List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
+                serviceTaskdiag.setLongtask(1L);
+                serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
+                serviceTaskdiag.setGuid(serviceTask.getGuid());
+                serviceTaskdiag.setOrgid(serviceTask.getOrgid());
+                serviceTaskdiag.setUpdateTime(new Date());
+                log.error("----serviceTaskdiag鏇存柊鐨勫�间负锛歿}", serviceTaskdiag);
+                if (CollectionUtils.isNotEmpty(serviceTaskdiags)) {
+                    serviceTaskdiag.setId(serviceTaskdiags.get(0).getId());
+                    serviceTaskdiagService.updateServiceTaskdiag(serviceTaskdiag);
+                } else {
+                    serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+                }
+
+            } else if (serviceTaskVO.getAppltype().equals("4")) {
+                ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
+                if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
+                    throw new BaseException("鎵嬫湳缂栫爜涓虹┖");
+                }
+                serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
+                serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
+                serviceTaskoper.setTaskId(serviceTask.getTaskid());
+                List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper);
+                serviceTaskoper.setTaskName(serviceTask.getTaskName());
+                serviceTaskoper.setLongtask(1L);
+                serviceTaskoper.setGuid(serviceTask.getGuid());
+                serviceTaskoper.setOrgid(serviceTask.getOrgid());
+                serviceTaskoper.setCreateTime(new Date());
+                log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+                if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
+                    serviceTaskoper.setId(serviceTaskopers.get(0).getId());
+                    serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
+                } else {
+                    serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+                }
             }
             if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
                 IvrTaskTemplate ivrTaskTemplate = new IvrTaskTemplate();
diff --git a/smartor/src/main/resources/mapper/smartor/BaseDictOperationMapper.xml b/smartor/src/main/resources/mapper/smartor/BaseDictOperationMapper.xml
index ad265b4..9de5a95 100644
--- a/smartor/src/main/resources/mapper/smartor/BaseDictOperationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/BaseDictOperationMapper.xml
@@ -5,30 +5,49 @@
 <mapper namespace="com.smartor.mapper.BaseDictOperationMapper">
 
     <resultMap type="com.smartor.domain.BaseDictOperation" id="BaseDictOperationResult">
-            <result property="id" column="id"/>
-            <result property="opid" column="opid"/>
-            <result property="opcode" column="opcode"/>
-            <result property="opdesc" column="opdesc"/>
-            <result property="incitypecode" column="incitypecode"/>
-            <result property="incitypedesc" column="incitypedesc"/>
-            <result property="oplevelcode" column="oplevelcode"/>
-            <result property="opleveldesc" column="opleveldesc"/>
-            <result property="opposition" column="opposition"/>
-            <result property="delFlag" column="del_flag"/>
-            <result property="updateBy" column="update_by"/>
-            <result property="updateTime" column="update_time"/>
-            <result property="createBy" column="create_by"/>
-            <result property="createTime" column="create_time"/>
-            <result property="isupload" column="isupload"/>
-            <result property="uploadTime" column="upload_time"/>
-            <result property="orgid" column="orgid"/>
-            <result property="pguid" column="pguid"/>
-            <result property="guid" column="guid"/>
-            <result property="pid" column="pid"/>
+        <result property="id" column="id"/>
+        <result property="opid" column="opid"/>
+        <result property="opcode" column="opcode"/>
+        <result property="opdesc" column="opdesc"/>
+        <result property="incitypecode" column="incitypecode"/>
+        <result property="incitypedesc" column="incitypedesc"/>
+        <result property="oplevelcode" column="oplevelcode"/>
+        <result property="opleveldesc" column="opleveldesc"/>
+        <result property="opposition" column="opposition"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="pguid" column="pguid"/>
+        <result property="guid" column="guid"/>
+        <result property="pid" column="pid"/>
     </resultMap>
 
     <sql id="selectBaseDictOperationVo">
-        select id, opid, opcode, opdesc, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid
+        select id,
+               opid,
+               opcode,
+               opdesc,
+               incitypecode,
+               incitypedesc,
+               oplevelcode,
+               opleveldesc,
+               opposition,
+               del_flag,
+               update_by,
+               update_time,
+               create_by,
+               create_time,
+               isupload,
+               upload_time,
+               orgid,
+               pguid,
+               guid,
+               pid
         from base_dict_operation
     </sql>
 
@@ -36,219 +55,219 @@
             resultMap="BaseDictOperationResult">
         <include refid="selectBaseDictOperationVo"/>
         <where>
-                        <if test="opid != null ">
-                            and opid = #{opid}
-                        </if>
-                        <if test="opcode != null  and opcode != ''">
-                            and opcode = #{opcode}
-                        </if>
-                        <if test="opdesc != null  and opdesc != ''">
-                            and opdesc = #{opdesc}
-                        </if>
-                        <if test="incitypecode != null  and incitypecode != ''">
-                            and incitypecode = #{incitypecode}
-                        </if>
-                        <if test="incitypedesc != null  and incitypedesc != ''">
-                            and incitypedesc = #{incitypedesc}
-                        </if>
-                        <if test="oplevelcode != null  and oplevelcode != ''">
-                            and oplevelcode = #{oplevelcode}
-                        </if>
-                        <if test="opleveldesc != null  and opleveldesc != ''">
-                            and opleveldesc = #{opleveldesc}
-                        </if>
-                        <if test="opposition != null  and opposition != ''">
-                            and opposition = #{opposition}
-                        </if>
-                        <if test="isupload != null ">
-                            and isupload = #{isupload}
-                        </if>
-                        <if test="uploadTime != null ">
-                            and upload_time = #{uploadTime}
-                        </if>
-                        <if test="orgid != null  and orgid != ''">
-                            and orgid = #{orgid}
-                        </if>
-                        <if test="pguid != null  and pguid != ''">
-                            and pguid = #{pguid}
-                        </if>
-                        <if test="guid != null  and guid != ''">
-                            and guid = #{guid}
-                        </if>
-                        <if test="pid != null ">
-                            and pid = #{pid}
-                        </if>
+            <if test="opid != null ">
+                and opid = #{opid}
+            </if>
+            <if test="opcode != null  and opcode != ''">
+                and opcode = #{opcode}
+            </if>
+            <if test="opdesc != null  and opdesc != ''">
+                and opdesc like concat('%', #{opdesc}, '%')
+            </if>
+            <if test="incitypecode != null  and incitypecode != ''">
+                and incitypecode = #{incitypecode}
+            </if>
+            <if test="incitypedesc != null  and incitypedesc != ''">
+                and incitypedesc = #{incitypedesc}
+            </if>
+            <if test="oplevelcode != null  and oplevelcode != ''">
+                and oplevelcode = #{oplevelcode}
+            </if>
+            <if test="opleveldesc != null  and opleveldesc != ''">
+                and opleveldesc = #{opleveldesc}
+            </if>
+            <if test="opposition != null  and opposition != ''">
+                and opposition = #{opposition}
+            </if>
+            <if test="isupload != null ">
+                and isupload = #{isupload}
+            </if>
+            <if test="uploadTime != null ">
+                and upload_time = #{uploadTime}
+            </if>
+            <if test="orgid != null  and orgid != ''">
+                and orgid = #{orgid}
+            </if>
+            <if test="pguid != null  and pguid != ''">
+                and pguid = #{pguid}
+            </if>
+            <if test="guid != null  and guid != ''">
+                and guid = #{guid}
+            </if>
+            <if test="pid != null ">
+                and pid = #{pid}
+            </if>
         </where>
     </select>
 
     <select id="selectBaseDictOperationById" parameterType="Long"
             resultMap="BaseDictOperationResult">
-            <include refid="selectBaseDictOperationVo"/>
-            where id = #{id}
+        <include refid="selectBaseDictOperationVo"/>
+        where id = #{id}
     </select>
 
     <insert id="insertBaseDictOperation" parameterType="com.smartor.domain.BaseDictOperation">
         insert into base_dict_operation
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="opid != null">opid,
-                    </if>
-                    <if test="opcode != null">opcode,
-                    </if>
-                    <if test="opdesc != null">opdesc,
-                    </if>
-                    <if test="incitypecode != null">incitypecode,
-                    </if>
-                    <if test="incitypedesc != null">incitypedesc,
-                    </if>
-                    <if test="oplevelcode != null">oplevelcode,
-                    </if>
-                    <if test="opleveldesc != null">opleveldesc,
-                    </if>
-                    <if test="opposition != null">opposition,
-                    </if>
-                    <if test="delFlag != null">del_flag,
-                    </if>
-                    <if test="updateBy != null">update_by,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="createBy != null">create_by,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="isupload != null">isupload,
-                    </if>
-                    <if test="uploadTime != null">upload_time,
-                    </if>
-                    <if test="orgid != null">orgid,
-                    </if>
-                    <if test="pguid != null">pguid,
-                    </if>
-                    <if test="guid != null">guid,
-                    </if>
-                    <if test="pid != null">pid,
-                    </if>
+            <if test="id != null">id,
+            </if>
+            <if test="opid != null">opid,
+            </if>
+            <if test="opcode != null">opcode,
+            </if>
+            <if test="opdesc != null">opdesc,
+            </if>
+            <if test="incitypecode != null">incitypecode,
+            </if>
+            <if test="incitypedesc != null">incitypedesc,
+            </if>
+            <if test="oplevelcode != null">oplevelcode,
+            </if>
+            <if test="opleveldesc != null">opleveldesc,
+            </if>
+            <if test="opposition != null">opposition,
+            </if>
+            <if test="delFlag != null">del_flag,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="isupload != null">isupload,
+            </if>
+            <if test="uploadTime != null">upload_time,
+            </if>
+            <if test="orgid != null">orgid,
+            </if>
+            <if test="pguid != null">pguid,
+            </if>
+            <if test="guid != null">guid,
+            </if>
+            <if test="pid != null">pid,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="opid != null">#{opid},
-                    </if>
-                    <if test="opcode != null">#{opcode},
-                    </if>
-                    <if test="opdesc != null">#{opdesc},
-                    </if>
-                    <if test="incitypecode != null">#{incitypecode},
-                    </if>
-                    <if test="incitypedesc != null">#{incitypedesc},
-                    </if>
-                    <if test="oplevelcode != null">#{oplevelcode},
-                    </if>
-                    <if test="opleveldesc != null">#{opleveldesc},
-                    </if>
-                    <if test="opposition != null">#{opposition},
-                    </if>
-                    <if test="delFlag != null">#{delFlag},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="isupload != null">#{isupload},
-                    </if>
-                    <if test="uploadTime != null">#{uploadTime},
-                    </if>
-                    <if test="orgid != null">#{orgid},
-                    </if>
-                    <if test="pguid != null">#{pguid},
-                    </if>
-                    <if test="guid != null">#{guid},
-                    </if>
-                    <if test="pid != null">#{pid},
-                    </if>
+            <if test="id != null">#{id},
+            </if>
+            <if test="opid != null">#{opid},
+            </if>
+            <if test="opcode != null">#{opcode},
+            </if>
+            <if test="opdesc != null">#{opdesc},
+            </if>
+            <if test="incitypecode != null">#{incitypecode},
+            </if>
+            <if test="incitypedesc != null">#{incitypedesc},
+            </if>
+            <if test="oplevelcode != null">#{oplevelcode},
+            </if>
+            <if test="opleveldesc != null">#{opleveldesc},
+            </if>
+            <if test="opposition != null">#{opposition},
+            </if>
+            <if test="delFlag != null">#{delFlag},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="isupload != null">#{isupload},
+            </if>
+            <if test="uploadTime != null">#{uploadTime},
+            </if>
+            <if test="orgid != null">#{orgid},
+            </if>
+            <if test="pguid != null">#{pguid},
+            </if>
+            <if test="guid != null">#{guid},
+            </if>
+            <if test="pid != null">#{pid},
+            </if>
         </trim>
     </insert>
 
     <update id="updateBaseDictOperation" parameterType="com.smartor.domain.BaseDictOperation">
         update base_dict_operation
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="opid != null">opid =
-                        #{opid},
-                    </if>
-                    <if test="opcode != null">opcode =
-                        #{opcode},
-                    </if>
-                    <if test="opdesc != null">opdesc =
-                        #{opdesc},
-                    </if>
-                    <if test="incitypecode != null">incitypecode =
-                        #{incitypecode},
-                    </if>
-                    <if test="incitypedesc != null">incitypedesc =
-                        #{incitypedesc},
-                    </if>
-                    <if test="oplevelcode != null">oplevelcode =
-                        #{oplevelcode},
-                    </if>
-                    <if test="opleveldesc != null">opleveldesc =
-                        #{opleveldesc},
-                    </if>
-                    <if test="opposition != null">opposition =
-                        #{opposition},
-                    </if>
-                    <if test="delFlag != null">del_flag =
-                        #{delFlag},
-                    </if>
-                    <if test="updateBy != null">update_by =
-                        #{updateBy},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="createBy != null">create_by =
-                        #{createBy},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="isupload != null">isupload =
-                        #{isupload},
-                    </if>
-                    <if test="uploadTime != null">upload_time =
-                        #{uploadTime},
-                    </if>
-                    <if test="orgid != null">orgid =
-                        #{orgid},
-                    </if>
-                    <if test="pguid != null">pguid =
-                        #{pguid},
-                    </if>
-                    <if test="guid != null">guid =
-                        #{guid},
-                    </if>
-                    <if test="pid != null">pid =
-                        #{pid},
-                    </if>
+            <if test="opid != null">opid =
+                #{opid},
+            </if>
+            <if test="opcode != null">opcode =
+                #{opcode},
+            </if>
+            <if test="opdesc != null">opdesc =
+                #{opdesc},
+            </if>
+            <if test="incitypecode != null">incitypecode =
+                #{incitypecode},
+            </if>
+            <if test="incitypedesc != null">incitypedesc =
+                #{incitypedesc},
+            </if>
+            <if test="oplevelcode != null">oplevelcode =
+                #{oplevelcode},
+            </if>
+            <if test="opleveldesc != null">opleveldesc =
+                #{opleveldesc},
+            </if>
+            <if test="opposition != null">opposition =
+                #{opposition},
+            </if>
+            <if test="delFlag != null">del_flag =
+                #{delFlag},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="isupload != null">isupload =
+                #{isupload},
+            </if>
+            <if test="uploadTime != null">upload_time =
+                #{uploadTime},
+            </if>
+            <if test="orgid != null">orgid =
+                #{orgid},
+            </if>
+            <if test="pguid != null">pguid =
+                #{pguid},
+            </if>
+            <if test="guid != null">guid =
+                #{guid},
+            </if>
+            <if test="pid != null">pid =
+                #{pid},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
-                <update id="deleteBaseDictOperationById" parameterType="Long">
+    <update id="deleteBaseDictOperationById" parameterType="Long">
         update base_dict_operation
         <trim prefix="SET" suffixOverrides=",">
             del_flag =1
         </trim>
-        where  id = #{id}
+        where id = #{id}
     </update>
 
-                            <update id="deleteBaseDictOperationByIds" parameterType="String">
-        update  base_dict_operation
+    <update id="deleteBaseDictOperationByIds" parameterType="String">
+        update base_dict_operation
         <trim prefix="SET" suffixOverrides=",">
             del_flag =1
         </trim>
@@ -257,8 +276,6 @@
             #{id}
         </foreach>
     </update>
-
-
 
 
 </mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml b/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml
index adbbb0d..d3e0302 100644
--- a/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml
@@ -1,47 +1,66 @@
 <?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.Icd10Mapper">
-    
+
     <resultMap type="com.smartor.domain.Icd10" id="Icd10Result">
-        <result property="icdid"    column="icdid"    />
-        <result property="icdcode"    column="icdcode"    />
-        <result property="icdname"    column="icdname"    />
-        <result property="icdpym"    column="icdpym"    />
-        <result property="icdwbm"    column="icdwbm"    />
-        <result property="orgid"    column="orgid"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="pid"    column="pid"    />
-        <result property="guid"    column="guid"    />
+        <result property="icdid" column="icdid"/>
+        <result property="icdcode" column="icdcode"/>
+        <result property="icdname" column="icdname"/>
+        <result property="icdpym" column="icdpym"/>
+        <result property="icdwbm" column="icdwbm"/>
+        <result property="orgid" column="orgid"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
+        <result property="lastflag" column="lastflag"/>
+        <result property="chimedflag" column="chimedflag"/>
     </resultMap>
 
     <sql id="selectIcd10Vo">
-        select icdid, icdcode, icdname, icdpym, icdwbm, orgid, del_flag, create_by, create_time, update_by, update_time, pid, guid from icd10
+        select icdid,
+               icdcode,
+               lastflag,
+               chimedflag,
+               icdname,
+               icdpym,
+               icdwbm,
+               orgid,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               pid,
+               guid
+        from icd10
     </sql>
 
     <select id="selectIcd10List" parameterType="com.smartor.domain.Icd10" resultMap="Icd10Result">
         <include refid="selectIcd10Vo"/>
-        <where>  
-            <if test="icdcode != null  and icdcode != ''"> and icdcode = #{icdcode}</if>
-            <if test="icdname != null  and icdname != ''"> and icdname like concat('%', #{icdname}, '%')</if>
-            <if test="icdpym != null  and icdpym != ''"> and icdpym = #{icdpym}</if>
-            <if test="icdwbm != null  and icdwbm != ''"> and icdwbm = #{icdwbm}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
-            <if test="pid != null "> and pid = #{pid}</if>
-            <if test="guid != null  and guid != ''"> and guid = #{guid}</if>
+        <where>
+            <if test="icdcode != null  and icdcode != ''">and icdcode = #{icdcode}</if>
+            <if test="lastflag != null  and lastflag != ''">and lastflag = #{lastflag}</if>
+            <if test="chimedflag != null  and chimedflag != ''">and chimedflag = #{chimedflag}</if>
+            <if test="icdname != null  and icdname != ''">and icdname like concat('%', #{icdname}, '%')</if>
+            <if test="icdpym != null  and icdpym != ''">and icdpym = #{icdpym}</if>
+            <if test="icdwbm != null  and icdwbm != ''">and icdwbm = #{icdwbm}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
         </where>
     </select>
-    
+
     <select id="selectIcd10ByIcdid" parameterType="Long" resultMap="Icd10Result">
         <include refid="selectIcd10Vo"/>
         where icdid = #{icdid}
     </select>
-        
+
     <insert id="insertIcd10" parameterType="com.smartor.domain.Icd10" useGeneratedKeys="true" keyProperty="icdid">
         insert into icd10
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -57,7 +76,9 @@
             <if test="updateTime != null">update_time,</if>
             <if test="pid != null">pid,</if>
             <if test="guid != null">guid,</if>
-         </trim>
+            <if test="lastflag != null  and lastflag != ''">lastflag,</if>
+            <if test="chimedflag != null  and chimedflag != ''">chimedflag,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="icdcode != null">#{icdcode},</if>
             <if test="icdname != null">#{icdname},</if>
@@ -71,7 +92,9 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="pid != null">#{pid},</if>
             <if test="guid != null">#{guid},</if>
-         </trim>
+            <if test="lastflag != null  and lastflag != ''">#{lastflag},</if>
+            <if test="chimedflag != null  and chimedflag != ''">#{chimedflag},</if>
+        </trim>
     </insert>
 
     <update id="updateIcd10" parameterType="com.smartor.domain.Icd10">
@@ -89,18 +112,22 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
+            <if test="lastflag != null  and lastflag != ''">lastflag = #{lastflag},</if>
+            <if test="chimedflag != null  and chimedflag != ''">chimedflag = #{chimedflag},</if>
         </trim>
         where icdid = #{icdid}
     </update>
 
     <delete id="deleteIcd10ByIcdid" parameterType="Long">
-        delete from icd10 where icdid = #{icdid}
+        delete
+        from icd10
+        where icdid = #{icdid}
     </delete>
 
     <delete id="deleteIcd10ByIcdids" parameterType="String">
-        delete from icd10 where icdid in 
+        delete from icd10 where icdid in
         <foreach item="icdid" collection="array" open="(" separator="," close=")">
             #{icdid}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index b35d738..8431015 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -111,8 +111,8 @@
                leavehospitaldistrictname,
                orgid,
                nexttaskflag,
-                nexttaskid,
-                nexttaskname
+               nexttaskid,
+               nexttaskname
         from service_task
     </sql>
 
@@ -467,9 +467,9 @@
             <if test="isupload != null">isupload = #{isupload},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
             <if test="orgid != null">orgid = #{orgid},</if>
-            <if test="nexttaskflag != null">#{nexttaskflag},</if>
-            <if test="nexttaskid != null">#{nexttaskid},</if>
-            <if test="nexttaskname != null">#{nexttaskname},</if>
+            <if test="nexttaskflag != null">nexttaskflag = #{nexttaskflag},</if>
+            <if test="nexttaskid != null">nexttaskid = #{nexttaskid},</if>
+            <if test="nexttaskname != null">nexttaskname = #{nexttaskname},</if>
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="preachform != null">preachform = #{preachform},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
index fcdd4da..ed790f8 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
@@ -5,25 +5,39 @@
 <mapper namespace="com.smartor.mapper.ServiceTaskdiagMapper">
 
     <resultMap type="com.smartor.domain.ServiceTaskdiag" id="ServiceTaskdiagResult">
-            <result property="id" column="id"/>
-            <result property="taskId" column="task_id"/>
-            <result property="longtask" column="longtask"/>
-            <result property="taskName" column="task_name"/>
-            <result property="serviceType" column="service_type"/>
-            <result property="icd10id" column="icd10id"/>
-            <result property="icd10code" column="icd10code"/>
-            <result property="icd10name" column="icd10name"/>
-            <result property="delFlag" column="del_flag"/>
-            <result property="createTime" column="create_time"/>
-            <result property="updateTime" column="update_time"/>
-            <result property="orgid" column="orgid"/>
-            <result property="guid" column="guid"/>
-            <result property="pguid" column="pguid"/>
-            <result property="pid" column="pid"/>
+        <result property="id" column="id"/>
+        <result property="taskId" column="task_id"/>
+        <result property="longtask" column="longtask"/>
+        <result property="taskName" column="task_name"/>
+        <result property="serviceType" column="service_type"/>
+        <result property="icd10id" column="icd10id"/>
+        <result property="icd10code" column="icd10code"/>
+        <result property="icd10name" column="icd10name"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="guid" column="guid"/>
+        <result property="pguid" column="pguid"/>
+        <result property="pid" column="pid"/>
     </resultMap>
 
     <sql id="selectServiceTaskdiagVo">
-        select id, task_id, longtask, task_name, service_type, icd10id, icd10code, icd10name, del_flag, create_time, update_time, orgid, guid, pguid, pid
+        select id,
+               task_id,
+               longtask,
+               task_name,
+               service_type,
+               icd10id,
+               icd10code,
+               icd10name,
+               del_flag,
+               create_time,
+               update_time,
+               orgid,
+               guid,
+               pguid,
+               pid
         from service_taskdiag
     </sql>
 
@@ -31,171 +45,172 @@
             resultMap="ServiceTaskdiagResult">
         <include refid="selectServiceTaskdiagVo"/>
         <where>
-                        <if test="taskId != null ">
-                            and task_id = #{taskId}
-                        </if>
-                        <if test="longtask != null ">
-                            and longtask = #{longtask}
-                        </if>
-                        <if test="taskName != null  and taskName != ''">
-                            and task_name like concat('%', #{taskName}, '%')
-                        </if>
-                        <if test="serviceType != null  and serviceType != ''">
-                            and service_type = #{serviceType}
-                        </if>
-                        <if test="icd10id != null ">
-                            and icd10id = #{icd10id}
-                        </if>
-                        <if test="icd10code != null  and icd10code != ''">
-                            and icd10code = #{icd10code}
-                        </if>
-                        <if test="icd10name != null  and icd10name != ''">
-                            and icd10name like concat('%', #{icd10name}, '%')
-                        </if>
-                        <if test="orgid != null  and orgid != ''">
-                            and orgid = #{orgid}
-                        </if>
-                        <if test="guid != null  and guid != ''">
-                            and guid = #{guid}
-                        </if>
-                        <if test="pguid != null  and pguid != ''">
-                            and pguid = #{pguid}
-                        </if>
-                        <if test="pid != null ">
-                            and pid = #{pid}
-                        </if>
+            <if test="taskId != null ">
+                and task_id = #{taskId}
+            </if>
+            <if test="longtask != null ">
+                and longtask = #{longtask}
+            </if>
+            <if test="taskName != null  and taskName != ''">
+                and task_name like concat('%', #{taskName}, '%')
+            </if>
+            <if test="serviceType != null  and serviceType != ''">
+                and service_type = #{serviceType}
+            </if>
+            <if test="icd10id != null ">
+                and icd10id = #{icd10id}
+            </if>
+            <if test="icd10code != null  and icd10code != ''">
+                and icd10code = #{icd10code}
+            </if>
+            <if test="icd10name != null  and icd10name != ''">
+                and icd10name like concat('%', #{icd10name}, '%')
+            </if>
+            <if test="orgid != null  and orgid != ''">
+                and orgid = #{orgid}
+            </if>
+            <if test="guid != null  and guid != ''">
+                and guid = #{guid}
+            </if>
+            <if test="pguid != null  and pguid != ''">
+                and pguid = #{pguid}
+            </if>
+            <if test="pid != null ">
+                and pid = #{pid}
+            </if>
         </where>
     </select>
 
     <select id="selectServiceTaskdiagById" parameterType="Long"
             resultMap="ServiceTaskdiagResult">
-            <include refid="selectServiceTaskdiagVo"/>
-            where id = #{id}
+        <include refid="selectServiceTaskdiagVo"/>
+        where id = #{id}
     </select>
 
-    <insert id="insertServiceTaskdiag" parameterType="com.smartor.domain.ServiceTaskdiag"            useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertServiceTaskdiag" parameterType="com.smartor.domain.ServiceTaskdiag" useGeneratedKeys="true"
+            keyProperty="id">
         insert into service_taskdiag
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="taskId != null">task_id,
-                    </if>
-                    <if test="longtask != null">longtask,
-                    </if>
-                    <if test="taskName != null">task_name,
-                    </if>
-                    <if test="serviceType != null">service_type,
-                    </if>
-                    <if test="icd10id != null">icd10id,
-                    </if>
-                    <if test="icd10code != null">icd10code,
-                    </if>
-                    <if test="icd10name != null">icd10name,
-                    </if>
-                    <if test="delFlag != null">del_flag,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="orgid != null">orgid,
-                    </if>
-                    <if test="guid != null">guid,
-                    </if>
-                    <if test="pguid != null">pguid,
-                    </if>
-                    <if test="pid != null">pid,
-                    </if>
+            <if test="taskId != null">task_id,
+            </if>
+            <if test="longtask != null">longtask,
+            </if>
+            <if test="taskName != null">task_name,
+            </if>
+            <if test="serviceType != null">service_type,
+            </if>
+            <if test="icd10id != null">icd10id,
+            </if>
+            <if test="icd10code != null">icd10code,
+            </if>
+            <if test="icd10name != null">icd10name,
+            </if>
+            <if test="delFlag != null">del_flag,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="orgid != null">orgid,
+            </if>
+            <if test="guid != null">guid,
+            </if>
+            <if test="pguid != null">pguid,
+            </if>
+            <if test="pid != null">pid,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="taskId != null">#{taskId},
-                    </if>
-                    <if test="longtask != null">#{longtask},
-                    </if>
-                    <if test="taskName != null">#{taskName},
-                    </if>
-                    <if test="serviceType != null">#{serviceType},
-                    </if>
-                    <if test="icd10id != null">#{icd10id},
-                    </if>
-                    <if test="icd10code != null">#{icd10code},
-                    </if>
-                    <if test="icd10name != null">#{icd10name},
-                    </if>
-                    <if test="delFlag != null">#{delFlag},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="orgid != null">#{orgid},
-                    </if>
-                    <if test="guid != null">#{guid},
-                    </if>
-                    <if test="pguid != null">#{pguid},
-                    </if>
-                    <if test="pid != null">#{pid},
-                    </if>
+            <if test="taskId != null">#{taskId},
+            </if>
+            <if test="longtask != null">#{longtask},
+            </if>
+            <if test="taskName != null">#{taskName},
+            </if>
+            <if test="serviceType != null">#{serviceType},
+            </if>
+            <if test="icd10id != null">#{icd10id},
+            </if>
+            <if test="icd10code != null">#{icd10code},
+            </if>
+            <if test="icd10name != null">#{icd10name},
+            </if>
+            <if test="delFlag != null">#{delFlag},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="orgid != null">#{orgid},
+            </if>
+            <if test="guid != null">#{guid},
+            </if>
+            <if test="pguid != null">#{pguid},
+            </if>
+            <if test="pid != null">#{pid},
+            </if>
         </trim>
     </insert>
 
     <update id="updateServiceTaskdiag" parameterType="com.smartor.domain.ServiceTaskdiag">
         update service_taskdiag
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="taskId != null">task_id =
-                        #{taskId},
-                    </if>
-                    <if test="longtask != null">longtask =
-                        #{longtask},
-                    </if>
-                    <if test="taskName != null">task_name =
-                        #{taskName},
-                    </if>
-                    <if test="serviceType != null">service_type =
-                        #{serviceType},
-                    </if>
-                    <if test="icd10id != null">icd10id =
-                        #{icd10id},
-                    </if>
-                    <if test="icd10code != null">icd10code =
-                        #{icd10code},
-                    </if>
-                    <if test="icd10name != null">icd10name =
-                        #{icd10name},
-                    </if>
-                    <if test="delFlag != null">del_flag =
-                        #{delFlag},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="orgid != null">orgid =
-                        #{orgid},
-                    </if>
-                    <if test="guid != null">guid =
-                        #{guid},
-                    </if>
-                    <if test="pguid != null">pguid =
-                        #{pguid},
-                    </if>
-                    <if test="pid != null">pid =
-                        #{pid},
-                    </if>
+            <if test="taskId != null">task_id =
+                #{taskId},
+            </if>
+            <if test="longtask != null">longtask =
+                #{longtask},
+            </if>
+            <if test="taskName != null">task_name =
+                #{taskName},
+            </if>
+            <if test="serviceType != null">service_type =
+                #{serviceType},
+            </if>
+            <if test="icd10id != null">icd10id =
+                #{icd10id},
+            </if>
+            <if test="icd10code != null">icd10code =
+                #{icd10code},
+            </if>
+            <if test="icd10name != null">icd10name =
+                #{icd10name},
+            </if>
+            <if test="delFlag != null">del_flag =
+                #{delFlag},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="orgid != null">orgid =
+                #{orgid},
+            </if>
+            <if test="guid != null">guid =
+                #{guid},
+            </if>
+            <if test="pguid != null">pguid =
+                #{pguid},
+            </if>
+            <if test="pid != null">pid =
+                #{pid},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
-                <update id="deleteServiceTaskdiagById" parameterType="Long">
+    <update id="deleteServiceTaskdiagById" parameterType="Long">
         update service_taskdiag
         <trim prefix="SET" suffixOverrides=",">
             del_flag =1
         </trim>
-        where  id = #{id}
+        where id = #{id}
     </update>
 
-                            <update id="deleteServiceTaskdiagByIds" parameterType="String">
-        update  service_taskdiag
+    <update id="deleteServiceTaskdiagByIds" parameterType="String">
+        update service_taskdiag
         <trim prefix="SET" suffixOverrides=",">
             del_flag =1
         </trim>
@@ -204,8 +219,6 @@
             #{id}
         </foreach>
     </update>
-
-
 
 
 </mapper>

--
Gitblit v1.9.3