Merge remote-tracking branch 'origin/dev_20230403_打卡管理问题修复_zxl' into uat_ch_master

governance/src/main/resources/com/hungraim/ltc/governance/mapper/BuildBedMapper.xml

@@ -27,7 +27,9 @@
 
     <select id="chSrvTaskDetailQuery" parameterType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo"
             resultType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo">
-        select
+
+        select A.* from (
+        select row_number()over(partition by info.CERTI_CODE order by program.PROGRAM_ID) rn,
         program.PROGRAM_ID taskDetailId,
         mode1.MODE_NAME modeName,
         organ.SRV_ORGAN_NAME srvOrganName,--护理机构名称
@@ -59,6 +61,8 @@
         <if test="vo.sevEndTime != null and vo.sevEndTime != ''">
             AND program.PROGRAM_EDN_DATE &lt;= TO_DATE (#{vo.sevEndTime}, 'yyyy-mm-dd')
         </if>
+        )A
+        where A.rn =1
     </select>
     <select id="getsrvOrgan"  resultType="com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO">
         SELECT
@@ -94,10 +98,6 @@
         inner JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = item.ITEM_ID
         inner join CH_SERVICE_TYPE_DETAILED service on service.SERVICE_TYPE_DETAILED_ID = CSOP.ITEM_NAME
         WHERE 1=1
-        <if test="taskDetailId != null and taskDetailId != ''">
-            and task.PROGRAM_ID   = #{taskDetailId}
-        </if>
-
         <if test="certiCode != null and certiCode != ''">
             and task.DISAB_INFO_ID = (select DISAB_INFO_ID from CH_DISABLE_INFO  where CERTI_CODE =#{certiCode})
         </if>