fix:[填报表单]分装

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

@@ -10,6 +10,8 @@ import com.hxhq.business.dto.gyzj.DetailDto;
 import com.hxhq.business.dto.gyzj.ListDto;
 import com.hxhq.business.form.gyzj.*;
 import com.hxhq.business.form.sj.SjSearchListForm;
+import com.hxhq.business.form.study.StudyFormConfigurationForm;
+import com.hxhq.business.form.study.StudyFormFillSubpackageForm;
 
 /**
  * 给药制剂Service接口
@@ -22,6 +24,29 @@ public interface IGyzjService extends IService {
     //region 资源库管理
 
     /**
+     * 开始配置
+     * @param form
+     * @return
+     */
+    public void startConfiguration(StudyFormConfigurationForm form);
+
+
+    /**
+     * 配置完成
+     * @param form
+     * @return
+     */
+    public void configurationCompleted(StudyFormConfigurationForm form);
+
+
+    /**
+     * 分装
+     * @param form
+     * @return
+     */
+    public void subpackage(StudyFormFillSubpackageForm form);
+
+    /**
      * 查询给药制剂列表
      *
      * @param form 给药制剂

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

@@ -12,6 +12,8 @@ import com.hxhq.business.form.gsp.GspJyForm;
 import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.mjy.GdForm;
 import com.hxhq.business.form.sj.*;
+import com.hxhq.business.form.study.StudyFormConfigurationForm;
+import com.hxhq.business.form.study.StudyFormFillSubpackageForm;
 
 /**
  * 试剂Service接口
@@ -21,6 +23,30 @@ import com.hxhq.business.form.sj.*;
  */
 public interface ISjService extends IService<Sj>
 {
+
+    /**
+     * 开始配置
+     * @param form
+     * @return
+     */
+    public void startConfiguration(StudyFormConfigurationForm form);
+
+
+    /**
+     * 配置完成
+     * @param form
+     * @return
+     */
+    public void configurationCompleted(StudyFormConfigurationForm form);
+
+
+    /**
+     * 分装
+     * @param form
+     * @return
+     */
+    public void subpackage(StudyFormFillSubpackageForm form);
+
     /**
      * 查询试剂列表
      *

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

@@ -19,6 +19,8 @@ import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.mjy.*;
+import com.hxhq.business.form.study.StudyFormConfigurationForm;
+import com.hxhq.business.form.study.StudyFormFillSubpackageForm;
 import com.hxhq.business.service.*;
 import com.hxhq.business.utils.CalUnitTools;
 import com.hxhq.business.utils.JctUtil;
@@ -1336,6 +1338,38 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
     }
 
     /**
+     * 开始配置
+     * @param form
+     * @return
+     */
+    @Override
+    public void startConfiguration(StudyFormConfigurationForm form){
+
+    }
+
+
+    /**
+     * 配置完成
+     * @param form
+     * @return
+     */
+    @Override
+    public void configurationCompleted(StudyFormConfigurationForm form){
+
+    }
+
+
+    /**
+     * 分装
+     * @param form
+     * @return
+     */
+    @Override
+    public void subpackage(StudyFormFillSubpackageForm form){
+
+    }
+
+    /**
      * 处置、存储
      *
      * @param studyFormFill

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

@@ -21,6 +21,8 @@ import com.hxhq.business.form.gsp.GspGdForm;
 import com.hxhq.business.form.gsp.GspJyForm;
 import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.sj.*;
+import com.hxhq.business.form.study.StudyFormConfigurationForm;
+import com.hxhq.business.form.study.StudyFormFillSubpackageForm;
 import com.hxhq.business.service.*;
 import com.hxhq.business.utils.CalUnitTools;
 import com.hxhq.business.utils.JctUtil;
@@ -782,6 +784,38 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
     }
 
+    /**
+     * 开始配置
+     * @param form
+     * @return
+     */
+    @Override
+    public void startConfiguration(StudyFormConfigurationForm form){
+
+    }
+
+
+    /**
+     * 配置完成
+     * @param form
+     * @return
+     */
+    @Override
+    public void configurationCompleted(StudyFormConfigurationForm form){
+
+    }
+
+
+    /**
+     * 分装
+     * @param form
+     * @return
+     */
+    @Override
+    public void subpackage(StudyFormFillSubpackageForm form){
+
+    }
+
     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

@@ -86,17 +86,13 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             throw  new ServiceException("填报不存在或已删除");
         }
         Template template = templateService.getById(studyFormFill.getTemplateId());
-        //todo 试剂
+        // 试剂
         if(template.getProduct().equals(ProductEnum.Sj.getValue())){
-
-        }
-        //todo 麻精药
-        if(template.getProduct().equals(ProductEnum.Mjy.getValue())){
-
+            sjService.startConfiguration(form);
         }
-        //todo 给药制剂
+        // 给药制剂
         if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
-
+            gyzjService.startConfiguration(form);
         }
     }
 
@@ -113,17 +109,13 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             throw  new ServiceException("填报不存在或已删除");
         }
         Template template = templateService.getById(studyFormFill.getTemplateId());
-        //todo 试剂
+        // 试剂
         if(template.getProduct().equals(ProductEnum.Sj.getValue())){
-
-        }
-        //todo 麻精药
-        if(template.getProduct().equals(ProductEnum.Mjy.getValue())){
-
+            sjService.configurationCompleted(form);
         }
-        //todo 给药制剂
+        // 给药制剂
         if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
-
+            gyzjService.configurationCompleted(form);
         }
     }
 
@@ -140,17 +132,13 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             throw  new ServiceException("填报不存在或已删除");
         }
         Template template = templateService.getById(studyFormFill.getTemplateId());
-        //todo 试剂
+        // 试剂
         if(template.getProduct().equals(ProductEnum.Sj.getValue())){
-
+            sjService.subpackage(form);
         }
-        //todo 麻精药
-        if(template.getProduct().equals(ProductEnum.Mjy.getValue())){
-
-        }
-        //todo 给药制剂
+        // 给药制剂
         if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
-
+            gyzjService.subpackage(form);
         }
     }