fix:[模板管理]优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java

@@ -43,6 +43,13 @@ public class StudyFormFillResource {
     @JsonSetter(nulls = Nulls.SKIP)
     private Integer type=null;
 
+
+    /**
+     * 配置类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 9：细胞；11：细菌
+     */
+    @JsonSetter(nulls = Nulls.SKIP)
+    private Integer elnType=null;
+
     /**
      * 失效日期
      */
@@ -78,6 +85,14 @@ public class StudyFormFillResource {
      */
     private String yxzqdw;
 
+    public Integer getElnType() {
+        return elnType;
+    }
+
+    public void setElnType(Integer elnType) {
+        this.elnType = elnType;
+    }
+
     public String getMc() {
         return mc;
     }

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

@@ -783,6 +783,14 @@ public class StudyFormFillServiceImpl extends ServiceImpl
      */
     public void genResource(StudyFormFill studyFormFill, String remark) {
         Template template = templateService.getById(studyFormFill.getTemplateId());
+        List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(studyFormFill.getResource(), StudyFormFillResource.class);
+        //如果elnType 不为空，则设置type为空
+        for(StudyFormFillResource studyFormFillResource:studyFormFillResourceList){
+            if(studyFormFillResource.getElnType()!=null&&studyFormFillResource.getElnType().intValue()>0){
+                studyFormFillResource.setType(null);
+            }
+        }
+        studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList));
 
         // 处置，存放，用量
         sjService.genResource(studyFormFill, template);