问题修改

account/account-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

@@ -9,12 +9,14 @@
      plan.TASK_DETAIL_ID taskDetailId,
      plan.ITEM_NAME itemName,
      emp.emp_name empName,
+     organ.SRV_ORGAN_NAME srvOrganName,
      DECODE(plan.MODE_ID, '1','医疗','2', '养老','3','上门', '4', '异地') srvModeName,
      to_char(plan.SRV_PLAN_TIME,'yyyy-MM-dd') srvDate,
      plan.IS_STATUS status
      from ch_srv_plan plan
      left join ch_disable_info info on plan.DISAB_INFO_ID = info.DISAB_INFO_ID
      left join ch_srv_organ_emp emp on plan.emp_id = emp.emp_id
+     left join CH_SRV_ORGAN organ on organ.SRV_ORGAN_ID = plan.SRV_ORGAN_ID
          <where>
              <if test="req.status != null">
                 and plan.IS_STATUS = #{req.status}
@@ -22,6 +24,9 @@
              <if test="req.realName != null">
                  AND info.real_name LIKE CONCAT('%',CONCAT(#{req.realName},'%'))
              </if>
+             <if test="req.srvOrganName != null">
+                 AND organ.SRV_ORGAN_NAME   LIKE CONCAT('%',CONCAT(#{req.srvOrganName},'%'))
+             </if>
          </where>
 
     </select>

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

@@ -26,11 +26,11 @@
         LEFT JOIN CH_FND_ORGAN t3 ON t2.ORGAN_ID = t3.ORGAN_ID
         left join ch_cfg_srv_mode mode1 on t1.mode_id = mode1.mode_id
         <where>
-            <if test='req.accountsTime != null'>
-                AND t1.ACCOUNTS_TIME = #{req.accountsTime}
+            <if test="req.accountsTime != null and req.accountsTime != ''">
+                AND to_char(t1.ACCOUNTS_TIME,'yyyy-MM') = #{req.accountsTime}
             </if>
-            <if test='req.organName != null'>
-            AND  t2.ORGAN_NAME = #{req.organName}
+            <if test="req.organName != null and req.organName != ''">
+            AND  t2.ORGAN_NAME LIKE CONCAT('%',CONCAT(#{req.organName},'%'))
             </if>
         </where>
     </select>

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvOrganListReq.java

@@ -26,6 +26,12 @@ public class SrvOrganListReq extends BaseReq {
      */
     private Long srvOrganId;
 
+
+    /**
+     * 护理机构id
+     */
+    private String srvOrganName;
+
     /**
      * 结算月份
      */

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvTaskReqVO.java

@@ -17,4 +17,5 @@ public class SrvTaskReqVO extends BaseReq {
 
     private String status;
 
+    private String srvOrganName;
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/SrvOrganListReq.java

@@ -16,7 +16,7 @@ public class SrvOrganListReq extends BaseReq {
     private Long organId;
 
 
-    private Long organName;
+    private String  organName;
     /**
      * 是否包含下级机构
      */
@@ -30,8 +30,7 @@ public class SrvOrganListReq extends BaseReq {
     /**
      * 结算月份
      */
-    @DateTimeFormat(pattern = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
-    private Date accountsTime;
+    private String accountsTime;
 
 }