From 3b9744ee57c1352e9bfa6bffe197d7c1925650fa Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Fri, 24 Sep 2021 15:37:36 +0800
Subject: [PATCH] =?UTF-8?q?PC=E6=82=A3=E8=80=85=E9=97=AE=E8=AF=8A=E5=8D=A1?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/talkonlineweb/controller/PatientController.java   | 10 ++++++++--
 .../java/com/lyms/talkonlineweb/mapper/LymsTcardMapper.java    |  5 +++--
 .../java/com/lyms/talkonlineweb/service/LymsTcardService.java  |  2 +-
 .../lyms/talkonlineweb/service/impl/LymsTcardServiceImpl.java  |  4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
index 01e809b..d375d06 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
@@ -622,9 +622,15 @@ public class PatientController {
      * @return
      */
     @GetMapping("cardStat")
-    public BaseResponse cardStat(){
+    public BaseResponse cardStat(Integer type){
         BaseResponse baseResponse = new BaseResponse();
-        Map<String,Object> rs= lymsTcardService.cardStat();
+        String pSql="";
+        String cSql="";
+        if (type != null) {
+            pSql="WHERE id IN (SELECT c.`pid` FROM lyms_tcard c WHERE c.`fid`="+type+")";
+            cSql="WHERE fid="+type;
+        }
+        Map<String,Object> rs= lymsTcardService.cardStat(pSql,cSql);
         baseResponse.setObject(rs);
         return baseResponse;
     }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsTcardMapper.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsTcardMapper.java
index 711ed17..89fb2b1 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsTcardMapper.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsTcardMapper.java
@@ -2,6 +2,7 @@ package com.lyms.talkonlineweb.mapper;
 
 import com.lyms.talkonlineweb.domain.LymsTcard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.Map;
@@ -11,8 +12,8 @@ import java.util.Map;
  */
 public interface LymsTcardMapper extends BaseMapper<LymsTcard> {
 
-    @Select("SELECT a.ccnt,b.cnt FROM (SELECT SUM(ccnt) ccnt FROM lyms_patient) a,(SELECT SUM(cnt) cnt  FROM lyms_tcard ) b")
-    Map<String, Object> cardStat();
+    @Select("SELECT IFNULL(a.ccnt,0) ccnt,IFNULL(b.cnt,0) cnt FROM (SELECT SUM(ccnt) ccnt FROM lyms_patient ${pSql}  ) a,(SELECT SUM(cnt) cnt  FROM lyms_tcard ${cSql} ) b")
+    Map<String, Object> cardStat(@Param("pSql") String pSql,@Param("cSql") String cSql);
 }
 
 
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsTcardService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsTcardService.java
index 6375548..c615e6a 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsTcardService.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsTcardService.java
@@ -10,5 +10,5 @@ import java.util.Map;
  */
 public interface LymsTcardService extends IService<LymsTcard> {
 
-    Map<String, Object> cardStat();
+    Map<String, Object> cardStat(String pSql, String cSql);
 }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsTcardServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsTcardServiceImpl.java
index 6752052..1036c9f 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsTcardServiceImpl.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsTcardServiceImpl.java
@@ -19,8 +19,8 @@ public class LymsTcardServiceImpl extends ServiceImpl<LymsTcardMapper, LymsTcard
     private LymsTcardMapper lymsTcardMapper;
 
    @Override
-    public Map<String, Object> cardStat() {
-        return lymsTcardMapper.cardStat();
+    public Map<String, Object> cardStat(String pSql, String cSql) {
+        return lymsTcardMapper.cardStat(pSql,cSql);
     }
 }
 
-- 
1.8.3.1