feat: [模板管理] 试剂生成

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

@@ -1355,15 +1355,17 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             gyzj.setBdId(studyFormId);
                             gyzj.setZjzt(ZjztEnum.wrk.getValue());
                             gyzj.setJyzt(JyztEnum.wjy.getValue());
+
+                            gyzj.setMc(studyFormFillResource.getMc());
+                            gyzj.setBh(studyFormFillResource.getBh());
+                            gyzj.setLy(studyFormFillResource.getLy());
+                            gyzj.setNd(String.valueOf(studyFormFillResource.getNd()));
+                            gyzj.setNddw(studyFormFillResource.getNddw());
+                            gyzj.setKc(String.valueOf(studyFormFillResource.getKc()));
+                            gyzj.setKcdw(studyFormFillResource.getKcdw());
+                            gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
                         }
-                        gyzj.setMc(studyFormFillResource.getMc());
-                        gyzj.setBh(studyFormFillResource.getBh());
-                        gyzj.setLy(studyFormFillResource.getLy());
-                        gyzj.setNd(String.valueOf(studyFormFillResource.getNd()));
-                        gyzj.setNddw(studyFormFillResource.getNddw());
-                        gyzj.setKc(String.valueOf(studyFormFillResource.getKc()));
-                        gyzj.setKcdw(studyFormFillResource.getKcdw());
-                        gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
+
                         if (gyzj.getId() == null) {
                             this.save(gyzj);
                             gyzjList.add(gyzj);
@@ -1373,7 +1375,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             // 台账
                             tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId()));
                         } else {
-                            this.updateById(gyzj);
+//                            this.updateById(gyzj);
                         }
                         if (gyzj != null){
                             //更新 Resource

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

@@ -1258,15 +1258,17 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             mjy.setBdId(studyFormId);
                             mjy.setZjzt(ZjztEnum.wrk.getValue());
                             mjy.setJyzt(JyztEnum.wjy.getValue());
+
+                            mjy.setMc(studyFormFillResource.getMc());
+                            mjy.setBh(studyFormFillResource.getBh());
+                            mjy.setNd(String.valueOf(studyFormFillResource.getNd()));
+                            mjy.setNddw(studyFormFillResource.getNddw());
+                            mjy.setLy(studyFormFillResource.getLy());
+                            mjy.setKc(String.valueOf(studyFormFillResource.getKc()));
+                            mjy.setKcdw(studyFormFillResource.getKcdw());
+                            mjy.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
                         }
-                        mjy.setMc(studyFormFillResource.getMc());
-                        mjy.setBh(studyFormFillResource.getBh());
-                        mjy.setNd(String.valueOf(studyFormFillResource.getNd()));
-                        mjy.setNddw(studyFormFillResource.getNddw());
-                        mjy.setLy(studyFormFillResource.getLy());
-                        mjy.setKc(String.valueOf(studyFormFillResource.getKc()));
-                        mjy.setKcdw(studyFormFillResource.getKcdw());
-                        mjy.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
+
                         if (mjy.getId() == null) {
                             this.save(mjy);
                             mjyList.add(mjy);
@@ -1276,7 +1278,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             // 台账
                             tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId()));
                         } else {
-                            this.updateById(mjy);
+//                            this.updateById(mjy);
                         }
                         if (mjy != null){
                             //更新 Resource

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

@@ -677,18 +677,20 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                             sj.setZjzt(ZjztEnum.rk.getValue());
                             sj.setJyzt(JyztEnum.wjy.getValue());
                             sj.setDeptId(template.getDeptId());
+
+                            sj.setMc(studyFormFillResource.getMc());
+                            sj.setBh(studyFormFillResource.getBh());
+                            sj.setNd(String.valueOf(studyFormFillResource.getNd()));
+                            sj.setNddw(studyFormFillResource.getNddw());
+                            sj.setKc(studyFormFillResource.getKc());
+                            sj.setKcdw(studyFormFillResource.getKcdw());
+                            sj.setLy(studyFormFillResource.getLy());
+                            sj.setSxr(DateUtils.parseDate(studyFormFillResource.getSxrq()));
+                            sj.setPzrq(studyFormFill.getStartDate());
+                            sj.setYxzq(studyFormFillResource.getYxzq());
+                            sj.setYxzqdw(studyFormFillResource.getYxzqdw());
                         }
-                        sj.setMc(studyFormFillResource.getMc());
-                        sj.setBh(studyFormFillResource.getBh());
-                        sj.setNd(String.valueOf(studyFormFillResource.getNd()));
-                        sj.setNddw(studyFormFillResource.getNddw());
-                        sj.setKc(studyFormFillResource.getKc());
-                        sj.setKcdw(studyFormFillResource.getKcdw());
-                        sj.setLy(studyFormFillResource.getLy());
-                        sj.setSxr(DateUtils.parseDate(studyFormFillResource.getSxrq()));
-                        sj.setPzrq(studyFormFill.getStartDate());
-                        sj.setYxzq(studyFormFillResource.getYxzq());
-                        sj.setYxzqdw(studyFormFillResource.getYxzqdw());
+
                         if (sj.getId() == null) {
                             this.save(sj);
                             sjList.add(sj);
@@ -703,7 +705,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                             SjTz sjTz = sjTzService.genTz(sj.getId(), "配制完成", "Formulation Completed", sj.getKc(), sj.getKcdw(), null, qmr);
                             tzList.add(sjTz);
                         } else {
-                            this.updateById(sj);
+//                            this.updateById(sj);
                         }
                         if (sj != null){
                             //更新 Resource