fix:[填报表单]新增分装

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java

@@ -1,21 +1,25 @@
 package com.hxhq.business.controller;
 
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.study.StudyFormFillListDto;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
-import com.hxhq.business.form.study.StudyFormFillGcForm;
-import com.hxhq.business.form.study.StudyFormFillShfzForm;
-import com.hxhq.business.form.study.StudyFormFillSearchForm;
-import com.hxhq.business.form.study.StudyFormUpdateForm;
+import com.hxhq.business.enums.zykgl.JcmcysEnum;
+import com.hxhq.business.enums.zykgl.JyztEnum;
+import com.hxhq.business.enums.zykgl.ZjztEnum;
+import com.hxhq.business.form.sj.SjBjForm;
+import com.hxhq.business.form.sj.SjSubpackageForm;
+import com.hxhq.business.form.study.*;
 import com.hxhq.business.service.*;
+import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
 import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
+import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -53,6 +57,38 @@ public class StudyFormFillController extends BaseController {
     public String localFilePrefix;
 
     /**
+     * 开始配置
+     * @return
+     */
+    @PostMapping("/startConfiguration")
+    public AjaxResult startConfiguration(@RequestBody StudyFormConfigurationForm form) {
+        studyFormFillService.startConfiguration(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 配置完成
+     * @param form
+     * @return
+     */
+    @PostMapping("/configurationCompleted")
+    public AjaxResult configurationCompleted(@RequestBody StudyFormConfigurationForm form) {
+        studyFormFillService.configurationCompleted(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 分装
+     * @param form
+     * @return
+     */
+    @PostMapping("/subpackage")
+    public AjaxResult subpackage(@RequestBody StudyFormFillSubpackageForm form) {
+        studyFormFillService.subpackage(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
      * 列表
      */
     @GetMapping("/list")

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormConfigurationForm.java

@@ -0,0 +1,188 @@
+package com.hxhq.business.form.study;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 试剂编辑
+ * @author HanLong
+ */
+public class StudyFormConfigurationForm {
+
+    private Long id;
+
+    /** 名称 */
+    private String mc;
+
+    /** 编号 */
+    private String bh;
+
+    /** 浓度/含量/纯度 */
+    private String nd;
+
+    /** 浓度单位 */
+    private String nddw;
+
+    /** 库存 */
+    private String kc;
+
+    /** 库存单位 */
+    private String kcdw;
+
+    /** 存储条件 */
+    private String cctj;
+
+    /** 存储位置 */
+    private String ccwz;
+
+    /** 失效日 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sxr;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    /** 签名备注 */
+    private String qmbz;
+
+    /** 试验id */
+    private Long studyId;
+
+    /** 试验表单id */
+    private Long studyFormId;
+
+    /** 所属部门/学科 */
+    private Long studySubjectId;
+
+    public Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyFormId() {
+        return studyFormId;
+    }
+
+    public void setStudyFormId(Long studyFormId) {
+        this.studyFormId = studyFormId;
+    }
+
+    public Long getStudySubjectId() {
+        return studySubjectId;
+    }
+
+    public void setStudySubjectId(Long studySubjectId) {
+        this.studySubjectId = studySubjectId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMc() {
+        return mc;
+    }
+
+    public void setMc(String mc) {
+        this.mc = mc;
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getNd() {
+        return nd;
+    }
+
+    public void setNd(String nd) {
+        this.nd = nd;
+    }
+
+    public String getNddw() {
+        return nddw;
+    }
+
+    public void setNddw(String nddw) {
+        this.nddw = nddw;
+    }
+
+    public String getKc() {
+        return kc;
+    }
+
+    public void setKc(String kc) {
+        this.kc = kc;
+    }
+
+    public String getKcdw() {
+        return kcdw;
+    }
+
+    public void setKcdw(String kcdw) {
+        this.kcdw = kcdw;
+    }
+
+    public String getCctj() {
+        return cctj;
+    }
+
+    public void setCctj(String cctj) {
+        this.cctj = cctj;
+    }
+
+    public String getCcwz() {
+        return ccwz;
+    }
+
+    public void setCcwz(String ccwz) {
+        this.ccwz = ccwz;
+    }
+
+    public Date getSxr() {
+        return sxr;
+    }
+
+    public void setSxr(Date sxr) {
+        this.sxr = sxr;
+    }
+
+    public Long getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(Long qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+
+    public String getQmbz() {
+        return qmbz;
+    }
+
+    public void setQmbz(String qmbz) {
+        this.qmbz = qmbz;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageForm.java

@@ -0,0 +1,87 @@
+package com.hxhq.business.form.study;
+
+import java.util.List;
+
+/**
+ * 试剂分装参数
+ * @author HanLong
+ */
+public class StudyFormFillSubpackageForm {
+
+    /** 试验id */
+    private Long studyId;
+
+    /** 试验表单id */
+    private Long studyFormId;
+
+    /** 学科id */
+    private Long studySubjectId;
+
+    /** 母液编号 */
+    private String bh;
+
+    /** 母液浓度 */
+    private String nd;
+
+    /** 母液浓度单位 */
+    private String nddw;
+
+    /** 分装数据 */
+    private List<StudyFormFillSubpackageItemForm> list;
+
+    public Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+
+    public Long getStudyFormId() {
+        return studyFormId;
+    }
+
+    public void setStudyFormId(Long studyFormId) {
+        this.studyFormId = studyFormId;
+    }
+
+    public List<StudyFormFillSubpackageItemForm> getList() {
+        return list;
+    }
+
+    public void setList(List<StudyFormFillSubpackageItemForm> list) {
+        this.list = list;
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getNd() {
+        return nd;
+    }
+
+    public void setNd(String nd) {
+        this.nd = nd;
+    }
+
+    public String getNddw() {
+        return nddw;
+    }
+
+    public void setNddw(String nddw) {
+        this.nddw = nddw;
+    }
+
+    public Long getStudySubjectId() {
+        return studySubjectId;
+    }
+
+    public void setStudySubjectId(Long studySubjectId) {
+        this.studySubjectId = studySubjectId;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSubpackageItemForm.java

@@ -0,0 +1,48 @@
+package com.hxhq.business.form.study;
+
+import java.util.List;
+
+/**
+ * 分装参数
+ * @author HanLong
+ */
+public class StudyFormFillSubpackageItemForm {
+    /**
+     * 编号
+     */
+    private String bh;
+
+    /**
+     * 库存
+     */
+    private String kc;
+
+    /**
+     * 库存单位
+     */
+    private String kcdw;
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getKc() {
+        return kc;
+    }
+
+    public void setKc(String kc) {
+        this.kc = kc;
+    }
+
+    public String getKcdw() {
+        return kcdw;
+    }
+
+    public void setKcdw(String kcdw) {
+        this.kcdw = kcdw;
+    }
+}

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

@@ -4,10 +4,7 @@ import java.util.List;
 import com.hxhq.business.domain.StudyFormFill;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.business.dto.study.StudyFormFillListDto;
-import com.hxhq.business.form.study.StudyFormFillGcForm;
-import com.hxhq.business.form.study.StudyFormFillSearchForm;
-import com.hxhq.business.form.study.StudyFormFillShfzForm;
-import com.hxhq.business.form.study.StudyFormUpdateForm;
+import com.hxhq.business.form.study.*;
 
 /**
  * 试验-填报单Service接口
@@ -25,6 +22,30 @@ public interface IStudyFormFillService extends IService
      */
     public List<StudyFormFillListDto> queryList(StudyFormFillSearchForm form);
 
+
+    /**
+     * 开始配置
+     * @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/StudyFormFillServiceImpl.java

@@ -12,6 +12,7 @@ import com.hxhq.business.enums.NormalEnum;
 import com.hxhq.business.enums.SnTypeEnum;
 import com.hxhq.business.enums.study.StudyFormFillBdztEnum;
 import com.hxhq.business.enums.study.StudyTypeEnum;
+import com.hxhq.business.enums.template.ProductEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
 import com.hxhq.business.form.study.*;
@@ -70,6 +71,88 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     @Autowired
     private IStudySubjectService studySubjectService;
 
+
+    /**
+     * 开始配置
+     * @param form
+     * @return
+     */
+    @Override
+    public void startConfiguration(StudyFormConfigurationForm form){
+        StudyFormFill studyFormFill=this.getById(form.getStudyFormId());
+        if(studyFormFill==null){
+            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())){
+
+        }
+        //todo 给药制剂
+        if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
+
+        }
+    }
+
+
+    /**
+     * 配置完成
+     * @param form
+     * @return
+     */
+    @Override
+    public void configurationCompleted(StudyFormConfigurationForm form){
+        StudyFormFill studyFormFill=this.getById(form.getStudyFormId());
+        if(studyFormFill==null){
+            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())){
+
+        }
+        //todo 给药制剂
+        if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
+
+        }
+    }
+
+
+    /**
+     * 分装
+     * @param form
+     * @return
+     */
+    @Override
+    public void subpackage(StudyFormFillSubpackageForm form){
+        StudyFormFill studyFormFill=this.getById(form.getStudyFormId());
+        if(studyFormFill==null){
+            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())){
+
+        }
+        //todo 给药制剂
+        if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
+
+        }
+    }
+
+
     /**
      * 查询试验-填报单列表
      *
@@ -473,10 +556,16 @@ public class StudyFormFillServiceImpl extends ServiceImpl
      */
     public void genResource(StudyFormFill studyFormFill, String remark) {
         Template template = templateService.getById(studyFormFill.getTemplateId());
-        // 处置，存放，用量
-        sjService.genResource(studyFormFill, template);
-        gyzjService.genResource(studyFormFill, template, remark);
-        mjyService.genResource(studyFormFill, template, remark);
+        //第一次填报
+        if(studyFormFill.getSftb().equals(NormalEnum.no.getValue())){
+            // 处置，存放，用量
+            sjService.genResource(studyFormFill, template);
+            gyzjService.genResource(studyFormFill, template, remark);
+            mjyService.genResource(studyFormFill, template, remark);
+        }else{
+        //todo 再次修改 只是使用到的药剂，同步更新物资列表
+
+        }
         //更新 Resource
         this.updateById(studyFormFill);
     }