代码提交

liusheng

2025-02-26 718bd7efbc0d959d0b9050c34be2fd639a1f74b6

代码提交

 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));
    }

@@ -106,8 +103,7 @@
    //@PreAuthorize("@ss.hasPermi('smartor:operation:remove')")
    @Log(title = "患者检查检验记录子", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(baseDictOperationService.deleteBaseDictOperationByIds(ids));
    }
}

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

@@ -84,6 +84,7 @@

        if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
            for (ServiceTaskVO ServiceTaskVO : serviceTaskVOS) {
                if (serviceTask.getAppltype().equals("1") || serviceTask.getAppltype().equals("2")) {
                ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
                serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
                serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
@@ -97,6 +98,19 @@
                    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
            long total = PageUtils.count(new ISelect() {

 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

 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

 ruoyi-admin/src/main/resources/application-druid.yml

 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删除 、sendstate改成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();

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

@@ -17,86 +17,117 @@
 */
@Data
@ApiModel("患者检查检验记录子")
public class BaseDictOperation extends BaseEntity
        {
public class BaseDictOperation extends BaseEntity {
private static final long serialVersionUID = 1L;

    /** 自增ID */
    /**
     * 自增ID
     */
    @ApiModelProperty("自增ID")
        //数据库自增改成@TableId(type = IdType.AUTO)
    private Long id;

    /** his手术id */
    /**
     * his手术id
     */
    @ApiModelProperty("his手术id")
            @Excel(name = "his手术id")
    private Long opid;

    /** 手术名称ID */
    /**
     * 手术名称ID
     */
    @ApiModelProperty("手术名称ID")
            @Excel(name = "手术名称ID")
    private String opcode;

    /** 手术名称 */
    /**
     * 手术名称
     */
    @ApiModelProperty("手术名称")
            @Excel(name = "手术名称")
    private String opdesc;

    /** 切口类别代码 */
    /**
     * 切口类别代码
     */
    @ApiModelProperty("切口类别代码")
            @Excel(name = "切口类别代码")
    private String incitypecode;

    /** 切口类别名称 */
    /**
     * 切口类别名称
     */
    @ApiModelProperty("切口类别名称")
            @Excel(name = "切口类别名称")
    private String incitypedesc;

    /** 手术级别代码 */
    /**
     * 手术级别代码
     */
    @ApiModelProperty("手术级别代码")
            @Excel(name = "手术级别代码")
    private String oplevelcode;

    /** 手术级别名称 */
    /**
     * 手术级别名称
     */
    @ApiModelProperty("手术级别名称")
            @Excel(name = "手术级别名称")
    private String opleveldesc;

    /** 手术部位 */
    /**
     * 手术部位
     */
    @ApiModelProperty("手术部位")
            @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=：已上传")
    private Long isupload;

    /** 上传时间 */
    /**
     * 上传时间
     */
    @ApiModelProperty("上传时间")
            @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")
    private String orgid;

    /** 父GUID */
    /**
     * 父GUID
     */
    @ApiModelProperty("父GUID")
            @Excel(name = "父GUID")
    private String pguid;

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

    /** 父ID */
    /**
     * 父ID
     */
    @ApiModelProperty("父ID")
            @Excel(name = "父ID")
    private Long pid;

 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;


}

 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;
}

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

@@ -14,70 +14,95 @@
 */
@Data
@ApiModel("模板科室关联")
public class ServiceTaskdiag extends BaseEntity
        {
public class ServiceTaskdiag extends BaseEntity {
private static final long serialVersionUID = 1L;

    /** 模板库和科室关联id */
    /**
     * 模板库和科室关联id
     */
    @ApiModelProperty("模板库和科室关联id")
        //数据库自增改成@TableId(type = IdType.AUTO)
    private Long id;

    /** 任务id */
    /**
     * 任务id
     */
    @ApiModelProperty("任务id")
            @Excel(name = "任务id")
    private Long taskId;

    /** 是否是长期模板：  0：不是    1：是 */
    /**
     * 是否是长期模板：  0：不是    1：是
     */
    @ApiModelProperty("是否是长期模板：  0：不是    1：是")
            @Excel(name = "是否是长期模板：  0：不是    1：是")
    private Long longtask;

    /** 任务名称 */
    /**
     * 任务名称
     */
    @ApiModelProperty("任务名称")
            @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、其他通知)")
    private String serviceType;

    /** 科室id */
    /**
     * 科室id
     */
    @ApiModelProperty("科室id")
            @Excel(name = "科室id")
    private Long icd10id;

    /** 部门编码 */
    /**
     * 部门编码
     */
    @ApiModelProperty("部门编码")
            @Excel(name = "部门编码")
    private String icd10code;

    /** 部门名称 */
    /**
     * 部门名称
     */
    @ApiModelProperty("部门名称")
            @Excel(name = "部门名称")
    private String icd10name;

    /** 删除标志（0：未删除 1：已删除） */
    /**
     * 删除标志（0：未删除 1：已删除）
     */
    @ApiModelProperty("删除标志（0：未删除 1：已删除）")
    private Integer delFlag;

    /** 医院机构ID */
    /**
     * 医院机构ID
     */
    @ApiModelProperty("医院机构ID")
            @Excel(name = "医院机构ID")
    private String orgid;

    /** $column.columnComment */
    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String guid;

    /** 父GUID */
    /**
     * 父GUID
     */
    @ApiModelProperty("父GUID")
            @Excel(name = "父GUID")
    private String pguid;

    /** 父ID */
    /**
     * 父ID
     */
    @ApiModelProperty("父ID")
            @Excel(name = "父ID")
    private Long pid;

 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;
    }


 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())) {
            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);
            }

            //将任务信息放到服务表中
@@ -497,6 +498,7 @@
            serviceTask.setTemplateid(serviceTaskVO.getTemplateid());
            serviceTask.setLongTask(serviceTaskVO.getLongTask());
            serviceTaskService.updateServiceTask(serviceTask);
            if (serviceTaskVO.getAppltype().equals("1") || serviceTaskVO.getAppltype().equals("2")) {
            ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
            serviceTaskdept.setTaskId(serviceTask.getTaskid());
            serviceTaskdept.setTaskName(serviceTask.getTaskName());
@@ -508,7 +510,6 @@
                    serviceTaskdept.setDeptCode(deptCode);
                    serviceTaskdept.setDeptType("1");
                    serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());

                    ServiceTaskdept st = new ServiceTaskdept();
                    st.setDeptCode(deptCode);
                    st.setTaskId(serviceTask.getTaskid());
@@ -538,6 +539,50 @@
                    }
                }
            }
            } 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();
                ivrTaskTemplate.setTaskid(serviceTaskVO.getIvrTaskTemplateVO().getTaskid());

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

@@ -28,7 +28,26 @@
    </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>

@@ -43,7 +62,7 @@
                            and opcode = #{opcode}
                        </if>
                        <if test="opdesc != null  and opdesc != ''">
                            and opdesc = #{opdesc}
                and opdesc like concat('%', #{opdesc}, '%')
                        </if>
                        <if test="incitypecode != null  and incitypecode != ''">
                            and incitypecode = #{incitypecode}
@@ -257,8 +276,6 @@
            #{id}
        </foreach>
    </update>




</mapper>

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

@@ -18,16 +18,35 @@
        <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="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>
@@ -57,6 +76,8 @@
            <if test="updateTime != null">update_time,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <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>
@@ -71,6 +92,8 @@
            <if test="updateTime != null">#{updateTime},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="lastflag != null  and lastflag != ''">#{lastflag},</if>
            <if test="chimedflag != null  and chimedflag != ''">#{chimedflag},</if>
         </trim>
    </insert>

@@ -89,12 +112,16 @@
            <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">

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

@@ -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>

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

@@ -23,7 +23,21 @@
    </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>

@@ -73,7 +87,8 @@
            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,
@@ -204,8 +219,6 @@
            #{id}
        </foreach>
    </update>




</mapper>