fix:[填报表单]药剂存储

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

@@ -391,8 +391,17 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     public void yjcc(StudyFormFill studyFormFill) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getQmrmm());
-        //todo
+        checkPassword(qmr, studyFormFill.getQmrmm());
+        if (studyFormFill.getId() != null) {
+            StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
+            //产生的药剂，不能存储吧？只能存储使用的 todo
+            //稽查轨迹
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("存储位置", "todo");
+            formData.put("存储条件", "todo");
+            formData.put("存储药剂", "todo");
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        }
     }
 
     /**
@@ -405,7 +414,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     public void tj(StudyFormFill studyFormFill) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getQmrmm());
+        checkPassword(qmr, studyFormFill.getQmrmm());
         if (studyFormFill.getId() != null) {
             StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
             studyFormFillOld.setBdmc(studyFormFill.getBdmc());
@@ -428,14 +437,14 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                 //稽查轨迹
                 List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
                 for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
-                    studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark()));
+                    studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark()));
                 }
                 studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
             }
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormFill.getRemark());
-            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         } else {
             studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
             studyFormFill.setUserId(SecurityUtils.getUserId());
@@ -449,7 +458,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormFill.getRemark());
-            studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+            studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         }
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());