新增为复选条件的高级查询修改

ruoyi-modules/mz-business-lrgl/src/main/java/com/ruoyi/business/domain/ZwywLrJbxx.java

@@ -317,11 +317,6 @@ public class ZwywLrJbxx extends BaseEntity
     @DictV(type = "XZ015", isMuti = true, message = "{健康状况}")
     private String lrJkzk;
 
-
-    @ApiModelProperty(value = "健康状况查询条件")
-    @TableField(exist = false)
-    private List<String> lrJkzkCx;
-
     /** 残疾类型 */
 //    @Excel(name = "残疾类型")
     @ApiModelProperty(value = "残疾类型")
@@ -516,4 +511,36 @@ public class ZwywLrJbxx extends BaseEntity
     @Size(max = 200, message = "{最新驳回原因}")
     private String lrBhyy;
 
+    @ApiModelProperty(value = "健康状况查询条件")
+    @TableField(exist = false)
+    private List<String> lrJkzkCx;
+
+    @ApiModelProperty(value = "经济状况查询条件")
+    @TableField(exist = false)
+    private List<String> lrJjzkCx;
+
+    @ApiModelProperty(value = "收入来源查询条件")
+    @TableField(exist = false)
+    private List<String> lrSrlyCx;
+
+    @ApiModelProperty(value = "家庭救助帮扶查询条件")
+    @TableField(exist = false)
+    private List<String> lrJtjzbfqkCx;
+
+    @ApiModelProperty(value = "陪伴居住情况查询条件")
+    @TableField(exist = false)
+    private List<String> lrPbjjqkCx;
+
+    @ApiModelProperty(value = "日常生活照料人查询条件")
+    @TableField(exist = false)
+    private List<String> zlrLbCx;
+
+    @ApiModelProperty(value = "关爱服务需求查询条件")
+    @TableField(exist = false)
+    private List<String> lrGaxqCx;
+
+    @ApiModelProperty(value = "残疾类型查询条件")
+    @TableField(exist = false)
+    private List<String> lrCjlxCx;
+
 }

ruoyi-modules/mz-business-lrgl/src/main/resources/mapper/business/ZwywLrJbxxMapper.xml

@@ -125,9 +125,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDb != null "> and is_db = #{isDb}</if>
             <if test="isChx != null "> and is_chx = #{isChx}</if>
             <if test="lrStpgdj != null  and lrStpgdj != ''"> and lr_stpgdj = #{lrStpgdj}</if>
-            <if test="lrJkzk != null  and lrJkzk != ''"> and FIND_IN_SET(#{lrJkzk},lr_jkzk)</if>
             <if test="lrCjlx != null  and lrCjlx != ''"> and lr_cjlx = #{lrCjlx}</if>
-            <if test="lrJjzk != null  and lrJjzk != ''"> and lr_jjzk like concat('%', #{lrJjzk}, '%')</if>
+            <if test="lrJjzkCx != null  and lrJjzkCx != ''">
+                AND
+                <foreach item="item" index="index" collection="lrJjzkCx" open="(" close=")" separator="or">
+                    (
+                    lr_jjzk LIKE CONCAT('%',#{item},'%')
+                    )
+                </foreach>
+            </if>
+            <if test="lrJkzkCx != null  and lrJkzkCx != ''">
+                AND
+                <foreach item="item" index="index" collection="lrJkzkCx" open="(" close=")" separator="or">
+                    (
+                    lr_jkzk LIKE CONCAT('%',#{item},'%')
+                    )
+                </foreach>
+            </if>
             <if test="lzzt != null  and lzzt != ''"> and lzzt = #{lzzt}</if>
             <if test="ryzt != null  and ryzt != ''"> and ryzt = #{ryzt}</if>
             <if test="cjzh != null  and cjzh != ''"> and cjzh = #{cjzh}</if>
@@ -209,10 +223,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isSz != null and isSz != ''"> and is_sz = #{isSz}</if>
             <if test="isLs != null and isLs != ''"> and is_ls = #{isLs}</if>
             <if test="isDb != null and isDb != ''"> and is_db = #{isDb}</if>
-            <if test="lrJjzk != null  and lrJjzk != ''">
-                AND lr_jjzk in
-                <foreach item="lrJjzk" index="index" collection="lrJjzk.split(',')" open="(" separator="," close=")">
-                    #{lrJjzk}
+            <if test="lrJjzkCx != null  and lrJjzkCx != ''">
+                AND
+                <foreach item="item" index="index" collection="lrJjzkCx" open="(" close=")" separator="or">
+                    (
+                    lr_jkzk LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="isDj != null and isDj != ''"> and is_dj = #{isDj}</if>
@@ -243,10 +259,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     )
                 </foreach>
             </if>
-            <if test="lrCjlx != null  and lrCjlx != ''">
-                AND lr_cjlx in
-                <foreach item="lrCjlx" index="index" collection="lrCjlx.split(',')" open="(" separator="," close=")">
-                    #{lrCjlx}
+            <if test="lrCjlxCx != null  and lrCjlxCx != ''">
+                AND
+                <foreach item="item" index="index" collection="lrCjlxCx" open="(" close=")" separator="or">
+                    (
+                    lr_cjlx LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="lrCjdj != null  and lrCjdj != ''">
@@ -261,10 +279,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{lrNlzk}
                 </foreach>
             </if>
-            <if test="lrSrly != null  and lrSrly != ''">
-                AND lr_srly in
-                <foreach item="lrSrly" index="index" collection="lrSrly.split(',')" open="(" separator="," close=")">
-                    #{lrSrly}
+            <if test="lrSrlyCx != null  and lrSrlyCx != ''">
+                AND
+                <foreach item="item" index="index" collection="lrSrlyCx" open="(" close=")" separator="or">
+                    (
+                    lr_srly LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="lrKzpsr != null  and lrKzpsr != ''">
@@ -279,28 +299,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{lrGrnrs}
                 </foreach>
             </if>
-            <if test="lrJtjzbfqk != null  and lrJtjzbfqk != ''">
-                AND lr_jtjzbfqk in
-                <foreach item="lrJtjzbfqk" index="index" collection="lrJtjzbfqk.split(',')" open="(" separator="," close=")">
-                    #{lrJtjzbfqk}
+            <if test="lrJtjzbfqkCx != null  and lrJtjzbfqkCx != ''">
+                AND
+                <foreach item="item" index="index" collection="lrJtjzbfqkCx" open="(" close=")" separator="or">
+                    (
+                    lr_jtjzbfqk LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
-            <if test="lrPbjjqk != null  and lrPbjjqk != ''">
-                AND lr_pbjjqk in
-                <foreach item="lrPbjjqk" index="index" collection="lrPbjjqk.split(',')" open="(" separator="," close=")">
-                    #{lrPbjjqk}
+            <if test="lrPbjjqkCx != null  and lrPbjjqkCx != ''">
+                AND
+                <foreach item="item" index="index" collection="lrPbjjqkCx" open="(" close=")" separator="or">
+                    (
+                    lr_pbjjqk LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
-            <if test="zlrLb != null  and zlrLb != ''">
-                AND zlr_lb in
-                <foreach item="zlrLb" index="index" collection="zlrLb.split(',')" open="(" separator="," close=")">
-                    #{zlrLb}
+            <if test="zlrLbCx != null  and zlrLbCx != ''">
+                AND
+                <foreach item="item" index="index" collection="zlrLbCx" open="(" close=")" separator="or">
+                    (
+                    zlr_lb LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
-            <if test="lrGaxq != null  and lrGaxq != ''">
-                AND lr_gaxq in
-                <foreach item="lrGaxq" index="index" collection="lrGaxq.split(',')" open="(" separator="," close=")">
-                    #{lrGaxq}
+            <if test="lrGaxqCx != null  and lrGaxqCx != ''">
+                AND
+                <foreach item="item" index="index" collection="lrGaxqCx" open="(" close=")" separator="or">
+                    (
+                    lr_gaxq LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
         </where>

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgJcxx.java

@@ -19,6 +19,7 @@ import org.hibernate.validator.constraints.Range;
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 /**
  * 养老机构_基础信息对象 yljg_jcxx
@@ -771,4 +772,26 @@ public class YljgJcxx extends BaseEntity
 
     @TableField(exist = false)
     private String ymszlrsMax;
+
+
+    @ApiModelProperty(value = "享受政府扶持优惠政策内容")
+    @TableField(exist = false)
+    private List<String> fcyhznrCx;
+
+    @ApiModelProperty(value = "收住老人类型")
+    @TableField(exist = false)
+    private List<String> szlrlxCx;
+
+    @ApiModelProperty(value = "内设医疗机构")
+    @TableField(exist = false)
+    private List<String> nsyljgCx;
+
+    @ApiModelProperty(value = "与医疗机构签约合作")
+    @TableField(exist = false)
+    private List<String> yljgqyhzCx;
+
+
+
+
+
 }

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgsqJcxx.java

@@ -19,6 +19,7 @@ import org.hibernate.validator.constraints.Range;
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 /**
  * 社区养老机构_基础信息对象 yljgsq_jcxx
@@ -612,4 +613,13 @@ public class YljgsqJcxx extends BaseEntity
 
     @TableField(exist = false)
     private String rzlnrsMax;
+
+    @TableField(exist = false)
+    private List<String> szlrlxCx;
+
+    @TableField(exist = false)
+    private List<String> nsyljgCx;
+
+    @TableField(exist = false)
+    private List<String> yljgqyhzCx;
 }

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgJcxxMapper.xml

@@ -218,23 +218,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{xbzt}
                 </foreach>
             </if>
-            <if test="szlrlx != null  and szlrlx != ''">
-                AND dwxz in
-                <foreach item="szlrlx" index="index" collection="szlrlx.split(',')" open="(" separator="," close=")">
-                    #{szlrlx}
+            <if test="szlrlxCx != null  and szlrlxCx != ''">
+                AND
+                <foreach item="item" index="index" collection="szlrlxCx" open="(" close=")" separator="or">
+                    (
+                    szlrlx LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="isKzylfw != null  and isKzylfw != ''"> and is_kzylfw = #{isKzylfw}</if>
-            <if test="nsyljg != null  and nsyljg != ''">
-                AND nsyljg in
-                <foreach item="nsyljg" index="index" collection="nsyljg.split(',')" open="(" separator="," close=")">
-                    #{nsyljg}
+            <if test="nsyljgCx != null  and nsyljgCx != ''">
+                AND
+                <foreach item="item" index="index" collection="nsyljgCx" open="(" close=")" separator="or">
+                    (
+                    nsyljg LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
-            <if test="yljgqyhz != null  and yljgqyhz != ''">
-                AND yljgqyhz in
-                <foreach item="yljgqyhz" index="index" collection="yljgqyhz.split(',')" open="(" separator="," close=")">
-                    #{yljgqyhz}
+            <if test="yljgqyhzCx != null  and yljgqyhzCx != ''">
+                AND
+                <foreach item="item" index="index" collection="yljgqyhzCx" open="(" close=")" separator="or">
+                    (
+                    yljgqyhz LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="isTgjzgyjg != null  and isTgjzgyjg != ''"> and is_tgjzgyjg = #{isTgjzgyjg}</if>
@@ -247,10 +253,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isYljgzyxk != null  and isYljgzyxk != ''"> and is_yljgzyxk = #{isYljgzyxk}</if>
             <if test="isYlbxddzg != null  and isYlbxddzg != ''"> and is_ylbxddzg = #{isYlbxddzg}</if>
             <if test="isSfhyz != null  and isSfhyz != ''"> and is_sfhyz = #{isSfhyz}</if>
-            <if test="fcyhznr != null  and fcyhznr != ''">
-                AND fcyhznr in
-                <foreach item="fcyhznr" index="index" collection="fcyhznr.split(',')" open="(" separator="," close=")">
-                    #{fcyhznr}
+            <if test="fcyhznrCx != null  and fcyhznrCx != ''">
+                AND
+                <foreach item="item" index="index" collection="fcyhznrCx" open="(" close=")" separator="or">
+                    (
+                    fcyhznr LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="zzjgdm != null  and zzjgdm != ''"> and zzjgdm = #{zzjgdm}</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgsqJcxxMapper.xml

@@ -257,10 +257,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="isTbzrx != null  and isTbzrx != ''"> and is_tbzrx = #{isTbzrx}</if>
             <if test="isChxddjg != null  and isChxddjg != ''"> and is_chxddjg = #{isChxddjg}</if>
-            <if test="szlrlx != null  and szlrlx != ''">
-                AND szlrlx in
-                <foreach item="szlrlx" index="index" collection="szlrlx.split(',')" open="(" separator="," close=")">
-                    #{szlrlx}
+            <if test="szlrlxCx != null  and szlrlxCx != ''">
+                AND
+                <foreach item="item" index="index" collection="szlrlxCx" open="(" close=")" separator="or">
+                    (
+                    szlrlx LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="isTgjjylsmfw != null  and isTgjjylsmfw != ''"> and is_tgjjylsmfw = #{isTgjjylsmfw}</if>
@@ -296,16 +298,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{csxz}
                 </foreach>
             </if>
-            <if test="nsyljg != null  and nsyljg != ''">
-                AND nsyljg in
-                <foreach item="nsyljg" index="index" collection="nsyljg.split(',')" open="(" separator="," close=")">
-                    #{nsyljg}
+            <if test="nsyljgCx != null  and nsyljgCx != ''">
+                AND
+                <foreach item="item" index="index" collection="nsyljgCx" open="(" close=")" separator="or">
+                    (
+                    nsyljg LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
-            <if test="yljgqyhz != null  and yljgqyhz != ''">
-                AND yljgqyhz in
-                <foreach item="yljgqyhz" index="index" collection="yljgqyhz.split(',')" open="(" separator="," close=")">
-                    #{yljgqyhz}
+            <if test="yljgqyhzCx != null  and yljgqyhzCx != ''">
+                AND
+                <foreach item="item" index="index" collection="yljgqyhzCx" open="(" close=")" separator="or">
+                    (
+                    yljgqyhz LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="szlrlxQt != null  and szlrlxQt != '' and szlrlxQt == 99"> and szlrlx_qt like concat('%', #{szlrlxQt}, '%')</if>

ruoyi-ui/src/views/business/lrxx/jbxx/index.vue

@@ -20,14 +20,14 @@
           <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-	    <el-form-item label="生活状况" prop="lrJjzk">
-		    <el-select v-model="queryParams.lrJjzk" placeholder="请选择生活状况" multiple collapse-tags clearable>
-			    <el-option v-for="dict in dict.type.CZ027" :disabled="generalDisabled(dict.value, queryParams.lrJjzk, '02')" :key="dict.value" :label="dict.label" :value="dict.value" />
+	    <el-form-item label="生活状况" prop="lrJjzkCx">
+		    <el-select v-model="queryParams.lrJjzkCx" placeholder="请选择生活状况" multiple collapse-tags clearable>
+			    <el-option v-for="dict in dict.type.CZ027" :disabled="generalDisabled(dict.value, queryParams.lrJjzkCx, '02')" :key="dict.value" :label="dict.label" :value="dict.value" />
 		    </el-select>
 	    </el-form-item>
-      <el-form-item label="健康状况" prop="lrJkzk">
-        <el-select v-model="queryParams.lrJkzk" placeholder="请选择健康状况" multiple collapse-tags clearable>
-          <el-option v-for="dict in dict.type.XZ015" :disabled="generalDisabled(dict.value, queryParams.lrJkzk, '01')" :key="dict.value" :label="dict.label" :value="dict.value" />
+      <el-form-item label="健康状况" prop="lrJkzkCx">
+        <el-select v-model="queryParams.lrJkzkCx" placeholder="请选择健康状况" multiple collapse-tags clearable>
+          <el-option v-for="dict in dict.type.XZ015" :disabled="generalDisabled(dict.value, queryParams.lrJkzkCx, '01')" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -124,18 +124,18 @@
               <el-option v-for="dict in dict.type.XZ025" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="生活状况" prop="lrJjzk">
-	          <el-select v-model="advancedQueryParams.lrJjzk" placeholder="请选择生活状况" multiple collapse-tags clearable>
+          <el-form-item label="生活状况" prop="lrJjzkCx">
+	          <el-select v-model="advancedQueryParams.lrJjzkCx" placeholder="请选择生活状况" multiple collapse-tags clearable>
 		          <el-option v-for="dict in dict.type.CZ027" :disabled="generalDisabled(dict.value, advancedQueryParams.lrJjzk, '02')" :key="dict.value" :label="dict.label" :value="dict.value" />
 	          </el-select>
           </el-form-item>
-          <el-form-item label="健康状况" prop="lrJkzk">
-	          <el-select v-model="advancedQueryParams.lrJkzk" placeholder="请选择健康状况" multiple collapse-tags clearable>
+          <el-form-item label="健康状况" prop="lrJkzkCx">
+	          <el-select v-model="advancedQueryParams.lrJkzkCx" placeholder="请选择健康状况" multiple collapse-tags clearable>
 		          <el-option v-for="dict in dict.type.XZ015" :disabled="generalDisabled(dict.value, advancedQueryParams.lrJkzk, '01')" :key="dict.value" :label="dict.label" :value="dict.value" />
 	          </el-select>
           </el-form-item>
-          <el-form-item label="残疾类型" prop="lrCjlx">
-            <el-select v-model="advancedQueryParams.lrCjlx" placeholder="请选择残疾类型" multiple collapse-tags clearable>
+          <el-form-item label="残疾类型" prop="lrCjlxCx">
+            <el-select v-model="advancedQueryParams.lrCjlxCx" placeholder="请选择残疾类型" multiple collapse-tags clearable>
               <el-option v-for="dict in dict.type.C0024" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
@@ -144,8 +144,8 @@
               <el-option v-for="dict in dict.type.CH050" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="收入来源" prop="lrSrly">
-            <el-select v-model="advancedQueryParams.lrSrly" placeholder="请选择收入来源" multiple collapse-tags clearable>
+          <el-form-item label="收入来源" prop="lrSrlyCx">
+            <el-select v-model="advancedQueryParams.lrSrlyCx" placeholder="请选择收入来源" multiple collapse-tags clearable>
               <el-option v-for="dict in dict.type.CH054" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
@@ -154,24 +154,24 @@
               <el-option v-for="dict in dict.type.XZ014" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="家庭救助帮扶" prop="lrJtjzbfqk">
-            <el-select v-model="advancedQueryParams.lrJtjzbfqk" placeholder="请选择家庭救助帮扶" multiple collapse-tags
+          <el-form-item label="家庭救助帮扶" prop="lrJtjzbfqkCx">
+            <el-select v-model="advancedQueryParams.lrJtjzbfqkCx" placeholder="请选择家庭救助帮扶" multiple collapse-tags
               clearable>
               <el-option v-for="dict in dict.type.CH058" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="陪伴居住情况" prop="lrPbjjqk">
-            <el-select v-model="advancedQueryParams.lrPbjjqk" placeholder="请选择陪伴居住情况" multiple collapse-tags clearable>
+          <el-form-item label="陪伴居住情况" prop="lrPbjjqkCx">
+            <el-select v-model="advancedQueryParams.lrPbjjqkCx" placeholder="请选择陪伴居住情况" multiple collapse-tags clearable>
               <el-option v-for="dict in dict.type.CH057" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="日常生活照料人" prop="zlrLb">
-            <el-select v-model="advancedQueryParams.zlrLb" placeholder="请选择日常生活照料人" multiple collapse-tags clearable>
+          <el-form-item label="日常生活照料人" prop="zlrLbCx">
+            <el-select v-model="advancedQueryParams.zlrLbCx" placeholder="请选择日常生活照料人" multiple collapse-tags clearable>
               <el-option v-for="dict in dict.type.CH056" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="关爱服务需求" prop="lrGaxq">
-            <el-select v-model="advancedQueryParams.lrGaxq" placeholder="请选择关爱服务需求" multiple collapse-tags clearable>
+          <el-form-item label="关爱服务需求" prop="lrGaxqCx">
+            <el-select v-model="advancedQueryParams.lrGaxqCx" placeholder="请选择关爱服务需求" multiple collapse-tags clearable>
               <el-option v-for="dict in dict.type.CH055" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
@@ -1015,16 +1015,16 @@ export default {
       copyParams.lrXb.length > 0 && (copyParams.lrXb = copyParams.lrXb.join(','))
       copyParams.lrMz.length > 0 && (copyParams.lrMz = copyParams.lrMz.join(','))
       copyParams.lrHyzk.length > 0 && (copyParams.lrHyzk = copyParams.lrHyzk.join(','))
-      copyParams.lrJjzk.length > 0 && (copyParams.lrJjzk = copyParams.lrJjzk.join(','))
-      copyParams.lrJkzk.length > 0 && (copyParams.lrJkzk = copyParams.lrJkzk.join(','))
-      copyParams.lrCjlx.length > 0 && (copyParams.lrCjlx = copyParams.lrCjlx.join(','))
+      copyParams.lrJjzkCx.length > 0 && (copyParams.lrJjzkCx = copyParams.lrJjzkCx.join(','))
+      copyParams.lrJkzkCx.length > 0 && (copyParams.lrJkzkCx = copyParams.lrJkzkCx.join(','))
+      copyParams.lrCjlxCx.length > 0 && (copyParams.lrCjlxCx = copyParams.lrCjlxCx.join(','))
 	    copyParams.lrNlzk.length > 0 && (copyParams.lrNlzk = copyParams.lrNlzk.join(','))
-      copyParams.lrSrly.length > 0 && (copyParams.lrSrly = copyParams.lrSrly.join(','))
+      copyParams.lrSrlyCx.length > 0 && (copyParams.lrSrlyCx = copyParams.lrSrlyCx.join(','))
       copyParams.lrKzpsr.length > 0 && (copyParams.lrKzpsr = copyParams.lrKzpsr.join(','))
-      copyParams.lrJtjzbfqk.length > 0 && (copyParams.lrJtjzbfqk = copyParams.lrJtjzbfqk.join(','))
-      copyParams.lrPbjjqk.length > 0 && (copyParams.lrPbjjqk = copyParams.lrPbjjqk.join(','))
-      copyParams.zlrLb.length > 0 && (copyParams.zlrLb = copyParams.zlrLb.join(','))
-      copyParams.lrGaxq.length > 0 && (copyParams.lrGaxq = copyParams.lrGaxq.join(','))
+      copyParams.lrJtjzbfqkCx.length > 0 && (copyParams.lrJtjzbfqkCx = copyParams.lrJtjzbfqkCx.join(','))
+      copyParams.lrPbjjqkCx.length > 0 && (copyParams.lrPbjjqkCx = copyParams.lrPbjjqkCx.join(','))
+      copyParams.zlrLbCx.length > 0 && (copyParams.zlrLbCx = copyParams.zlrLbCx.join(','))
+      copyParams.lrGaxqCx.length > 0 && (copyParams.lrGaxqCx = copyParams.lrGaxqCx.join(','))
 	    copyParams.lrHjdz ? copyParams.lrHjdz = copyParams.lrHjdz[copyParams.lrHjdz.length - 1] : copyParams.lrHjdz = null
 	    copyParams.lrXjdz ? copyParams.lrXjdz = copyParams.lrXjdz[copyParams.lrXjdz.length - 1] : copyParams.lrXjdz = null
       advancedListLrjbxx(copyParams).then(response => {

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/jbxx/index.vue

@@ -204,12 +204,12 @@
               <el-option v-for="dict in dict.type.CH012" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="收住老人类型" prop="szlrlx">
-            <el-select v-model="advancedQueryParams.szlrlx" multiple collapse-tags placeholder="请选择" clearable>
+          <el-form-item label="收住老人类型" prop="szlrlxCx">
+            <el-select v-model="advancedQueryParams.szlrlxCx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH052" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item v-show="advancedQueryParams.szlrlx.includes('99')" label="收住老人类型(其他说明)" prop="szlrlxQt">
+          <el-form-item v-show="advancedQueryParams.szlrlxCx.includes('99')" label="收住老人类型(其他说明)" prop="szlrlxQt">
             <el-input v-model="advancedQueryParams.szlrlxQt" placeholder="可输入收住老人类型(其他说明)" clearable />
           </el-form-item>
           <el-form-item label="是否开展医疗服务" prop="isKzylfw">
@@ -218,13 +218,13 @@
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="内设医疗机构" prop="nsyljg">
-            <el-select v-model="advancedQueryParams.nsyljg" multiple collapse-tags placeholder="请选择" clearable>
+          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="内设医疗机构" prop="nsyljgCx">
+            <el-select v-model="advancedQueryParams.nsyljgCx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH013" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="与医疗机构签约合作" prop="yljgqyhz">
-            <el-select v-model="advancedQueryParams.yljgqyhz" multiple collapse-tags placeholder="请选择" clearable>
+          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="与医疗机构签约合作" prop="yljgqyhzCx">
+            <el-select v-model="advancedQueryParams.yljgqyhzCx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH014" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
@@ -506,11 +506,11 @@ export default {
         scwz: null,
         xbzt: null,
         isChxddjg: null,
-        szlrlx: [],
+        szlrlxCx: [],
         isTgjjylsmfw: null,
         frzjlx: null,
-        nsyljg: null,
-        yljgqyhz: null,
+        nsyljgCx: null,
+        yljgqyhzCx: null,
         tyshxydm: null,
         szxzqh: null,
         txdz: null,
@@ -619,11 +619,11 @@ export default {
       copyParams.dwxz.length > 0 && (copyParams.dwxz = copyParams.dwxz.join(','))
       copyParams.xbzt.length > 0 && (copyParams.xbzt = copyParams.xbzt.join(','))
       copyParams.lb.length > 0 && (copyParams.lb = copyParams.lb.join(','))
-      copyParams.szlrlx.length > 0 && (copyParams.szlrlx = copyParams.szlrlx.join(','))
+      copyParams.szlrlxCx.length > 0 && (copyParams.szlrlxCx = copyParams.szlrlxCx.join(','))
       copyParams.frzjlx.length > 0 && (copyParams.frzjlx = copyParams.frzjlx.join(','))
-      copyParams.nsyljg.length > 0 && (copyParams.nsyljg = copyParams.nsyljg.join(','))
+      copyParams.nsyljgCx.length > 0 && (copyParams.nsyljgCx = copyParams.nsyljgCx.join(','))
       copyParams.scwz.length > 0 && (copyParams.scwz = copyParams.scwz.join(','))
-      copyParams.yljgqyhz.length > 0 && (copyParams.yljgqyhz = copyParams.yljgqyhz.join(','))
+      copyParams.yljgqyhzCx.length > 0 && (copyParams.yljgqyhzCx = copyParams.yljgqyhzCx.join(','))
       // copyParams.lb.length > 0 && (copyParams.szxzqh = copyParams.szxzqh.join(','))
 
 

ruoyi-ui/src/views/search/xxcx/fwjg/yljg/jbxx/index.vue

@@ -218,12 +218,12 @@
               <el-option v-for="dict in dict.type.CH010" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="收住老人类型" prop="szlrlx">
-            <el-select v-model="advancedQueryParams.szlrlx" multiple collapse-tags placeholder="请选择" clearable>
+          <el-form-item label="收住老人类型" prop="szlrlxCx">
+            <el-select v-model="advancedQueryParams.szlrlxCx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH052" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item v-show="advancedQueryParams.szlrlx.includes('99')" label="收住老人类型(其他说明)" prop="szlrlxQt">
+          <el-form-item v-show="advancedQueryParams.szlrlxCx.includes('99')" label="收住老人类型(其他说明)" prop="szlrlxQt">
             <el-input v-model="advancedQueryParams.szlrlxQt" placeholder="可输入收住老人类型(其他说明)" clearable />
           </el-form-item>
           <el-form-item label="是否开展医疗服务" prop="isKzylfw">
@@ -232,13 +232,13 @@
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="内设医疗机构" prop="nsyljg">
-            <el-select v-model="advancedQueryParams.nsyljg" multiple collapse-tags placeholder="请选择" clearable>
+          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="内设医疗机构" prop="nsyljgCx">
+            <el-select v-model="advancedQueryParams.nsyljgCx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH013" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="与医疗机构签约合作" prop="yljgqyhz">
-            <el-select v-model="advancedQueryParams.yljgqyhz" multiple collapse-tags placeholder="请选择" clearable>
+          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="与医疗机构签约合作" prop="yljgqyhzCx">
+            <el-select v-model="advancedQueryParams.yljgqyhzCx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH012" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
@@ -303,8 +303,8 @@
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="享受政府扶持优惠政策内容" prop="fcyhznr">
-            <el-select v-model="advancedQueryParams.fcyhznr" multiple collapse-tags placeholder="请选择" clearable>
+          <el-form-item label="享受政府扶持优惠政策内容" prop="fcyhznrCx">
+            <el-select v-model="advancedQueryParams.fcyhznrCx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH059" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
@@ -703,10 +703,10 @@ export default {
         cwzsMax: null,
         dwxz:  [],
         xbzt:  [],
-        szlrlx:  [],
+        szlrlxCx:  [],
         isKzylfw: null,
-        nsyljg: [],
-        yljgqyhz: [],
+        nsyljgCx: [],
+        yljgqyhzCx: [],
         isTgjzgyjg: null,
         isQyxylfwzx: null,
         isTbzrx: null,
@@ -717,7 +717,7 @@ export default {
         isYljgzyxk: null,
         isYlbxddzg: null,
         isSfhyz: null,
-        fcyhznr: [],
+        fcyhznrCx: [],
         frzjlx: null,
         scwz: null,
         sffs: null,
@@ -935,10 +935,10 @@ export default {
       copyParams.csxz.length > 0 && (copyParams.csxz = copyParams.csxz.join(','))
       copyParams.dwxz.length > 0 && (copyParams.dwxz = copyParams.dwxz.join(','))
       copyParams.xbzt.length > 0 && (copyParams.xbzt = copyParams.xbzt.join(','))
-      copyParams.szlrlx.length > 0 && (copyParams.szlrlx = copyParams.szlrlx.join(','))
-      copyParams.nsyljg.length > 0 && (copyParams.nsyljg = copyParams.nsyljg.join(','))
-      copyParams.yljgqyhz.length > 0 && (copyParams.yljgqyhz = copyParams.yljgqyhz.join(','))
-      copyParams.fcyhznr.length > 0 && (copyParams.fcyhznr = copyParams.fcyhznr.join(','))
+      copyParams.szlrlxCx.length > 0 && (copyParams.szlrlxCx = copyParams.szlrlxCx.join(','))
+      copyParams.nsyljgCx.length > 0 && (copyParams.nsyljgCx = copyParams.nsyljgCx.join(','))
+      copyParams.yljgqyhzCx.length > 0 && (copyParams.yljgqyhzCx = copyParams.yljgqyhzCx.join(','))
+      copyParams.fcyhznrCx.length > 0 && (copyParams.fcyhznrCx = copyParams.fcyhznrCx.join(','))
       copyParams.frzjlx.length > 0 && (copyParams.frzjlx = copyParams.frzjlx.join(','))
       copyParams.scwz.length > 0 && (copyParams.scwz = copyParams.scwz.join(','))
       copyParams.sffs.length > 0 && (copyParams.sffs = copyParams.sffs.join(','))

ruoyi-ui/src/views/search/xxcx/lrxx/lrjbxx/index.vue

@@ -20,14 +20,14 @@
 					<el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
 				</el-select>
 			</el-form-item>
-			<el-form-item label="生活状况" prop="lrJjzk">
-				<el-select v-model="queryParams.lrJjzk" placeholder="请选择生活状况" multiple collapse-tags clearable>
-					<el-option v-for="dict in dict.type.CZ027" :disabled="generalDisabled(dict.value, queryParams.lrJjzk, '02')" :key="dict.value" :label="dict.label" :value="dict.value" />
+			<el-form-item label="生活状况" prop="lrJjzkCx">
+				<el-select v-model="queryParams.lrJjzkCx" placeholder="请选择生活状况" multiple collapse-tags clearable>
+					<el-option v-for="dict in dict.type.CZ027" :disabled="generalDisabled(dict.value, queryParams.lrJjzkCx, '02')" :key="dict.value" :label="dict.label" :value="dict.value" />
 				</el-select>
 			</el-form-item>
-			<el-form-item label="健康状况" prop="lrJkzk">
-				<el-select v-model="queryParams.lrJkzk" placeholder="请选择健康状况" multiple collapse-tags clearable>
-					<el-option v-for="dict in dict.type.XZ015" :disabled="generalDisabled(dict.value, queryParams.lrJkzk, '01')" :key="dict.value" :label="dict.label" :value="dict.value" />
+			<el-form-item label="健康状况" prop="lrJkzkCx">
+				<el-select v-model="queryParams.lrJkzkCx" placeholder="请选择健康状况" multiple collapse-tags clearable>
+					<el-option v-for="dict in dict.type.XZ015" :disabled="generalDisabled(dict.value, queryParams.lrJkzkCx, '01')" :key="dict.value" :label="dict.label" :value="dict.value" />
 				</el-select>
 			</el-form-item>
 			<el-form-item>
@@ -107,18 +107,18 @@
 							<el-option v-for="dict in dict.type.XZ025" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
-					<el-form-item label="生活状况" prop="lrJjzk">
-						<el-select v-model="advancedQueryParams.lrJjzk" placeholder="请选择生活状况" multiple collapse-tags clearable>
+					<el-form-item label="生活状况" prop="lrJjzkCx">
+						<el-select v-model="advancedQueryParams.lrJjzkCx" placeholder="请选择生活状况" multiple collapse-tags clearable>
 							<el-option v-for="dict in dict.type.CZ027" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
-					<el-form-item label="健康状况" prop="lrJkzk">
-						<el-select v-model="advancedQueryParams.lrJkzk" placeholder="请选择健康状况" multiple collapse-tags clearable>
+					<el-form-item label="健康状况" prop="lrJkzkCx">
+						<el-select v-model="advancedQueryParams.lrJkzkCx" placeholder="请选择健康状况" multiple collapse-tags clearable>
 							<el-option v-for="dict in dict.type.XZ015" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
-					<el-form-item label="残疾类型" prop="lrCjlx">
-						<el-select v-model="advancedQueryParams.lrCjlx" placeholder="请选择残疾类型" multiple collapse-tags clearable>
+					<el-form-item label="残疾类型" prop="lrCjlxCx">
+						<el-select v-model="advancedQueryParams.lrCjlxCx" placeholder="请选择残疾类型" multiple collapse-tags clearable>
 							<el-option v-for="dict in dict.type.C0024" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
@@ -137,24 +137,24 @@
 							<el-option v-for="dict in dict.type.XZ014" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
-					<el-form-item label="家庭救助帮扶" prop="lrJtjzbfqk">
-						<el-select v-model="advancedQueryParams.lrJtjzbfqk" placeholder="请选择家庭救助帮扶" multiple collapse-tags
+					<el-form-item label="家庭救助帮扶" prop="lrJtjzbfqkCx">
+						<el-select v-model="advancedQueryParams.lrJtjzbfqkCx" placeholder="请选择家庭救助帮扶" multiple collapse-tags
 							clearable>
 							<el-option v-for="dict in dict.type.CH058" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
-					<el-form-item label="陪伴居住情况" prop="lrPbjjqk">
-						<el-select v-model="advancedQueryParams.lrPbjjqk" placeholder="请选择陪伴居住情况" multiple collapse-tags clearable>
+					<el-form-item label="陪伴居住情况" prop="lrPbjjqkCx">
+						<el-select v-model="advancedQueryParams.lrPbjjqkCx" placeholder="请选择陪伴居住情况" multiple collapse-tags clearable>
 							<el-option v-for="dict in dict.type.CH057" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
-					<el-form-item label="日常生活照料人" prop="zlrLb">
-						<el-select v-model="advancedQueryParams.zlrLb" placeholder="请选择日常生活照料人" multiple collapse-tags clearable>
+					<el-form-item label="日常生活照料人" prop="zlrLbCx">
+						<el-select v-model="advancedQueryParams.zlrLbCx" placeholder="请选择日常生活照料人" multiple collapse-tags clearable>
 							<el-option v-for="dict in dict.type.CH056" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
-					<el-form-item label="关爱服务需求" prop="lrGaxq">
-						<el-select v-model="advancedQueryParams.lrGaxq" placeholder="请选择关爱服务需求" multiple collapse-tags clearable>
+					<el-form-item label="关爱服务需求" prop="lrGaxqCx">
+						<el-select v-model="advancedQueryParams.lrGaxqCx" placeholder="请选择关爱服务需求" multiple collapse-tags clearable>
 							<el-option v-for="dict in dict.type.CH055" :key="dict.value" :label="dict.label" :value="dict.value" />
 						</el-select>
 					</el-form-item>
@@ -469,16 +469,16 @@ export default {
 			copyParams.lrXb.length > 0 && (copyParams.lrXb = copyParams.lrXb.join(','))
 			copyParams.lrMz.length > 0 && (copyParams.lrMz = copyParams.lrMz.join(','))
 			copyParams.lrHyzk.length > 0 && (copyParams.lrHyzk = copyParams.lrHyzk.join(','))
-			copyParams.lrJjzk.length > 0 && (copyParams.lrJjzk = copyParams.lrJjzk.join(','))
-			copyParams.lrJkzk.length > 0 && (copyParams.lrJkzk = copyParams.lrJkzk.join(','))
-			copyParams.lrCjlx.length > 0 && (copyParams.lrCjlx = copyParams.lrCjlx.join(','))
+			copyParams.lrJjzkCx.length > 0 && (copyParams.lrJjzkCx = copyParams.lrJjzkCx.join(','))
+			copyParams.lrJkzkCx.length > 0 && (copyParams.lrJkzkCx = copyParams.lrJkzkCx.join(','))
+			copyParams.lrCjlxCx.length > 0 && (copyParams.lrCjlxCx = copyParams.lrCjlxCx.join(','))
 			copyParams.lrNlzk.length > 0 && (copyParams.lrNlzk = copyParams.lrNlzk.join(','))
 			copyParams.lrSrly.length > 0 && (copyParams.lrSrly = copyParams.lrSrly.join(','))
 			copyParams.lrKzpsr.length > 0 && (copyParams.lrKzpsr = copyParams.lrKzpsr.join(','))
-			copyParams.lrJtjzbfqk.length > 0 && (copyParams.lrJtjzbfqk = copyParams.lrJtjzbfqk.join(','))
-			copyParams.lrPbjjqk.length > 0 && (copyParams.lrPbjjqk = copyParams.lrPbjjqk.join(','))
-			copyParams.zlrLb.length > 0 && (copyParams.zlrLb = copyParams.zlrLb.join(','))
-			copyParams.lrGaxq.length > 0 && (copyParams.lrGaxq = copyParams.lrGaxq.join(','))
+			copyParams.lrJtjzbfqkCx.length > 0 && (copyParams.lrJtjzbfqkCx = copyParams.lrJtjzbfqkCx.join(','))
+			copyParams.lrPbjjqkCx.length > 0 && (copyParams.lrPbjjqkCx = copyParams.lrPbjjqkCx.join(','))
+			copyParams.zlrLbCx.length > 0 && (copyParams.zlrLbCx = copyParams.zlrLbCx.join(','))
+			copyParams.lrGaxqCx.length > 0 && (copyParams.lrGaxqCx = copyParams.lrGaxqCx.join(','))
 			copyParams.lrHjdz ? copyParams.lrHjdz = copyParams.lrHjdz[copyParams.lrHjdz.length - 1] : copyParams.lrHjdz = null
 			copyParams.lrXjdz ? copyParams.lrXjdz = copyParams.lrXjdz[copyParams.lrXjdz.length - 1] : copyParams.lrXjdz = null