feat：[填报表单]新增仪器信息字段

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java

@@ -71,6 +71,9 @@ public class StudyFormFill extends MpBaseEntity
     /** 物资信息 */
     private String resource;
 
+    /** 仪器物资信息 */
+    private String yqResource;
+
     /** 处置list */
     private String czlist;
 
@@ -141,6 +144,14 @@ public class StudyFormFill extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public String getYqResource() {
+        return yqResource;
+    }
+
+    public void setYqResource(String yqResource) {
+        this.yqResource = yqResource;
+    }
+
     public String getTemplateShowSn() {
         return templateShowSn;
     }

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

@@ -387,6 +387,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFillOld.setBdmc(studyFormFill.getBdmc());
             studyFormFillOld.setBdnr(studyFormFill.getBdnr());
             studyFormFillOld.setResource(studyFormFill.getResource());
+            studyFormFillOld.setYqResource(studyFormFill.getYqResource());
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
             studyFormFillOld.setTjsj(new Date());
             if (studyFormFillOld.getSftb().equals(NormalEnum.no.getValue())) {