fix:[模板管理]优化

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

@@ -1498,8 +1498,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             } else {
                                 this.updateById(gyzj);
                             }
-                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue());
                         }
+                        studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue());
                     } else {
                         //使用的才更新 Resource
                         studyFormFillResource.setMc(gyzj.getMc());

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

@@ -1284,8 +1284,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             } else {
                                 this.updateById(mjy);
                             }
-                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue());
                         }
+                        studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue());
                     } else {
                         //使用的才更新 Resource
                         studyFormFillResource.setMc(mjy.getMc());

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

@@ -712,8 +712,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                             }
                             sjMap.put(sj.getBh(), sj);
                             sjList.add(sj);
-                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue());
                         }
+                        studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue());
                     }else{
                         //使用的才更新 Resource
                         studyFormFillResource.setMc(sj.getMc());

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

@@ -552,16 +552,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
      */
     public void genResource(StudyFormFill studyFormFill, String remark) {
         Template template = templateService.getById(studyFormFill.getTemplateId());
-        //第一次填报
-        if(studyFormFill.getSftb().equals(NormalEnum.no.getValue())){
-            // 处置，存放，用量
-            sjService.genResource(studyFormFill, template);
-            gyzjService.genResource(studyFormFill, template, remark);
-            mjyService.genResource(studyFormFill, template, remark);
-        }else{
-        //todo 再次修改 只是使用到的药剂，同步更新物资列表
-
-        }
+        // 处置，存放，用量
+        sjService.genResource(studyFormFill, template);
+        gyzjService.genResource(studyFormFill, template, remark);
+        mjyService.genResource(studyFormFill, template, remark);
         //更新 Resource
         this.updateById(studyFormFill);
     }