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

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

@@ -3,6 +3,8 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.Gsp;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.domain.StudyFormFill;
+import com.hxhq.business.domain.Template;
 import com.hxhq.business.dto.gsp.GspDto;
 import com.hxhq.business.dto.gsp.GspListDto;
 import com.hxhq.business.form.gsp.*;
@@ -194,4 +196,12 @@ public interface IGspService extends IService
      */
     public void autoJyExpireReturn();
 
+    /**
+     * 药剂存储
+     * @param studyFormFill
+     * @param template
+     * @param remark
+     */
+    void storageResource(StudyFormFill studyFormFill, Template template, String remark);
+
 }

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

@@ -225,6 +225,14 @@ public interface IGyzjService extends IService {
      */
     void genResource(StudyFormFill studyFormFill, Template template,String remark);
 
+    /**
+     * 药剂存储
+     * @param studyFormFill
+     * @param template
+     * @param remark
+     */
+    void storageResource(StudyFormFill studyFormFill, Template template,String remark);
+
     //endregion
 
     //region 档案管理

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

@@ -210,6 +210,14 @@ public interface IMjyService extends IService {
      */
     void genResource(StudyFormFill studyFormFill, Template template,String remark);
 
+    /**
+     * 药剂存储
+     * @param studyFormFill
+     * @param template
+     * @param remark
+     */
+    void storageResource(StudyFormFill studyFormFill, Template template,String remark);
+
     //endregion
 
     //region 档案管理

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

@@ -132,6 +132,14 @@ public interface ISjService extends IService
     void genResource(StudyFormFill studyFormFill, Template template);
 
     /**
+     * 药剂存储
+     * @param studyFormFill
+     * @param template
+     * @param remark
+     */
+    void storageResource(StudyFormFill studyFormFill, Template template,String remark);
+
+    /**
      * 同意归档
      * @param form
      */

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

@@ -1373,4 +1373,14 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         return  "/resource/specimen/"+tab;
     }
 
+    /**
+     * 药剂存储
+     * @param studyFormFill
+     * @param template
+     * @param remark
+     */
+    @Override
+    public void storageResource(StudyFormFill studyFormFill, Template template,String remark){
+
+    }
 }

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

@@ -1420,6 +1420,17 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
     }
 
     /**
+     * 药剂存储
+     * @param studyFormFill
+     * @param template
+     * @param remark
+     */
+    @Override
+    public void storageResource(StudyFormFill studyFormFill, Template template,String remark){
+
+    }
+
+    /**
      * 处置、存储
      *
      * @param studyFormFill

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

@@ -1325,6 +1325,17 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
     }
 
     /**
+     * 药剂存储
+     * @param studyFormFill
+     * @param template
+     * @param remark
+     */
+    @Override
+    public void storageResource(StudyFormFill studyFormFill, Template template,String remark){
+
+    }
+
+    /**
      * 处置、存储
      *
      * @param studyFormFill

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

@@ -771,6 +771,17 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         }
     }
 
+    /**
+     * 药剂存储
+     * @param studyFormFill
+     * @param template
+     * @param remark
+     */
+    @Override
+    public void storageResource(StudyFormFill studyFormFill, Template template,String remark){
+
+    }
+
     private void cc(StudyFormFill studyFormFill, Map<String, Sj> sjMap, List<SjJcgj> jcgjList, List<SjTz> tzList, SysUser qmr) {
         String empty = "[]";
         String cclist = studyFormFill.getCclist();

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

@@ -67,6 +67,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     @Autowired
     private IGyzjService gyzjService;
     @Autowired
+    private IGspService gspService;
+    @Autowired
     private IStudyFormPreService studyFormPreService;
     @Autowired
     private IStudySubjectService studySubjectService;
@@ -477,7 +479,12 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         checkPassword(qmr, studyFormFill.getQmrmm());
         if (studyFormFill.getId() != null) {
             StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
-            //产生的药剂，不能存储吧？只能存储使用的 todo
+            Template template = templateService.getById(studyFormFill.getTemplateId());
+            //只有列表有 开始配置 配置完成的时候，并且点了配置完成后 ，药剂存储才能选到配置出来的药剂，其余都只能选择使用的
+            sjService.storageResource(studyFormFillOld,template,studyFormFill.getRemark());
+            mjyService.storageResource(studyFormFillOld,template,studyFormFill.getRemark());
+            gyzjService.storageResource(studyFormFillOld,template,studyFormFill.getRemark());
+            gspService.storageResource(studyFormFillOld,template,studyFormFill.getRemark());
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("存储位置", "todo");