ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java

@@ -129,10 +129,10 @@
    @GetMapping("ssoLoginLyra")
    public RedirectView ssoLoginLyra() {
        log.info("收到SSO登录请求，开始重定向到授权服务器");
        String redirectUri = internalRedirectUri;
        redirectUri = URLEncoder.encode(internalRedirectUri);
        String path = sysConfigService.selectConfigByKey("sys.qddz");
        String lyraPath = "https://9.208.39.29:13021";
//        String redirectUri = internalRedirectUri;
        String redirectUri = "https://9.208.2.190:8092";
        String lyraPath = "https://9.0.124.104:13021";
        String clientId = "1553548571532333056";
        String clientSecret = "suifangxt";
        String scope = "openid";

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

@@ -970,7 +970,7 @@
                if (allSendStateNot1AndNot9) {
                    //说明全发送失败了
                    serviceSubtask.setSendstate(5L);
                    serviceSubtask.setRemark("getSendPreachform方法 检查是否所有sendstate不等于9, 全失败了");
                    log.error("getSendPreachform方法 检查是否所有sendstate不等于9, 全失败了");
                    serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                    //修改发送状态
                    setFail(serviceSubtaskPreachforms, serviceSubtask);

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

@@ -437,4 +437,11 @@
    @ApiModelProperty(value = "适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型")
    @Excel(name = "适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型")
    private String appltype;

    /**
     * 疾病病种
     */
    @ApiModelProperty(value = "疾病病种")
    @Excel(name = " 疾病病种")
    private String diagType;
}

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

@@ -439,4 +439,11 @@

    @ApiModelProperty(value = "随访部门名称")
    private String visitDeptName;

    /**
     * 疾病病种
     */
    @ApiModelProperty(value = "疾病病种")
    @Excel(name = " 疾病病种")
    private String diagType;
}

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

@@ -60,6 +60,7 @@
        <result property="nexttaskname" column="nexttaskname"/>
        <result property="appltype" column="appltype"/>
        <result property="patCycle" column="pat_cycle"/>
        <result property="diagType" column="diag_type"/>
    </resultMap>

    <sql id="selectServiceTaskVo">
@@ -116,7 +117,8 @@
               orgid,
               nexttaskflag,
               nexttaskid,
               nexttaskname
               nexttaskname,
               diag_type
        from service_task
    </sql>

@@ -171,6 +173,7 @@
            <if test="nexttaskid != null  ">and nexttaskid = #{nexttaskid}</if>
            <if test="nexttaskname != null  ">and nexttaskname = #{nexttaskname}</if>
            <if test="appltype != null  ">and appltype = #{appltype}</if>
            <if test="diagType != null and diagType != ''">and diag_type = #{diagType}</if>
            <if test="leavehospitaldistrictname != null  ">and leavehospitaldistrictname =
                #{leavehospitaldistrictname}
            </if>
@@ -388,6 +391,7 @@
            <if test="sendDay != null  ">send_day,</if>
            <if test="appltype != null  ">appltype,</if>
            <if test="patCycle != null  ">pat_cycle,</if>
            <if test="diagType != null and diagType != ''">diag_type,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskName != null">#{taskName},</if>
@@ -443,6 +447,7 @@
            <if test="sendDay != null  ">#{sendDay},</if>
            <if test="appltype != null  ">#{appltype},</if>
            <if test="patCycle != null  ">#{patCycle},</if>
            <if test="diagType != null and diagType != ''">#{diagType},</if>
        </trim>
    </insert>

@@ -504,6 +509,7 @@
            <if test="sendDay != null  ">send_day = #{sendDay},</if>
            <if test="appltype != null  ">appltype = #{appltype},</if>
            <if test="patCycle != null  ">pat_cycle = #{patCycle},</if>
            <if test="diagType != null and diagType != ''">diag_type = #{diagType},</if>
        </trim>
        where taskid = #{taskid}
    </update>