From 82fa727ef9fe2a2f50095a6b9f16b70ecf3e2511 Mon Sep 17 00:00:00 2001
From: "jesse.wang" <jesse.wang@cloudwise.com>
Date: Fri, 14 Apr 2023 05:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E7=97=87=E8=AF=8A=E6=96=AD?=
 =?UTF-8?q?=E5=88=9D=E7=AD=9B=E5=A5=97=E9=A4=90=E5=86=85=E5=AE=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml   | 3 +++
 .../src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml  | 4 +++-
 .../resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml     | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml
index fdf3273..bf2fa56 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml
@@ -249,6 +249,7 @@
                 and rehabilitation_advice_res = #{diagnosis.rehabilitationAdviceRes}
             </if>
         </where>
+        GROUP BY baby_id
         limit #{pageable.offset}, #{pageable.limit}
     </select>
 
@@ -393,6 +394,7 @@
                 and rehabilitation_advice_res = #{diagnosis.rehabilitationAdviceRes}
             </if>
         </where>
+        GROUP BY baby_id
     </select>
     <select id="queryListByBabyId" resultMap="BabyAutismDiagnosisMap">
         select
@@ -407,6 +409,7 @@
         <where>
             and baby_id = #{id}
         </where>
+
     </select>
 
     <!--新增所有列-->
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
index 35a3fb8..f638ec0 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
@@ -208,7 +208,8 @@
                 and rescreen_results = #{doubleSieving.rescreenResults}
             </if>
         </where>
-        limit #{pageable.offset}, #{pageable.pageSize}
+        GROUP BY baby_id
+        limit #{pageable.offset}, #{pageable.limit}
     </select>
 
     <!--统计总行数-->
@@ -358,6 +359,7 @@
                 and rescreen_results = #{doubleSieving.rescreenResults}
             </if>
         </where>
+        GROUP BY baby_id
     </select>
 
     <!--新增所有列-->
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
index 0b65903..2ce08fc 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
@@ -172,6 +172,7 @@
                 and preliminary_screening_results = #{babyAutismPrimaryScreening.global}
             </if>
         </where>
+        GROUP BY baby_id
         limit #{pageable.offset}, #{pageable.limit}
     </select>
 
@@ -271,6 +272,7 @@
                 and preliminary_screening_results = #{babyAutismPrimaryScreening.global}
             </if>
         </where>
+        GROUP BY baby_id
     </select>
 
     <!--新增所有列-->
-- 
1.8.3.1