检查项目表和患者检查项目表新增模块名称和模块ID

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectitems/vo/InspectitemsPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.inspect.controller.admin.inspectitems.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -52,12 +53,18 @@ public class InspectitemsPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
-    @Schema(description = "模块ID：体检单元ID  模块名称ID", example = "20997")
+    @Schema(description = "体检单元ID  ", example = "20997")
     private Integer moduleID;
 
-    @Schema(description = "模块名称：体检单元", example = "张三")
+    @Schema(description = "体检单元", example = "张三")
     private String moduleName;
     @Schema(description = "科室ID")
     private String sectionID;
 
+    @Schema(description = "模块名称")
+    private String groupname;
+
+    @Schema(description = "模块ID")
+    private String groupcode;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectitems/vo/InspectitemsRespVO.java

@@ -64,15 +64,21 @@ public class InspectitemsRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "模块ID：体检单元ID  模块名称ID", example = "20997")
+    @Schema(description = "体检单元ID  ", example = "20997")
     @ExcelProperty("模块ID：体检单元ID  模块名称ID")
     private Integer moduleID;
 
-    @Schema(description = "模块名称：体检单元", example = "张三")
+    @Schema(description = "体检单元", example = "张三")
     @ExcelProperty("模块名称：体检单元")
     private String moduleName;
 
     @Schema(description = "科室ID")
     private String sectionID;
 
+    @Schema(description = "模块名称")
+    private String groupname;
+
+    @Schema(description = "模块ID")
+    private String groupcode;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectitems/vo/InspectitemsSaveReqVO.java

@@ -49,11 +49,18 @@ public class InspectitemsSaveReqVO {
     @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "模块ID：体检单元ID  模块名称ID", example = "20997")
+    @Schema(description = "体检单元ID  ", example = "20997")
     private Integer moduleID;
 
-    @Schema(description = "模块名称：体检单元", example = "张三")
+    @Schema(description = "体检单元", example = "张三")
     private String moduleName;
     @Schema(description = "科室ID")
     private String sectionID;
+
+    @Schema(description = "模块名称")
+    private String groupname;
+
+    @Schema(description = "模块ID")
+    private String groupcode;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsPageReqVO.java

@@ -70,4 +70,10 @@ public class InspectPatientitemsPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime inspecttime;
 
+    @Schema(description = "模块名称")
+    private String groupname;
+
+    @Schema(description = "模块ID")
+    private String groupcode;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsRespVO.java

@@ -84,4 +84,10 @@ public class InspectPatientitemsRespVO {
     @Schema(description = "检查时间")
     private LocalDateTime inspecttime;
 
+    @Schema(description = "模块名称")
+    private String groupname;
+
+    @Schema(description = "模块ID")
+    private String groupcode;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsSaveReqVO.java

@@ -72,5 +72,11 @@ public class InspectPatientitemsSaveReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime inspecttime;
 
+    @Schema(description = "模块名称")
+    private String groupname;
+
+    @Schema(description = "模块ID")
+    private String groupcode;
+
 
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectitems/InspectitemsDO.java

@@ -81,12 +81,12 @@ public class InspectitemsDO {
     @TableField("lowValue")
     private Double lowValue;
     /**
-     * 模块ID：体检单元ID  模块名称ID
+     * 体检单元ID
      */
     @TableField("moduleID")
     private Integer moduleID;
     /**
-     * 模块名称：体检单元
+     * 体检单元
      */
     @TableField("moduleName")
     private String moduleName;
@@ -95,5 +95,16 @@ public class InspectitemsDO {
      */
     @TableField("sectionID")
     private String sectionID;
+    /*
+    * 模块名称
+    * */
+    @TableField("groupname")
+    private String groupname;
+
+    /*
+     * 模块ID
+     * */
+    @TableField("groupcode")
+    private String groupcode;
 
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatientitems/InspectPatientitemsDO.java

@@ -117,4 +117,16 @@ public class InspectPatientitemsDO  {
     @TableField("inspecttime")
     private LocalDateTime inspecttime;
 
+    /*
+     * 模块名称
+     * */
+    @TableField("groupname")
+    private String groupname;
+
+    /*
+     * 模块ID
+     * */
+    @TableField("groupcode")
+    private String groupcode;
+
 }