feat：[档案管理]给药制剂，麻精药，发放记录档案

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

@@ -512,6 +512,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     public List<FfjlListDto> queryArchiveList(FfjlSearchForm form){
         QueryWrapper<GyzjFfjl> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
+        queryWrapper.eq("t.`dazt`", DaztEnum.ygd.getValue());
         if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
             queryWrapper.eq("t.jyzt", form.getJyzt());
         }

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

@@ -509,6 +509,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     public List<FfjlListDto> queryArchiveList(FfjlSearchForm form){
         QueryWrapper<MjyFfjl> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
+        queryWrapper.eq("t.`dazt`", DaztEnum.ygd.getValue());
         if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
             queryWrapper.eq("t.jyzt", form.getJyzt());
         }

hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.hxhq.business.mapper.GyzjFfjlMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.gyzj.FfjlListDto">
         select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc
-        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq
         ,z.mc as zcgMc,
         (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_gyzj_ffjl` t

hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.hxhq.business.mapper.MjyFfjlMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.FfjlListDto">
         select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc,t.rkmz,t.rkmzdw
-        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq
         ,z.mc as zcgMc,
         (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_mjy_ffjl` t