代码提交

liusheng

2025-04-28 284545b6694878772a77ed329283b4901a4534f0

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -6,6 +6,7 @@
import com.google.gson.Gson;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.ServiceFromEnum;
import com.ruoyi.common.enums.WxGZHEnum;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
@@ -30,12 +31,15 @@
import org.springframework.stereotype.Component;

import java.net.URLEncoder;
import java.security.MessageDigest;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import static cn.hutool.core.convert.Convert.toHex;

@Slf4j
@Component//监听此队列
@@ -53,9 +57,6 @@
    @Value("${req_path}")
    private String req_path;

    @Value("${thirdWXUrl}")
    private String thirdWXUrl;

    @Autowired
    private IServiceOutPathService iServiceOutPathService;

@@ -72,16 +73,10 @@
    private RedisCache redisCache;

    @Autowired
    private RobotPhoneUtils robotPhoneUtils;

    @Autowired
    private ServiceTaskMapper svyTaskMapper;

    @Autowired
    private ServiceSubtaskMapper serviceSubtaskMapper;

    @Autowired
    private ISvyTaskTemplateService iSvyTaskTemplateService;

    @Autowired
    private IServiceSubtaskRecordService serviceSubtaskRecordService;
@@ -91,9 +86,6 @@

    @Value("${xhsmsPath}")
    private String xhsmsPath;

    @Value("${appid}")
    private String appid;

    // åˆ›å»ºå›ºå®šå¤§å°çš„线程池
    private static final ExecutorService executorService = Executors.newFixedThreadPool(10);
@@ -489,7 +481,32 @@
                                url = ip + ":" + req_path + "/xj?p=" + format;
                            }
                            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask.getPatid());
                            String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatientno());
                            if (StringUtils.isEmpty(patArchive.getPatidHis())) {
                                ServiceSubtask ss = new ServiceSubtask();
                                ss.setResult("error");
                                ss.setRemark("公众号发送失败,his系统的患者id为空");
                                ss.setSendstate(5L);
                                ss.setId(serviceSubtask.getId());
                                ss.setFinishtime(new Date());
                                serviceSubtaskMapper.updateServiceSubtask(ss);
                                continue;
                            }

                            //获取微信公众号请求信息根据机构ID
                            List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
                            if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
                                ServiceSubtask ss = new ServiceSubtask();
                                ss.setResult("error");
                                ss.setRemark("该机构的公众号配置信息不全，无法通过公众号发送");
                                ss.setSendstate(5L);
                                ss.setId(serviceSubtask.getId());
                                ss.setFinishtime(new Date());
                                serviceSubtaskMapper.updateServiceSubtask(ss);
                                continue;
                            }


                            String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatidHis(),wxqqxx);
                            Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
                            if (!map.isEmpty()) {
                                serviceSubtask.setResult("success");
@@ -633,22 +650,42 @@
        return key;
    }

    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid) {
    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String patientname, String setPatientid,List<String> wxqqxx) {
        XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
        xinHuaWXReq.setIdcard(idcard);
        xinHuaWXReq.setUrl(url);
        xinHuaWXReq.setPatientid(setPatientid);
        xinHuaWXReq.setPatientname(setPatientname);
        xinHuaWXReq.setPatientname(patientname);
        xinHuaWXReq.setMobile(phone);
        xinHuaWXReq.setMedcardno(null);
        xinHuaWXReq.setTitlename(taskName);
        xinHuaWXReq.setContent(taskDesc);
        xinHuaWXReq.setAppid(appid);
        xinHuaWXReq.setAppid(wxqqxx.get(1));
        log.error("-----微信公众号的出差为----：{}", xinHuaWXReq);
        String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
        String body = new Gson().toJson(xinHuaWXReq);
        String encode = encode(wxqqxx.get(2).concat(body));
        log.error("--------encode的值为：{}-----", encode);
        Map<String, String> headerMap = new HashMap<>();
        headerMap.put("sign", encode);
        String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
        log.error("--------result的值为：{}-----", result);

        JSONObject jsonObject = JSONObject.parseObject(result);
        String code = (String) jsonObject.toString();
        return code;
    }

    public String encode(String arg) {
        if (arg == null) {
            arg = "";
        }
        MessageDigest md5 = null;
        try {
            md5 = MessageDigest.getInstance("MD5");
            md5.update(arg.getBytes("UTF-8"));
        } catch (Exception e) {
            e.printStackTrace();
        }
        return toHex(md5.digest());
    }
}

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

@@ -12,6 +12,7 @@
import com.smartor.domain.PatMedInhosp;
import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
import com.smartor.domain.PatServiceCount;
import com.smartor.service.IPatMedInhospService;
import com.smartor.service.IPatMedOuthospService;
import io.swagger.annotations.Api;
@@ -63,6 +64,17 @@
    }

    /**
     * å‡ºé™¢ã€é—¨è¯Šäººæ•°å’Œéšè®¿é‡ç»Ÿè®¡ï¼ˆå‘¨ï¼Œæœˆï¼Œå¹´ï¼‰
     */
    @ApiOperation("出院、门诊人数和随访量统计（周，月，年）")
    //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
    @PostMapping("/queryPersonCount")
    public TableDataInfo queryPersonCount(@RequestBody PatServiceCount patServiceCount) {

        return null;
    }

    /**
     * æŸ¥è¯¢å½“前登陆人自己（病区、部门）的患者住院记录列表
     */
    @ApiOperation("查询当前登陆人自己（病区、部门）的患者住院记录列表")

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

@@ -13,10 +13,10 @@
        #        å…¬å¸
        #        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
        #        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
        #        # æ–°åŽ
        #        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: smartor
@@ -24,10 +24,10 @@
        #        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
#        username: hxsoft
#        password: Hxerp2000
#        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
        username: hxsoft
        password: Hxerp2000
        driverClassName: com.mysql.cj.jdbc.Driver

      # ä»Žåº“数据源
      slave:
@@ -100,12 +100,6 @@
    page: page
    default-page: 1
    default-size: 10

  #微信公众号的密钥（丽水）
appid: "3311000002"
appSecret: MzMxMTAwMDAwMg==
#第三方微信公众号发送地址（丽水）
thirdWXUrl: http://192.168.10.170:18001/frontend/medical/api

#钉钉的密钥
dingAppid: dingn8iip5ubj7clrrsv

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

@@ -131,7 +131,7 @@
# Swagger配置
swagger:
  # æ˜¯å¦å¼€å¯swagger
  enabled: false
  enabled: true
  # è¯·æ±‚前缀
  pathMapping: /dev-api


 ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
package com.ruoyi.common.enums;

import com.ruoyi.common.utils.StringUtils;

import java.util.ArrayList;
import java.util.List;

/**
 * ä¸½æ°´å…¬ä¼—号
 */
public enum WxGZHEnum {
    ZYY("47231022633110211A2101", "3311000002", "MzMxMTAwMDAwMg==", "http://192.168.10.170:18001/frontend/medical/api"), JN("47255004333112711A1001", null, null, null);


    private String orgid;
    private String appid;
    private String appSecret;
    private String address;

    WxGZHEnum(String orgid, String appid, String appSecret, String address) {
        this.orgid = orgid;
        this.appid = appid;
        this.appSecret = appSecret;
        this.address = address;
    }

    public static List<String> getDescByCode(String orgid) {
        WxGZHEnum[] organEnums = values();
        for (int i = 0; i < organEnums.length; i++) {
            WxGZHEnum organEnum = organEnums[i];
            if (organEnum.getOrgid().equals(orgid)) {
                List<String> list = new ArrayList<>();
                if (StringUtils.isEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid());
                if (StringUtils.isEmpty(organEnum.getAppid())) list.add(organEnum.getAppid());
                if (StringUtils.isEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret());
                if (StringUtils.isEmpty(organEnum.getAddress())) list.add(organEnum.getAddress());
                return list;
            }
        }
        return null;
    }

    public String getOrgid() {
        return orgid;
    }

    public void setOrgid(String orgid) {
        this.orgid = orgid;
    }

    public String getAddress() {
        return address;
    }

    public void setAddress(String address) {
        this.address = address;
    }

    public String getAppid() {
        return appid;
    }

    public void setAppid(String appid) {
        this.appid = appid;
    }

    public String getAppSecret() {
        return appSecret;
    }

    public void setAppSecret(String appSecret) {
        this.appSecret = appSecret;
    }
}

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

@@ -11,6 +11,7 @@
import com.google.gson.JsonObject;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.ServiceFromEnum;
import com.ruoyi.common.enums.WxGZHEnum;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.RSAPublicKeyExample;
@@ -41,6 +42,7 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.MessageDigest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -50,6 +52,8 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

import static cn.hutool.core.convert.Convert.toHex;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦æµ‹è¯•
@@ -97,9 +101,6 @@

    @Value("${pub_key}")
    private String pub_key;

    @Value("${thirdWXUrl}")
    private String thirdWXUrl;

    @Value("${req_path}")
    private String req_path;
@@ -542,10 +543,32 @@
                                url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
//                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "无");

                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatientno());
                                //获取微信公众号请求信息根据机构ID
                                List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
                                if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
                                    ServiceSubtask ss = new ServiceSubtask();
                                    ss.setResult("error");
                                    ss.setRemark("该机构的公众号配置信息不全，无法通过公众号发送");
                                    ss.setSendstate(5L);
                                    ss.setId(serviceSubtask.getId());
                                    ss.setFinishtime(new Date());
                                    serviceSubtaskMapper.updateServiceSubtask(ss);
                                    continue;
                                }

                                if (StringUtils.isEmpty(patArchive.getPatidHis())) {
                                    ServiceSubtask ss = new ServiceSubtask();
                                    ss.setResult("error");
                                    ss.setRemark("公众号发送失败,his系统的患者id为空");
                                    ss.setSendstate(5L);
                                    ss.setId(serviceSubtask.getId());
                                    ss.setFinishtime(new Date());
                                    serviceSubtaskMapper.updateServiceSubtask(ss);
                                    continue;
                                }
                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);

                                Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);

                                //任务发送记录
                                ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                                serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
@@ -799,7 +822,7 @@
        return key;
    }

    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid) {
    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid, List<String> wxqqxx) {
        XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
        xinHuaWXReq.setIdcard(idcard);
        xinHuaWXReq.setUrl(url);
@@ -809,17 +832,31 @@
        xinHuaWXReq.setMedcardno(null);
        xinHuaWXReq.setTitlename(taskName);
        xinHuaWXReq.setContent(taskDesc);
        xinHuaWXReq.setAppid(appid);
        xinHuaWXReq.setAppid(wxqqxx.get(1));
        log.error("----getWXCode---xinHuaWXReq的出参为：{}", xinHuaWXReq);
        String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
        String body = new Gson().toJson(xinHuaWXReq);
        String encode = encode(wxqqxx.get(2).concat(body));
        Map<String, String> headerMap = new HashMap<>();
        headerMap.put("sign", encode);
        String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);

        JSONObject jsonObject = JSONObject.parseObject(result);
        String code = (String) jsonObject.toString();
        return code;
    }
//    public static void main(String[] args) {
//        LocalDateTime originalDateTime = LocalDateTime.now();
//        LocalDateTime startOfDay = originalDateTime.with(LocalTime.MIN);
//        System.out.println("Original DateTime: " + originalDateTime);
//        System.out.println("Start of Day: " + startOfDay);
//    }


    public String encode(String arg) {
        if (arg == null) {
            arg = "";
        }
        MessageDigest md5 = null;
        try {
            md5 = MessageDigest.getInstance("MD5");
            md5.update(arg.getBytes("UTF-8"));
        } catch (Exception e) {
            e.printStackTrace();
        }
        return toHex(md5.digest());
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -492,6 +492,7 @@
                sysUserDept.setUserId(user.getUserId());
                sysUserDept.setDeptCode(wardCode);
                sysUserDept.setDeptId(sysDept.getDeptId());
                sysUserDept.setOrgid(user.getOrgid());
                List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
                sysUserDept.setDelFlag(0L);
                sysUserDept.setDeptType("2");

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
package com.smartor.domain;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * å‡ºé™¢ã€é—¨è¯Šäººæ•°å’Œéšè®¿é‡ç»Ÿè®¡ï¼ˆå‘¨ï¼Œæœˆï¼Œå¹´ï¼‰ PatServiceCount
 *
 * @author smartor
 * @date 2023-03-04
 */
@ApiModel(value = "PatServiceCount", description = "出院、门诊人数和随访量统计（周，月，年）")
@Data
public class PatServiceCount extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty(value = "出院还是门诊（1：出院  2门诊）")
    private Integer cymz;

    /**
     * é—´éš”： 1周  2月  3å¹´
     */
    @ApiModelProperty(value = "间隔： 1周  2月  3å¹´")
    private Integer interval;


    /**
     * å¼€å§‹æ—¶é—´
     */
    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " å…¥é™¢æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    private Date starttime;

    /**
     * å‡ºé™¢æ—¶é—´
     */
    @ApiModelProperty(value = "结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " å‡ºé™¢æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    private Date endtime;

}

 smartor/src/main/java/com/smartor/service/IPatMedInhospService.java

@@ -2,10 +2,7 @@

import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.smartor.domain.PatMedInhosp;
import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
import com.smartor.domain.PatMedRes;
import com.smartor.domain.*;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;
@@ -35,6 +32,11 @@
    public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp);

    /**
     * å‡ºé™¢ã€é—¨è¯Šäººæ•°å’Œéšè®¿é‡ç»Ÿè®¡ï¼ˆå‘¨ï¼Œæœˆï¼Œå¹´ï¼‰
     */
    public Map<String,Integer> queryPersonCount(PatServiceCount patServiceCount);

    /**
     * æŸ¥è¯¢å½“前登陆人自己（病区、部门）的患者住院记录列表
     *
     * @param patMedInhospVO

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -76,6 +76,19 @@
        return patMedInhospList;
    }

    @Override
    public Map<String, Integer> queryPersonCount(PatServiceCount patServiceCount) {
        if (patServiceCount.getInterval() == 1) {
            //周
        } else if (patServiceCount.getInterval() == 2) {
            //月
        } else if (patServiceCount.getInterval() == 3) {
            //å¹´
        }

        return null;
    }

    /**
     * æŸ¥è¯¢å½“前登陆人自己（病区、部门）的患者住院记录列表
     *