From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java
index dd4de42..c64f91c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java
@@ -345,16 +345,12 @@
     /**
      * 业绩短信提醒
      */
-    @ApiOperation(value = "crm诊所管理信息-业绩短信提醒", notes = "clinicId:诊所id,performanceStatus:业绩状态 1=未达成 2=已达成")
+    @ApiOperation(value = "crm诊所管理信息-业绩短信提醒", notes = "clinicId:诊所id")
     @GetMapping(value = "/medicationReminder")
-    public R<String> medicationReminder(@RequestParam(value = "clinicId") String clinicId,
-                                        @RequestParam(value = "performanceStatus") Integer performanceStatus) {
+    public R<String> medicationReminder(@RequestParam(value = "clinicId") String clinicId) {
         TCrmClinic crmClinic = crmClinicService.getById(clinicId);
         if(StringUtils.isNotBlank(crmClinic.getPhone())){
-            Integer performanceCount = crmClinic.getPerformanceCount();
-            if(performanceStatus == 1){
-                performanceCount = performanceCount+1;
-            }
+            int performanceCount = crmClinic.getPerformanceCount() + 1;
             TCrmSalesperson crmSalesperson = crmSalespersonService.getById(crmClinic.getSalespersonId());
             TSysMessageTemplate messageTemplate = sysMessageTemplateService.getOne(Wrappers.lambdaQuery(TSysMessageTemplate.class)
                     .eq(TSysMessageTemplate::getTemplateType, 2));
@@ -362,7 +358,7 @@
             try {
                 Map<String,String> params = new HashMap<>();
                 params.put("name",crmSalesperson.getSalespersonName());
-                params.put("num",performanceCount.toString());
+                params.put("num", Integer.toString(performanceCount));
                 msgUtils.sendMsg(crmClinic.getPhone(),params, messageTemplate.getTemplateCode());
             } catch (Exception e) {
                 throw new RuntimeException(e);

--
Gitblit v1.7.1