feat：[给药制剂，麻精药]配置

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

@@ -57,4 +57,24 @@ public interface IGyzjTzService extends IService
      * @param remark 备注
      */
     public GyzjTz getTz(Long  gyzjId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark);
+
+
+    /**
+     * 新增台账
+     * @param gyzjId 给药制剂id
+     * @param lqr1 领取人1
+     * @param lqr2 领取人2
+     * @param ghr1 归还人1
+     * @param ghr2 归还人2
+     * @param ffr1 发放人1
+     * @param ffr2 发放人2
+     * @param qmr 签名人
+     * @param qmyy 签名意义
+     * @param czl 操作量
+     * @param czldw 操作量单位
+     * @param remark 备注
+     * @param bdId 表单id
+     */
+    public GyzjTz getTzGen(Long  gyzjId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark,Long bdId);
+
 }

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

@@ -57,4 +57,23 @@ public interface IMjyTzService extends IService
      * @param remark 备注
      */
     public  MjyTz getTz(Long  mjyId, SysUser lqr1,SysUser lqr2, SysUser ghr1,  SysUser ghr2, SysUser ffr1,SysUser ffr2, SysUser jsr1,SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark);
+
+    /**
+     * 新增台账
+     * @param mjyId 麻精药id
+     * @param lqr1 领取人1
+     * @param lqr2 领取人2
+     * @param ghr1 归还人1
+     * @param ghr2 归还人2
+     * @param ffr1 发放人1
+     * @param ffr2 发放人2
+     * @param qmr 签名人
+     * @param qmyy 签名意义
+     * @param czl 操作量
+     * @param czldw 操作量单位
+     * @param remark 备注
+     * @param bdId 表单id
+     */
+    public  MjyTz getTzGen(Long  mjyId, SysUser lqr1,SysUser lqr2, SysUser ghr1,  SysUser ghr2, SysUser ffr1,SysUser ffr2, SysUser jsr1,SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark,Long bdId);
+
 }

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

@@ -1362,7 +1362,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     // 稽查轨迹
                     jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "配制完成",JcmcysEnum.green.getValue(), null, null, qmr,remark));
                     // 台账
-                    tzList.add(gyzjTzService.getTz(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"配制完成" ,gyzj.getKc(),gyzj.getKcdw(), remark));
+                    tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"配制完成" ,gyzj.getKc(),gyzj.getKcdw(), remark,studyFormFill.getId()));
                 } else {
                     this.updateById(gyzj);
                 }
@@ -1371,6 +1371,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 if(StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) {
                     BigDecimal kc = new BigDecimal(gyzj.getKc());
                     kc = kc.subtract(new BigDecimal(syl));
+                    gyzj.setKc(kc.toString());
                     baseMapper.updateKc(gyzj.getId(), kc.toString());
                     // 使用稽查轨迹
                     HashMap<String, String> formData = new LinkedHashMap<>();
@@ -1378,7 +1379,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     // 稽查轨迹
                     jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "使用",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr,remark));
                     // 台账
-                    tzList.add(gyzjTzService.getTz(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"使用" ,gyzj.getKc(),gyzj.getKcdw(), remark));
+                    tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"使用" ,syl,studyFormFillResource.getSyldw(), remark,studyFormFill.getId()));
                 }
                 gyzjMap.put(gyzj.getBh(), gyzj);
             }
@@ -1392,14 +1393,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 baseMapper.updateCc(studyFormFillCc.getList(), studyFormFillCc.getCctj(), studyFormFillCc.getCcwz());
                 for (String bh : studyFormFillCc.getList()) {
                     Gyzj gyzj = gyzjMap.get(bh);
-
                     // 稽查轨迹
                     HashMap<String, String> formData = new HashMap<>();
                     formData.put("存储位置", studyFormFillCc.getCcwz());
                     formData.put("存储条件", studyFormFillCc.getCctj());
                     jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "存储",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr,remark));
                     // 台账
-                    tzList.add(gyzjTzService.getTz(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"存储" ,gyzj.getKc(),gyzj.getKcdw(), remark));
+                    tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"存储" ,gyzj.getKc(),gyzj.getKcdw(), remark,studyFormFill.getId()));
                 }
             }
         }
@@ -1415,10 +1415,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     HashMap<String, String> formData = new HashMap<>();
                     formData.put("处置方式", studyFormFillCz.getCzfs());
                     formData.put("处置量", gyzj.getKc() + gyzj.getKcdw());
-                    jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "存储",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr,remark));
+                    jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr,remark));
 
                     // 台账
-                    tzList.add(gyzjTzService.getTz(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"处置" ,gyzj.getKc(),gyzj.getKcdw(), remark));
+                    tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null,null, null,null, null,null, null,null, qmr,"处置" ,gyzj.getKc(),gyzj.getKcdw(), remark,studyFormFill.getId()));
 
                 }
                 baseMapper.updateKcBatch(studyFormFillCz.getList(), "0");

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

@@ -137,4 +137,57 @@ public class GyzjTzServiceImpl extends ServiceImpl impleme
         gyzjTz.setRemark(remark);
         return gyzjTz;
     }
+
+
+    /**
+     * 新增台账
+     *
+     * @param gyzjId  麻精药id
+     * @param lqr1   领取人1
+     * @param lqr2   领取人2
+     * @param ghr1   归还人1
+     * @param ghr2   归还人2
+     * @param ffr1   发放人1
+     * @param ffr2   发放人2
+     * @param qmr    签名人
+     * @param qmyy   签名意义
+     * @param czl    操作量
+     * @param czldw  操作量单位
+     * @param remark 备注
+     * @param bdId 表单id
+     */
+    @Override
+    public GyzjTz getTzGen(Long gyzjId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark,Long bdId) {
+        GyzjTz gyzjTz = new GyzjTz();
+        gyzjTz.setGyzjId(gyzjId);
+        if (lqr1 != null && lqr2 != null) {
+            gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
+            gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
+        }
+
+        if (ghr1 != null && ghr2 != null) {
+            gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
+            gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
+        }
+        if (ffr1 != null && ffr2 != null) {
+            gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
+            gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
+        }
+        if (jsr1 != null && jsr2 != null) {
+            gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
+            gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
+        }
+        if (qmr != null && qmr != null) {
+            gyzjTz.setQmrId(qmr.getUserId());
+            gyzjTz.setQmrMc(qmr.getNickName());
+            gyzjTz.setQmrMcEn(qmr.getUserName());
+        }
+        gyzjTz.setQmyy(qmyy);
+        gyzjTz.setQmyyEn(GyzjJcnrUtil.getEn(qmyy));
+        gyzjTz.setCzldw(czldw);
+        gyzjTz.setCzl(czl);
+        gyzjTz.setRemark(remark);
+        gyzjTz.setBdId(bdId);
+        return gyzjTz;
+    }
 }

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

@@ -1267,7 +1267,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     // 稽查轨迹
                     jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "配制完成",JcmcysEnum.green.getValue(), null, null, qmr,remark));
                     // 台账
-                    tzList.add(mjyTzService.getTz(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"配制完成" ,mjy.getKc(),mjy.getKcdw(), remark));
+                    tzList.add(mjyTzService.getTzGen(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"配制完成" ,mjy.getKc(),mjy.getKcdw(), remark,studyFormFill.getId()));
                 } else {
                     this.updateById(mjy);
                 }
@@ -1276,6 +1276,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 if(StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) {
                     BigDecimal kc = new BigDecimal(mjy.getKc());
                     kc = kc.subtract(new BigDecimal(syl));
+                    mjy.setKc(kc.toString());
                     baseMapper.updateKc(mjy.getId(), kc.toString());
                     // 使用稽查轨迹
                     HashMap<String, String> formData = new LinkedHashMap<>();
@@ -1283,7 +1284,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     // 稽查轨迹
                     jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "使用",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr,remark));
                     // 台账
-                    tzList.add(mjyTzService.getTz(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"使用" ,mjy.getKc(),mjy.getKcdw(), remark));
+                    tzList.add(mjyTzService.getTzGen(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"使用" ,syl,studyFormFillResource.getSyldw(), remark,studyFormFill.getId()));
                 }
                 mjyMap.put(mjy.getBh(), mjy);
             }
@@ -1304,7 +1305,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     formData.put("存储条件", studyFormFillCc.getCctj());
                     jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "存储",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr,remark));
                     // 台账
-                    tzList.add(mjyTzService.getTz(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"存储" ,mjy.getKc(),mjy.getKcdw(), remark));
+                    tzList.add(mjyTzService.getTzGen(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"存储" ,mjy.getKc(),mjy.getKcdw(), remark,studyFormFill.getId()));
                 }
             }
         }
@@ -1320,10 +1321,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     HashMap<String, String> formData = new HashMap<>();
                     formData.put("处置方式", studyFormFillCz.getCzfs());
                     formData.put("处置量", mjy.getKc() + mjy.getKcdw());
-                    jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "存储",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr,remark));
+                    jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr,remark));
 
                     // 台账
-                    tzList.add(mjyTzService.getTz(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"处置" ,mjy.getKc(),mjy.getKcdw(), remark));
+                    tzList.add(mjyTzService.getTzGen(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"处置" ,mjy.getKc(),mjy.getKcdw(), remark,studyFormFill.getId()));
 
                 }
                 baseMapper.updateKcBatch(studyFormFillCz.getList(), "0");

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

@@ -138,4 +138,56 @@ public class MjyTzServiceImpl extends ServiceImpl implements
         mjyTz.setRemark(remark);
         return mjyTz;
     }
+
+    /**
+     * 新增台账
+     *
+     * @param mjyId  麻精药id
+     * @param lqr1   领取人1
+     * @param lqr2   领取人2
+     * @param ghr1   归还人1
+     * @param ghr2   归还人2
+     * @param ffr1   发放人1
+     * @param ffr2   发放人2
+     * @param qmr    签名人
+     * @param qmyy   签名意义
+     * @param czl    操作量
+     * @param czldw  操作量单位
+     * @param remark 备注
+     * @param bdId 表单id
+     */
+    @Override
+    public MjyTz getTzGen(Long mjyId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark,Long bdId) {
+        MjyTz mjyTz = new MjyTz();
+        mjyTz.setMjyId(mjyId);
+        if (lqr1 != null && lqr2 != null) {
+            mjyTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
+            mjyTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
+        }
+
+        if (ghr1 != null && ghr2 != null) {
+            mjyTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
+            mjyTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
+        }
+        if (ffr1 != null && ffr2 != null) {
+            mjyTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
+            mjyTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
+        }
+        if (jsr1 != null && jsr2 != null) {
+            mjyTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
+            mjyTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
+        }
+        if (qmr != null && qmr != null) {
+            mjyTz.setQmrId(qmr.getUserId());
+            mjyTz.setQmrMc(qmr.getNickName());
+            mjyTz.setQmrMcEn(qmr.getUserName());
+        }
+        mjyTz.setQmyy(qmyy);
+        mjyTz.setQmyyEn(MjyJcnrUtil.getEn(qmyy));
+        mjyTz.setCzldw(czldw);
+        mjyTz.setCzl(czl);
+        mjyTz.setBdId(bdId);
+        mjyTz.setRemark(remark);
+        return mjyTz;
+    }
 }