fix：[麻精药，给药制剂]目的搜索

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSearchForm.java

@@ -29,8 +29,8 @@ public class FfjlSearchForm {
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Integer jyzt;
 
-    /** 目的id */
-    private Long mdId;
+    /** 目的 */
+    private String mdMc;
 
     public String getMc() {
         return mc;
@@ -96,11 +96,11 @@ public class FfjlSearchForm {
         this.jyzt = jyzt;
     }
 
-    public Long getMdId() {
-        return mdId;
+    public String getMdMc() {
+        return mdMc;
     }
 
-    public void setMdId(Long mdId) {
-        this.mdId = mdId;
+    public void setMdMc(String mdMc) {
+        this.mdMc = mdMc;
     }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java

@@ -29,8 +29,9 @@ public class FfjlSearchForm {
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Integer jyzt;
 
-    /** 目的id */
-    private Long mdId;
+
+    /** 目的 */
+    private String mdMc;
 
     public String getMc() {
         return mc;
@@ -96,11 +97,11 @@ public class FfjlSearchForm {
         this.jyzt = jyzt;
     }
 
-    public Long getMdId() {
-        return mdId;
+    public String getMdMc() {
+        return mdMc;
     }
 
-    public void setMdId(Long mdId) {
-        this.mdId = mdId;
+    public void setMdMc(String mdMc) {
+        this.mdMc = mdMc;
     }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java

@@ -99,8 +99,10 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         if (StringUtils.isNoneBlank(form.getEndDateRk())) {
             queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk());
         }
-        if (form.getMdId() != null && form.getMdId().intValue() > 0) {
-            queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+        if (StringUtils.isNoneBlank(form.getMdMc())) {
+            queryWrapper.and(p -> p.like("t.md_other", form.getMdMc())
+                    .or().apply(" exists(select s.* from t_study s  where find_in_set(s.id, t.`md_ids`) and  s.name like CONCAT('%', {0}, '%'))",form.getMdMc())
+            );
         }
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);
@@ -537,8 +539,10 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         if (StringUtils.isNoneBlank(form.getEndDateRk())) {
             queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk());
         }
-        if (form.getMdId() != null && form.getMdId().intValue() > 0) {
-            queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+        if (StringUtils.isNoneBlank(form.getMdMc())) {
+            queryWrapper.and(p -> p.like("t.md_other", form.getMdMc())
+                    .or().apply(" exists(select s.* from t_study s  where find_in_set(s.id, t.`md_ids`) and  s.name like CONCAT('%', {0}, '%'))",form.getMdMc())
+            );
         }
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java

@@ -94,8 +94,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         if (StringUtils.isNoneBlank(form.getEndDateRk())) {
             queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk());
         }
-        if (form.getMdId() != null && form.getMdId().intValue() > 0) {
-            queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+        if (StringUtils.isNoneBlank(form.getMdMc())) {
+            queryWrapper.and(p -> p.like("t.md_other", form.getMdMc())
+                    .or().apply(" exists(select s.* from t_study s  where find_in_set(s.id, t.`md_ids`) and  s.name like CONCAT('%', {0}, '%'))",form.getMdMc())
+            );
         }
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);
@@ -534,8 +536,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         if (StringUtils.isNoneBlank(form.getEndDateRk())) {
             queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk());
         }
-        if (form.getMdId() != null && form.getMdId().intValue() > 0) {
-            queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+        if (StringUtils.isNoneBlank(form.getMdMc())) {
+            queryWrapper.and(p -> p.like("t.md_other", form.getMdMc())
+                    .or().apply(" exists(select s.* from t_study s  where find_in_set(s.id, t.`md_ids`) and  s.name like CONCAT('%', {0}, '%'))",form.getMdMc())
+            );
         }
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);