Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -6,9 +6,9 @@
         select a.APPLY_ID applyId,
         o.ORGAN_NAME organName,
         a.organ_id organId,
-        a.DISTRICT_PROVINCIAL provincial,
-        a.DISTRICT_CITY city,
-        a.DISTRICT_AREA area,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) provincial,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_CITY = dis.DISTRICT_CODE) city,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_AREA = dis.DISTRICT_CODE) area,
         a.REAL_NAME name,
         a.birthday birthday,
         a.CERTI_CODE certiCode,
@@ -29,9 +29,9 @@
         LEFT JOIN CH_SRV_ORGAN s ON a.SRV_ORGAN_ID = s.SRV_ORGAN_ID
         <where>
             <if test="organIds != null">
-                and  a.organ_id in
+                and a.organ_id in
                 <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                 #{organId}
+                    #{organId}
                 </foreach>
             </if>
             <if test="provincial != null and provincial != ''">

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -8,19 +8,19 @@
         task.apply_id applyId,
         organ.organ_name organName,
         task.apr_organ_id aprOrganId,
-        task.district_provincial districtProvincial,
-        task.district_city districPity,
-        task.district_area districtArea,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
         disable.real_name realName,
         task.fcd fcd,
         disable.certi_code certiCode,
         (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
         (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
         disable.tel tel,
-        disable.ACPT_PROVINCIAL acptProvincial,
-        disable.ACPT_CITY acptCity,
-        disable.ACPT_AREA acptArea,
-        disable.ACPT_STREET acptStreet,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_PROVINCIAL = dis.DISTRICT_CODE) acptProvincial,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_AREA = dis.DISTRICT_CODE) acptArea,
+        (select DISTRICT_NAME from CH_FND_STREET street where disable.ACPT_AREA = street.STREET_CODE) acptStreet,
         disable.end_time endTime,
         emp.real_name empRealName,
         emp.tel emoTel,
@@ -35,9 +35,10 @@
         left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id
         left join ch_apr_emp emp on task.apr_emp_id = emp.emp_id
         left join ch_apr_task_push push on task.task_id = push.task_id
+        left join ch_apr_task_emp cate on task.task_id = cate.task_id
         <where>
             <if test="organIds != null">
-                and  task.apr_organ_id in
+                and task.apr_organ_id in
                 <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                     #{organId}
                 </foreach>
@@ -67,13 +68,16 @@
                 and emp.tel = #{taskTel}
             </if>
             <if test="daysRemaining != null and daysRemaining != ''">
-                #and s.SRV_ORGAN_NAME = #{taskName}
+                and (to_date(to_char(task.last_apr_date,'yyyy-MM-dd'),'yyyy-MM-dd') - to_date(to_char(sysdate,'yyyy-MM-dd'),'yyyy-MM-dd')) + 1 &lt;= #{daysRemaining}
             </if>
             <if test="status != null and status != ''">
                 and task.TASK_STATUS = #{status}
             </if>
-            <if test="isReturn != null and isReturn != ''">
-                #and s.SRV_ORGAN_NAME = #{taskName}
+            <if test="isReturn != null and isReturn == '0'">
+                and cate.is_valid = 1 and task.task_status in (0,4,5)
+            </if>
+            <if test="isReturn != null and isReturn == '1'">
+                (and cate.is_valid = 0 or cate.is_valid is null)
             </if>
         </where>
     </select>