| ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/domain/DTO/ManualVisitDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/domain/LishuiFuyouWxChatRequest.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | 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));