jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DevicePageReqVO.java
@@ -57,4 +57,6 @@ @Schema(description = "状态") private Integer[] state; @Schema(description = "备注") private String comment; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespFlattenVO.java
@@ -69,6 +69,10 @@ @ExcelProperty("拆装编号") private Long rentId; @Schema(description = "备注") @ExcelProperty("备注") private String comment; //@Schema(description = "患者详情") //@ExcelProperty("患者详情") //private PatDetails patDetails; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java
@@ -70,6 +70,10 @@ @ExcelProperty("拆装编号") private Long rentId; @Schema(description = "备注") @ExcelProperty("备注") private String comment; @Schema(description = "患者详情") @ExcelProperty("患者详情") private PatDetails patDetails; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceSaveReqVO.java
@@ -55,4 +55,6 @@ @Schema(description = "状态") private Integer state; @Schema(description = "备注") private String comment; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
@@ -80,4 +80,6 @@ @TableField(typeHandler = JacksonTypeHandler.class, updateStrategy = FieldStrategy.ALWAYS) private PatDetails patDetails; private String comment; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
@@ -24,6 +24,9 @@ default PageResult<DeviceDO> selectPage(DevicePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX<DeviceDO>() .eqIfPresent(DeviceDO::getDevId, reqVO.getDevId()) .eqIfPresent(DeviceDO::getDevCodeIntrinsic, reqVO.getDevCodeIntrinsic()) .eqIfPresent(DeviceDO::getDevCodeHosp, reqVO.getDevCodeHosp()) .eqIfPresent(DeviceDO::getDevCodeDept, reqVO.getDevCodeDept()) .inIfPresent(DeviceDO::getState, reqVO.getState()) .eqIfPresent(DeviceDO::getCategory, reqVO.getCategory()) .eqIfPresent(DeviceDO::getBrand, reqVO.getBrand())
