7712550e92054c8d3a672503d6d0cf0483b2c33b..126d76bf7498be4f508bc66496e06ae217faee36
2026-11-06 陈昶聿
fix: suggest6改为suggest7,修正复查复诊统计口径
126d76 对比 | 目录
2026-11-06 陈昶聿
合并修改
386a81 对比 | 目录
2026-11-06 陈昶聿
【丽水】外链不要患者信息
a4305f 对比 | 目录
已修改3个文件
已添加2个文件
129 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/DTO/ManualVisitDTO.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/LishuiFuyouWxChatRequest.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
@@ -95,15 +95,14 @@
                    serviceOutPath1.setOrgname(orgname);
                }
            }
            if(StringUtils.isNotEmpty(serviceOutPath1.getParam2())){
                RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
                Long patId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceOutPath1.getParam2(), pri_key));
                if(patId != null){
                    PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(patId);
                    serviceOutPath1.setPatArchive(patArchive);
                }
            }
//            if(StringUtils.isNotEmpty(serviceOutPath1.getParam2())){
//                RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
//                Long patId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceOutPath1.getParam2(), pri_key));
//                if(patId != null){
//                    PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(patId);
//                    serviceOutPath1.setPatArchive(patArchive);
//                }
//            }
            return success(serviceOutPath1);
        }
        return success(null);
smartor/src/main/java/com/smartor/domain/DTO/ManualVisitDTO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.smartor.domain.DTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * äººå·¥å¤„理随访任务入参(对应 /smartor/patinhosp/addManualVisit)
 *
 * <p>说明:master ä¾§å·²è°ƒç”¨è¯¥ç±»åž‹ä½†ä»“库中漏提交了实体文件,
 * æ­¤å¤„按 {@code PatMedInhospServiceImpl#addManualVisit} çš„实际用法补齐:
 * ä»…使用 {@link #patids} ä¸Ž {@link #taskid} ä¸¤ä¸ªå­—段。</p>
 *
 * @author ruoyi
 */
@Data
@ApiModel(value = "人工处理随访任务入参")
public class ManualVisitDTO {
    /** æ‚£è€…ID集合 */
    @ApiModelProperty(value = "患者ID集合")
    private List<Long> patids;
    /** éšè®¿ä»»åŠ¡ID */
    @ApiModelProperty(value = "随访任务ID")
    private Long taskid;
}
smartor/src/main/java/com/smartor/domain/LishuiFuyouWxChatRequest.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
package com.smartor.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
 * ä¸½æ°´å¦‡å¹¼å¾®ä¿¡æ¶ˆæ¯è¯·æ±‚(对应 /sms/sendChatFuyou)
 *
 * <p>说明:master ä¾§ {@code SmsController#sendChatFuyou} é€šè¿‡ {@code com.smartor.domain.*}
 * é€šé…å¯¼å…¥ä½¿ç”¨æœ¬ç±»ï¼Œä½†ä»“库中漏提交了实体文件。此处按 {@code SmsUtils.LsWxMessage}
 * çš„字段与 {@code SmsController} çš„实际取值补齐。</p>
 *
 * @author ruoyi
 */
@Data
@ApiModel(value = "丽水妇幼微信消息请求")
public class LishuiFuyouWxChatRequest implements Serializable {
    private static final long serialVersionUID = 1L;
    /** æ¶ˆæ¯æ¨¡æ¿ID,为空时使用配置中的模板 */
    @ApiModelProperty(value = "消息模板ID,为空时使用配置中的模板")
    private Long templateId;
    /** æ‚£è€…编号 */
    @ApiModelProperty(value = "患者编号")
    private String patientId;
    /** æ‚£è€…姓名 */
    @ApiModelProperty(value = "患者姓名")
    private String patientName;
    /** è¯ä»¶å· */
    @ApiModelProperty(value = "证件号")
    private String idCard;
    /** æ‰‹æœºå·ç  */
    @ApiModelProperty(value = "手机号码")
    private String mobile;
    /** å°±è¯Šå¡å· */
    @ApiModelProperty(value = "就诊卡号")
    private String medCardNo;
    /** é€šçŸ¥æ ‡é¢˜ */
    @ApiModelProperty(value = "通知标题")
    private String titleName;
    /** é€šçŸ¥å†…容 */
    @ApiModelProperty(value = "通知内容")
    private String content;
    /** é“¾æŽ¥åœ°å€ */
    @ApiModelProperty(value = "链接地址")
    private String url;
}
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -322,9 +322,9 @@
    @Excel(name = " äºŒæ¬¡éšè®¿å¤±è´¥ ")
    private Long followUpFailAgain = 0L;
    @ApiModelProperty(value = "再次随访回院复诊复查(suggest=6)")
    @ApiModelProperty(value = "再次随访回院复诊复查(suggest=7)")
    @Excel(name = " å†æ¬¡éšè®¿å›žé™¢å¤è¯Šå¤æŸ¥ ")
    private Long suggest6CountAgain = 0L;
    private Long suggest7CountAgain = 0L;
    @ApiModelProperty(value = "二次随访率")
    @Excel(name = " äºŒæ¬¡éšè®¿çއ ")
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -4148,7 +4148,7 @@
    }
    /**
     * å†æ¬¡éšè®¿é™„加统计:待随访、已发送、人工电话超时及回院复诊复查(suggest=6)。
     * å†æ¬¡éšè®¿é™„加统计:待随访、已发送、人工电话超时及回院复诊复查(suggest=7)。
     */
    private void applyAgainFollowUpExtraStatistics(ServiceSubtaskStatistic statistic, ServiceSubtask serviceSubtask) {
        if (serviceSubtask.getVisitCount() == null || serviceSubtask.getVisitCount() <= 1) {
@@ -4158,9 +4158,9 @@
            return;
        }
        Long sendstate = serviceSubtask.getSendstate();
        // å›žé™¢å¤è¯Šå¤æŸ¥ï¼šå†æ¬¡éšè®¿ä¸­æŒ‰å¤„理意见 suggest=6 ç»Ÿè®¡
        if (StringUtils.equals("6", StringUtils.trim(serviceSubtask.getSuggest()))) {
            statistic.setSuggest6CountAgain(statistic.getSuggest6CountAgain() + 1L);
        // å›žé™¢å¤è¯Šå¤æŸ¥ï¼šå†æ¬¡éšè®¿ä¸­æŒ‰å¤„理意见 suggest=7 ç»Ÿè®¡
        if (StringUtils.equals("7", StringUtils.trim(serviceSubtask.getSuggest()))) {
            statistic.setSuggest7CountAgain(statistic.getSuggest7CountAgain() + 1L);
        }
        if (sendstate.equals(3L)) {
            statistic.setSentAgain(statistic.getSentAgain() + 1L);
@@ -4967,7 +4967,7 @@
     * pendingFollowUpSentAgainInfo - visitCount > 1 && sendstate in (3,7)
     * sentInfo - visitCount = 1 && sendstate = 3
     * sentAgainInfo - visitCount > 1 && sendstate = 3
     * suggest6CountAgainInfo - visitCount > 1 && suggest = 6
     * suggest7CountAgainInfo - visitCount > 1 && suggest = 7
     * filterCountList - taskSituation = 6 && sendstate = 4
     *
     */
@@ -5152,10 +5152,10 @@
                serviceSubtaskCountReq.setVisitCount(2);
                serviceSubtaskCountReq.setExcep("1");
                break;
            case "suggest6CountAgainInfo":
                // å†æ¬¡éšè®¿å›žé™¢å¤è¯Šå¤æŸ¥ï¼švisitCount > 1 ä¸” suggest = 6
            case "suggest7CountAgainInfo":
                // å†æ¬¡éšè®¿å›žé™¢å¤è¯Šå¤æŸ¥ï¼švisitCount > 1 ä¸” suggest = 7
                serviceSubtaskCountReq.setVisitCount(2);
                serviceSubtaskCountReq.setSuggest("6");
                serviceSubtaskCountReq.setSuggest("7");
                break;
            case "taskSituation1Info":
                serviceSubtaskCountReq.setTaskSituation(1);
@@ -5688,7 +5688,7 @@
        total.setSentAgain(0L);
        total.setFollowUpSuccessAgain(0L);
        total.setFollowUpFailAgain(0L);
        total.setSuggest6CountAgain(0L);
        total.setSuggest7CountAgain(0L);
        total.setManualAgain(0L);
        total.setSmsAgain(0L);
        total.setWeChatAgain(0L);
@@ -5733,7 +5733,7 @@
            total.setSentAgain(total.getSentAgain() + (stat.getSentAgain() != null ? stat.getSentAgain() : 0L));
            total.setFollowUpSuccessAgain(total.getFollowUpSuccessAgain() + (stat.getFollowUpSuccessAgain() != null ? stat.getFollowUpSuccessAgain() : 0L));
            total.setFollowUpFailAgain(total.getFollowUpFailAgain() + (stat.getFollowUpFailAgain() != null ? stat.getFollowUpFailAgain() : 0L));
            total.setSuggest6CountAgain(total.getSuggest6CountAgain() + (stat.getSuggest6CountAgain() != null ? stat.getSuggest6CountAgain() : 0L));
            total.setSuggest7CountAgain(total.getSuggest7CountAgain() + (stat.getSuggest7CountAgain() != null ? stat.getSuggest7CountAgain() : 0L));
            total.setManualAgain(total.getManualAgain() + (stat.getManualAgain() != null ? stat.getManualAgain() : 0L));
            total.setSmsAgain(total.getSmsAgain() + (stat.getSmsAgain() != null ? stat.getSmsAgain() : 0L));
            total.setWeChatAgain(total.getWeChatAgain() + (stat.getWeChatAgain() != null ? stat.getWeChatAgain() : 0L));