diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java index f431cae..d5b322c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java +++ b/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); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java index a9022ab..744c255 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java +++ b/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 档案管理 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java index c7066e8..11b0e56 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java +++ b/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 档案管理 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java index 22c0605..75c9226 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java +++ b/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 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java index c7a524b..f8293f4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java +++ b/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){ + + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index 1ba5f5b..0d2cbf3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/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 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index a0add31..debb6f7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/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 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 0d33152..1a381b9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/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 sjMap, List jcgjList, List tzList, SysUser qmr) { String empty = "[]"; String cclist = studyFormFill.getCclist(); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index e2d3b8e..90c11d5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -67,6 +67,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("存储位置", "todo");