diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysDictTypeController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysDictTypeController.java index da0e74d3..d61889c0 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysDictTypeController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysDictTypeController.java @@ -2,6 +2,8 @@ package com.acupuncture.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.acupuncture.common.core.domain.entity.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -21,6 +23,7 @@ import com.acupuncture.common.core.page.TableDataInfo; import com.acupuncture.common.enums.BusinessType; import com.acupuncture.common.utils.poi.ExcelUtil; import com.acupuncture.system.service.ISysDictTypeService; +import org.springframework.web.multipart.MultipartFile; /** * 数据字典信息 @@ -63,6 +66,18 @@ public class SysDictTypeController extends BaseController return success(dictTypeService.selectDictTypeById(dictId)); } + @Log(title = "字典类型", businessType = BusinessType.IMPORT) + @PreAuthorize("@ss.hasPermi('system:dict:export')") + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception + { + ExcelUtil util = new ExcelUtil(SysDictType.class); + List sysDictTypes = util.importExcel(file.getInputStream()); + String operName = getUsername(); + String message = dictTypeService.importDictType(sysDictTypes, updateSupport, operName); + return success(message); + } + /** * 新增字典类型 */ diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java index 6fc865e8..5137852e 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java @@ -185,6 +185,7 @@ public class SysUserController extends BaseController return toAjax(userService.updateUser(user)); } +<<<<<<< HEAD private void changeDataSource(Long tenantId) { DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(tenantId); if (dmsTenant != null) { @@ -199,6 +200,8 @@ public class SysUserController extends BaseController } } +======= +>>>>>>> new /** * 删除用户 */ diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDataSourceController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDataSourceController.java index dfb0c11a..49e15fa1 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDataSourceController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDataSourceController.java @@ -1,7 +1,9 @@ package com.acupuncture.web.controller.web; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.system.domain.dto.AdminDataSourceDto; import com.acupuncture.system.domain.vo.AdminDataSourceVo; @@ -34,6 +36,7 @@ public class AdminDataSourceController { @ApiOperation("添加数据源") @PostMapping("/add") + @DataSource(DataSourceType.MASTER) public JsonResponse insert(@RequestBody @Validated AdminDataSourceDto.AddDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -43,6 +46,7 @@ public class AdminDataSourceController { @ApiOperation("修改数据源") @PostMapping("/upd") + @DataSource(DataSourceType.MASTER) public JsonResponse update(@RequestBody @Validated AdminDataSourceDto.UpdDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -52,6 +56,7 @@ public class AdminDataSourceController { @ApiOperation("删除数据源") @PostMapping("/del") + @DataSource(DataSourceType.MASTER) public JsonResponse delete(@RequestBody @Validated AdminDataSourceDto.DeleteDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -61,6 +66,7 @@ public class AdminDataSourceController { @ApiOperation("查询数据源") @PostMapping("/list") + @DataSource(DataSourceType.MASTER) public JsonResponse> query(@RequestBody @Validated BaseDto dto) { return JsonResponse.ok(new PageInfo<>(adminDataSourceService.query(dto.getParam()))); } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java index b2568d45..49ff9e4c 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java @@ -2,10 +2,15 @@ package com.acupuncture.web.controller.web; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.acupuncture.common.annotation.DataSource; +import com.acupuncture.common.annotation.Log; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; import com.acupuncture.common.core.domain.entity.SysUser; +import com.acupuncture.common.enums.BusinessType; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.common.utils.StringUtils; import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; @@ -30,11 +35,9 @@ import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -68,6 +71,7 @@ public class AdminDmsUserController { @ApiOperation("添加租户用户") @PostMapping("/add") + @DataSource(DataSourceType.MASTER) public JsonResponse insert(@RequestBody @Validated AdminTenantUserDto.AddDto dto) { //判定租户及数据源是否存在 DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(dto.getTenantId()); @@ -85,13 +89,19 @@ public class AdminDmsUserController { } else if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !dmsLoginService.checkPhoneUnique(dto)) { return JsonResponse.ok().fail("新增用户'" + dto.getUserName() + "'失败，手机号码已存在"); } + dto.setId(IdUtil.getSnowflakeNextId()); dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword())); adminTenantUserService.insert(dto); //切换至从库 +<<<<<<< HEAD changeDataSource(umsDataSource.getDataSourceKey()); DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); +======= + DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); + +>>>>>>> new //新增从库数据 SysUser user = BeanUtil.copyProperties(dto, SysUser.class); if (!userService.checkUserNameUnique(user)) { @@ -101,6 +111,7 @@ public class AdminDmsUserController { } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return JsonResponse.ok().fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } + user.setUserId(dto.getId()); user.setTenantId(dto.getTenantId()); user.setCreateBy(SecurityUtils.getUsername()); user.setPhonenumber(dto.getContactPhone()); @@ -110,7 +121,10 @@ public class AdminDmsUserController { int insert = userService.insertUser(user); //销毁切换数据源 +<<<<<<< HEAD removeDataSource(); +======= +>>>>>>> new DynamicDataSourceContextHolder.clearDataSourceType(); return JsonResponse.ok(insert); @@ -118,44 +132,40 @@ public class AdminDmsUserController { @ApiOperation("修改租户用户") @PostMapping("/upd") + @DataSource(DataSourceType.MASTER) public JsonResponse update(@RequestBody @Validated AdminTenantUserDto.UpdDto dto) { - updSysUser(dto); - return JsonResponse.ok(adminTenantUserService.update(dto)); - } - - private void updSysUser(AdminTenantUserDto.UpdDto dto) { - //查询租户数据源，删除分库数据 - DmsUserExample dmsUserExample = new DmsUserExample(); - dmsUserExample.createCriteria().andDelFlagEqualTo((byte) 0).andIdEqualTo(dto.getId()); - List dmsUsers = dmsUserMapper.selectByExample(dmsUserExample); - if (CollectionUtil.isNotEmpty(dmsUsers)) { - DmsUser dmsUser = dmsUsers.get(0); - AdminTenantsDto.Query query = new AdminTenantsDto.Query(); - query.setId(dmsUser.getTenantId()); - List tenantList = adminTenantsService.query(query); - if (CollectionUtil.isNotEmpty(tenantList)) { - for (AdminTenantsVo.Result result : tenantList) { - //切换数据源 删除分库数据 - DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); - //修改分库用户 - SysUser sysUser = BeanUtil.copyProperties(dto, SysUser.class); - sysUser.setPhonenumber(dto.getContactPhone()); - userService.updateUser(sysUser); - //销毁切换数据源 - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } + //判定租户及数据源是否存在 + DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(dto.getTenantId()); + if (dmsTenant == null) { + return JsonResponse.ok().fail("租户不存在"); } + UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId()); + if (umsDataSource == null || StrUtil.isEmpty(umsDataSource.getDataSourceKey())) { + return JsonResponse.ok().fail("数据源不存在"); + } + + //修改主库租户用户 + int rows = adminTenantUserService.update(dto); + + //切换至从库 + DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); + + //修改从库用户信息 + SysUser sysUser = BeanUtil.copyProperties(dto, SysUser.class); + sysUser.setUserId(dto.getId()); + sysUser.setPhonenumber(dto.getContactPhone()); + userService.updateUser(sysUser); + + //销毁切换数据源 + DynamicDataSourceContextHolder.clearDataSourceType(); + + return JsonResponse.ok(rows); } @ApiOperation("删除租户用户") @PostMapping("/del") + @DataSource(DataSourceType.MASTER) public JsonResponse delete(@RequestBody @Validated AdminTenantUserDto.DeleteDto dto) { - delSysUser(dto); - return JsonResponse.ok(adminTenantUserService.delete(dto)); - } - - private void delSysUser(AdminTenantUserDto.DeleteDto dto) { //查询租户数据源，删除分库数据 DmsUserExample dmsUserExample = new DmsUserExample(); dmsUserExample.createCriteria().andDelFlagEqualTo((byte) 0).andIdIn(dto.getIdList()); @@ -171,14 +181,18 @@ public class AdminDmsUserController { DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); //删除分库用户 userService.deleteUserByUsername(dmsUser.getUserName()); + //销毁切换数据源 + DynamicDataSourceContextHolder.clearDataSourceType(); } } } } + return JsonResponse.ok(adminTenantUserService.delete(dto)); } @ApiOperation("查询租户用户") @PostMapping("/list") + @DataSource(DataSourceType.MASTER) public JsonResponse> query(@RequestBody @Validated BaseDto dto) { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); @@ -186,11 +200,21 @@ public class AdminDmsUserController { return JsonResponse.ok(new PageInfo<>(adminTenantUserService.query(dto.getParam()))); } +<<<<<<< HEAD private static void changeDataSource(String key) { DynamicDataSourceContextHolder.setDataSourceType(key); } - - private static void removeDataSource() { - DynamicDataSourceContextHolder.clearDataSourceType(); +======= +>>>>>>> new + + /** + * 重置密码 + */ + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PostMapping("/resetPwd") + @DataSource(DataSourceType.MASTER) + public JsonResponse resetPwd(@RequestBody @Validated AdminTenantUserDto.ResetPwd dto) { + //只修改主库密码，修改从库密码没有任何意义。 + return JsonResponse.ok(adminTenantUserService.resetPwd(dto)); } } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminFmsFollowupController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminFmsFollowupController.java index 4c8ab572..8a56bc2a 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminFmsFollowupController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminFmsFollowupController.java @@ -1,8 +1,10 @@ package com.acupuncture.web.controller.web; import com.acupuncture.common.annotation.Anonymous; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.system.domain.dto.FmsFollowupDto; import com.acupuncture.system.domain.vo.FmsFollowupVo; import com.acupuncture.system.service.AdminFmsFollowupQueueService; @@ -36,6 +38,7 @@ public class AdminFmsFollowupController { @ApiOperation("查询队列") @PostMapping("/query") @Anonymous + @DataSource(DataSourceType.MASTER) public JsonResponse> queryCommonQueue(@RequestBody @Validated BaseDto dto) { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); @@ -45,6 +48,7 @@ public class AdminFmsFollowupController { @ApiOperation("添加随访队列") @PostMapping("/add") + @DataSource(DataSourceType.MASTER) public JsonResponse addQueue(@RequestBody @Validated FmsFollowupDto.Add dto){ return JsonResponse.ok(fmsFollowupQueueService.addQueue(dto)); } @@ -57,12 +61,14 @@ public class AdminFmsFollowupController { @ApiOperation("删除随访队列") @PostMapping("/del") + @DataSource(DataSourceType.MASTER) public JsonResponse delQueue(@RequestBody @Validated FmsFollowupDto.Del dto){ return JsonResponse.ok(fmsFollowupQueueService.delQueue(dto)); } @ApiOperation("查询随访患者") @PostMapping("/queryPatient") + @DataSource(DataSourceType.MASTER) public JsonResponse> queryPatient(@RequestBody @Validated BaseDto dto) { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); @@ -72,6 +78,7 @@ public class AdminFmsFollowupController { @ApiOperation("查询随访任务") @PostMapping("/queryTask") + @DataSource(DataSourceType.MASTER) public JsonResponse> queryTask(@RequestBody @Validated BaseDto dto) { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsPatientController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsPatientController.java index d03c0f0b..79e9634a 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsPatientController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsPatientController.java @@ -1,7 +1,9 @@ package com.acupuncture.web.controller.web; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.system.domain.dto.FmsFollowupDto; import com.acupuncture.system.domain.dto.PmsPatientDto; import com.acupuncture.system.domain.vo.FmsFollowupVo; @@ -47,6 +49,7 @@ public class AdminPmsPatientController { */ @ApiOperation("查询上报类型") @PostMapping("/list") + @DataSource(DataSourceType.MASTER) public JsonResponse> adminQuery( @RequestBody @Validated BaseDto dto) { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); @@ -56,6 +59,7 @@ public class AdminPmsPatientController { @ApiOperation("导出") @PostMapping("/export") + @DataSource(DataSourceType.MASTER) public void adminExportPatient(HttpServletResponse response, @RequestBody @Validated PmsPatientDto.PatientQuery dto) { pmsPatientService.adminExportPatient(response, dto); } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java index 7caaa429..884e742e 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java @@ -1,7 +1,9 @@ package com.acupuncture.web.controller.web; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; import com.acupuncture.system.domain.dto.PmsTreatmentDto; import com.acupuncture.system.domain.po.DmsTenant; @@ -41,13 +43,10 @@ public class AdminPmsTreatmentController { @Resource private PmsTreatmentService treatmentService; - @Resource - private DmsTenantMapper dmsTenantMapper; - @Resource - private UmsDataSourceMapper umsDataSourceMapper; @ApiOperation("查询诊疗档案") @PostMapping("/list") + @DataSource(DataSourceType.MASTER) public JsonResponse> listTreatment(@RequestBody @Validated BaseDto queryDTO) { if (queryDTO.getPageNum() > 0) { PageHelper.startPage(queryDTO.getPageNum(), queryDTO.getPageSize()); @@ -57,12 +56,14 @@ public class AdminPmsTreatmentController { @ApiOperation("查询诊疗档案数据") @PostMapping("/queryRecord") + @DataSource(DataSourceType.MASTER) public JsonResponse queryRecord(@RequestBody @Validated PmsTreatmentDto.QueryRecord dto) { return JsonResponse.ok(treatmentService.adminQueryRecord(dto.getTreatmentId(), dto.getCodeList())); } @ApiOperation("导出诊疗档案数据") @PostMapping("/exportTreatment") + @DataSource(DataSourceType.MASTER) public void exportTreatment(HttpServletResponse response, @RequestBody @Validated PmsTreatmentDto.TreatmentQueryDTO dto) { treatmentService.adminExportTreatment(response, dto); } @@ -75,6 +76,7 @@ public class AdminPmsTreatmentController { // } // +<<<<<<< HEAD private static void changeDataSource(String dataSourceKey) { try { DynamicDataSourceContextHolder.setDataSourceType(dataSourceKey); @@ -83,6 +85,8 @@ public class AdminPmsTreatmentController { } } +======= +>>>>>>> new // @ApiOperation("导出诊疗档案评估报告") // @PostMapping("/exportTreatmentPg") // public JsonResponse exportTreatmentPg(HttpServletResponse response, @RequestBody @Validated PmsTreatmentDto.ExportVO dto){ diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminStatisticsController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminStatisticsController.java index 2b5a8a70..2ec33f90 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminStatisticsController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminStatisticsController.java @@ -1,6 +1,8 @@ package com.acupuncture.web.controller.web; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.system.domain.dto.StatisticsDto; import com.acupuncture.system.domain.vo.AdminStatisticsVo; import com.acupuncture.system.service.AdminStatisticsService; @@ -33,30 +35,35 @@ public class AdminStatisticsController { @ApiOperation("患者统计") @PostMapping("/patientTotal") + @DataSource(DataSourceType.MASTER) public JsonResponse queryPatientStatistics(@RequestBody @Validated StatisticsDto.Query dto) { return JsonResponse.ok(statisticsService.queryPatientStatistics(dto)); } @ApiOperation("诊疗统计") @PostMapping("/zlInfo") + @DataSource(DataSourceType.MASTER) public JsonResponse queryZlStatistics(@RequestBody @Validated StatisticsDto.Query dto) { return JsonResponse.ok(statisticsService.queryZlStatistics(dto)); } @ApiOperation("治疗类型统计") @PostMapping("/zlType") + @DataSource(DataSourceType.MASTER) public JsonResponse queryZlTypeStatistics(@RequestBody @Validated StatisticsDto.Query dto) { return JsonResponse.ok(statisticsService.queryZlTypeStatistics(dto)); } @ApiOperation("随访分布统计") @PostMapping("/sffb") + @DataSource(DataSourceType.MASTER) public JsonResponse> querySfStatistics(@RequestBody @Validated StatisticsDto.Query dto) { return JsonResponse.ok(statisticsService.querySfStatistics(dto)); } @ApiOperation("失访统计") @PostMapping("/sftj") + @DataSource(DataSourceType.MASTER) public JsonResponse> querySfTjStatistics(@RequestBody @Validated StatisticsDto.Query dto) { return JsonResponse.ok(statisticsService.querySfTjStatistics(dto)); } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminTenantsController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminTenantsController.java index eafde8f2..c0173800 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminTenantsController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminTenantsController.java @@ -1,7 +1,9 @@ package com.acupuncture.web.controller.web; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.system.domain.dto.AdminTenantsDto; import com.acupuncture.system.domain.vo.AdminTenantsVo; @@ -37,6 +39,7 @@ public class AdminTenantsController { @ApiOperation("添加租户") @PostMapping("/add") + @DataSource(DataSourceType.MASTER) public JsonResponse insert(@RequestBody @Validated AdminTenantsDto.AddDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -46,6 +49,7 @@ public class AdminTenantsController { @ApiOperation("修改租户") @PostMapping("/upd") + @DataSource(DataSourceType.MASTER) public JsonResponse update(@RequestBody @Validated AdminTenantsDto.UpdDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -55,6 +59,7 @@ public class AdminTenantsController { @ApiOperation("删除租户") @PostMapping("/del") + @DataSource(DataSourceType.MASTER) public JsonResponse delete(@RequestBody @Validated AdminTenantsDto.DeleteDto dto) { if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return JsonResponse.ok().fail("无权限"); @@ -64,6 +69,7 @@ public class AdminTenantsController { @ApiOperation("查询租户") @PostMapping("/list") + @DataSource(DataSourceType.MASTER) public JsonResponse> query(@RequestBody @Validated BaseDto dto) { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java index 73782849..ba3afa32 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java @@ -4,6 +4,7 @@ import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.annotation.Log; import com.acupuncture.common.constant.Constants; import com.acupuncture.common.core.domain.AjaxResult; +import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; import com.acupuncture.common.core.domain.entity.SysUser; import com.acupuncture.common.core.domain.model.LoginBody; @@ -14,17 +15,26 @@ import com.acupuncture.common.utils.SecurityUtils; import com.acupuncture.framework.web.service.SysPermissionService; import com.acupuncture.framework.web.service.TokenService; import com.acupuncture.framework.web.service.WebDmsLoginService; +import com.acupuncture.system.domain.dto.FmsFollowupDto; import com.acupuncture.system.domain.po.DmsTenant; import com.acupuncture.system.domain.vo.DmsLoginUserVo; +import com.acupuncture.system.domain.vo.FmsFollowupVo; import com.acupuncture.system.service.DmsLoginService; +import com.acupuncture.system.service.FmsFollowupQueueService; +import com.acupuncture.system.service.FmsFollowupService; import com.acupuncture.system.service.ISysUserService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Map; import java.util.Set; /** @@ -47,6 +57,8 @@ public class DmsLoginController { private DmsLoginService dmsLoginService; @Resource private ISysUserService sysUserService; + @Resource + private FmsFollowupQueueService fmsFollowupQueueService; /** * 登录方法 @@ -56,6 +68,7 @@ public class DmsLoginController { */ @DataSource(DataSourceType.MASTER) @PostMapping("/login") + @DataSource(DataSourceType.MASTER) public AjaxResult login(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); // 生成令牌 @@ -66,6 +79,7 @@ public class DmsLoginController { } /** +<<<<<<< HEAD * 登录方法 * * @param loginBody 登录信息 @@ -86,31 +100,83 @@ public class DmsLoginController { /** * 获取用户信息 * +======= + * 重置密码 + */ + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping("/updatePwd") + @DataSource(DataSourceType.MASTER) + public AjaxResult updatePwd(@RequestBody Map params) + { + String oldPassword = params.get("oldPassword"); + String newPassword = params.get("newPassword"); + LoginUser loginUser = SecurityUtils.getLoginUser(); + Long userId = loginUser.getUserId(); + String userName = loginUser.getUsername(); + String password = loginUser.getPassword(); + if (!SecurityUtils.matchesPassword(oldPassword, password)) + { + return AjaxResult.error("修改密码失败，旧密码错误"); + } + if (SecurityUtils.matchesPassword(newPassword, password)) + { + return AjaxResult.error("新密码不能与旧密码相同"); + } + newPassword = SecurityUtils.encryptPassword(newPassword); + if (dmsLoginService.resetPwd(userId, userName, newPassword) > 0) + { + // 更新缓存用户密码 + loginUser.getUser().setPassword(newPassword); + tokenService.setLoginUser(loginUser); + return AjaxResult.success("操作成功"); + } + return AjaxResult.error("修改密码异常，请联系管理员"); + } + + @ApiOperation("查询公共队列") + @PostMapping("/commonQueue") + @DataSource(DataSourceType.MASTER) + public JsonResponse> queryCommonQueue(@RequestBody @Validated BaseDto dto) { + if (dto.getPageNum() > 0) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + } + return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName()))); + } + + /** + * 获取用户信息，暂时先从主库获取 +>>>>>>> new * @return 用户信息 */ - @GetMapping("getInfo") + @ApiOperation("用户信息") + @GetMapping("/getInfo") + @DataSource(DataSourceType.MASTER) public AjaxResult getInfo() { LoginUser loginUser = SecurityUtils.getLoginUser(); //获取用户从库信息 - SysUser user = sysUserService.selectUserByTenantId(loginUser.getTenantId(), loginUser.getUsername()); + DmsLoginUserVo.DmsUserVo tenantUser = dmsLoginService.selectTenantUserById(loginUser.getUserId()); + SysUser user = new SysUser(); + user.setUserId(tenantUser.getId()); + user.setUserName(tenantUser.getUserName()); + user.setNickName(tenantUser.getNickName()); + user.setTenantId(tenantUser.getTenantId()); + user.setTenantName(tenantUser.getTenantName()); + user.setTenantPhone(tenantUser.getTenantPhone()); + user.setSlaverAdmin(tenantUser.getSlaverAdmin()); //刷新token tokenService.refreshToken(loginUser); AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); - ajax.put("tenantId", loginUser.getTenantId()); - ajax.put("scoreId", loginUser.getScoreId()); return ajax; } - @PutMapping("/resetPwd") - public JsonResponse resetPwd(@RequestBody DmsLoginUserVo.DmsUserVo user) { -// webDmsLoginService.checkUserAllowed(user); -// webDmsLoginService.checkUserDataScope(user.getUserId()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - return JsonResponse.ok(dmsLoginService.resetPwd(user)); - } - + /** + * 筛查接口，此接口已添加白名单，所以不需要@annomous + * @param dto + * @return + */ @PostMapping("/queryTenantById") + @DataSource(DataSourceType.MASTER) public JsonResponse queryTenantById(@RequestBody DmsLoginUserVo.Query dto){ return JsonResponse.ok(dmsLoginService.queryById(dto.getId())); } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java index bfdaae7d..0a379a5b 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java @@ -6,18 +6,21 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONArray; import com.acupuncture.common.annotation.Anonymous; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.config.RuoYiConfig; import com.acupuncture.common.core.domain.AjaxResult; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; import com.acupuncture.common.core.redis.RedisCache; import com.acupuncture.common.core.text.Convert; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.common.exception.base.BaseException; import com.acupuncture.common.utils.file.FileUploadUtils; import com.acupuncture.common.utils.file.FileUtils; import com.acupuncture.framework.config.ServerConfig; import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; import com.acupuncture.system.domain.dto.ExternalDto; +import com.acupuncture.system.domain.po.HmsWeightHeight; import com.acupuncture.system.domain.po.UplReportImage; import com.acupuncture.system.domain.po.UplRtcfInfo; import com.acupuncture.system.domain.vo.ExternalVo; @@ -29,11 +32,17 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; @@ -61,8 +70,9 @@ public class ExternalController { @Anonymous @ApiOperation("获取人员信息") @GetMapping("/http/getUserInfo") + @DataSource(DataSourceType.MASTER) public Object test(@RequestParam("from") String from, @RequestParam("memberid") String memberid) { - log.info("获取人员信息:{},{}",from, memberid); + log.info("获取人员信息:{},{}", from, memberid); checkoutData(from); ExternalVo.Result query = externalService.query(from, memberid); if (query == null) { @@ -81,12 +91,13 @@ public class ExternalController { } //切换数据源查询 DynamicDataSourceContextHolder.setDataSourceType(dataSourceList.get(0).getDataSourceKey()); - }catch (Exception e) { + } catch (Exception e) { throw new BaseException("UUID错误:{}", from); } } +<<<<<<< HEAD private static void changeDataSource(String key) { try { DynamicDataSourceContextHolder.setDataSourceType(key); @@ -95,6 +106,8 @@ public class ExternalController { } } +======= +>>>>>>> new // @Anonymous // @ApiOperation("上传数据") // @PostMapping("/http/uploadMemberInfo") @@ -115,14 +128,14 @@ public class ExternalController { @Anonymous @ApiOperation("上传数据") @PostMapping("/http/uploadMemberInfo") - public Object add(@RequestBody String str){ - + public Object add(@RequestBody String str) { + log.info("str:{}", str); JSONArray objects = new JSONArray(str); List list = new ArrayList<>(); for (Object object : objects) { list.add(BeanUtil.copyProperties(object, ExternalDto.RtcfInfoDto.class)); } - log.info("上传数据dto123:{}",list); + log.info("上传数据dto123:{}", list); // List list = dto.getList(); int add = 0; for (ExternalDto.RtcfInfoDto rtcfInfoDto : list) { @@ -138,7 +151,7 @@ public class ExternalController { @Anonymous @ApiOperation("上传数据") @PostMapping("/http/addReportImage") - public Object addReportImage(MultipartFile image){ + public Object addReportImage(MultipartFile image) { try { //切换数据源 String str = removeExtension(image.getOriginalFilename()); @@ -164,9 +177,7 @@ public class ExternalController { reportImageDto.setMemberId(str); externalService.addReportImage(reportImageDto); return ajax; - } - catch (Exception e) - { + } catch (Exception e) { return AjaxResult.error(e.getMessage()); } } @@ -181,19 +192,64 @@ public class ExternalController { @ApiOperation("上传数据查询") @PostMapping("/http/list") - public List list(){ + public List list() { return externalService.list(); } - @ApiOperation("根据住院号/门诊号查询人体成分信息") + @ApiOperation("根据诊疗档案ID查询人体成分信息") @PostMapping("/api/http/selectByMemberId") - public JsonResponse selectByMemberId(@RequestBody @Validated ExternalDto.MemberDto dto){ - return JsonResponse.ok(externalService.selectByMemberId(dto.getMemberId())); + public JsonResponse selectByMemberId(@RequestBody @Validated ExternalDto.MemberDto dto) { + return JsonResponse.ok(externalService.selectByMemberId(dto.getId(), dto.getMemberId())); } @ApiOperation("根据住院号/门诊号查询人体成分报告") @PostMapping("/api/http/selectReportByMemberId") - public JsonResponse selectReportByMemberId(@RequestBody @Validated ExternalDto.MemberDto dto){ - return JsonResponse.ok(externalService.selectReportByMemberId(dto.getMemberId())); + public JsonResponse selectReportByMemberId(@RequestBody @Validated ExternalDto.MemberDto dto) { + return JsonResponse.ok(externalService.selectReportByMemberId(dto.getId())); } + +// @Anonymous +// @ApiOperation("身高体重仪和针灸系统的对接") +// @RequestMapping(value = "/api/http/dmh", method = {RequestMethod.GET, RequestMethod.POST}) +// public JsonResponse dmh(String str){ +// //W:066.5 H:173.5\r\n +// log.info("身高体重仪和针灸系统的对接:{}", str); +// externalService.dmh(str); +// return JsonResponse.ok(); +// } + + @Anonymous + @ApiOperation("身高体重仪和针灸系统的对接") + @RequestMapping(value = "/api/http/dmh", method = {RequestMethod.GET, RequestMethod.POST}) + public JsonResponse dmh(HttpServletRequest request) { + + StringBuffer sb = new StringBuffer(); + InputStream is = null; + String error = "error"; + try { + is = request.getInputStream(); + InputStreamReader isr = new InputStreamReader(is, "GBK"); + BufferedReader br = new BufferedReader(isr); + String s = ""; + while ((s = br.readLine()) != null) { + sb.append(s); + } + } catch (Exception e) { + e.printStackTrace(); + } + String str =sb.toString(); + log.info(str); + //W:066.5 H:173.5\r\n + log.info("身高体重仪和针灸系统的对接:{}", str); + externalService.dmh(str); + return JsonResponse.ok(); + } + + @DataSource(DataSourceType.MASTER) + @ApiOperation("查询身高体重") + @PostMapping("/api/http/getWeightHeight") + public JsonResponse getWeightHeight(@RequestBody @Validated ExternalDto.Weight dto) { + return JsonResponse.ok(externalService.getWeightHeight(dto.getWeightMachineId())); + } + } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java index ac4e67c3..3416b6ca 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java @@ -49,11 +49,10 @@ import java.util.List; @RestController @RequestMapping("/followup") public class FmsFollowupController { - @Resource - private FmsFollowupQueueService fmsFollowupQueueService; @Resource private FmsFollowupService fmsFollowupService; +<<<<<<< HEAD @ApiOperation("查询公共队列") @PostMapping("/commonQueue") @@ -66,6 +65,8 @@ public class FmsFollowupController { return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName()))); } +======= +>>>>>>> new @ApiOperation("查询随访队列") @PostMapping("/query") public JsonResponse> queryQueue(@RequestBody @Validated BaseDto dto) { diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java index 27e3a02f..8b1d27b5 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java @@ -78,4 +78,11 @@ public class PmsPatientController { return JsonResponse.ok(); } + @ApiOperation("导入患者信息") + @PostMapping("/import1") + public JsonResponse importPatient1(MultipartFile file) throws IOException{ + pmsPatientService.importPatient1(file); + return JsonResponse.ok(); + } + } diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java index b24434a1..e0c25c9a 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java @@ -41,11 +41,6 @@ import java.util.List; public class ScreeningController { @Resource private IScreeningService screeningService; - @Resource - private DmsTenantMapper dmsTenantMapper; - - @Resource - private UmsDataSourceMapper umsDataSourceMapper; @ApiOperation(value = "查询筛查列表", notes = "原:查询医院是否填写了调查筛查") @RequestMapping(value = "/queryDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -57,6 +52,17 @@ public class ScreeningController { return JsonResponse.ok(screeningService.queryDetailByPage(param.getParam(), param.getPageNum(), param.getPageSize())); } + @ApiOperation(value = "查询筛查列表", notes = "原:查询医院是否填写了调查筛查") + @RequestMapping(value = "/queryDetailNoToken", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryDetailNoToken(@ApiParam @Validated @RequestBody BaseDto param) { + log.info("查询筛查列表"); + if (param.getPageNum() > 0) { + PageHelper.startPage(param.getPageNum(), param.getPageSize()); + } + return JsonResponse.ok(screeningService.queryDetailByPageNoToken(param.getParam(), param.getPageNum(), param.getPageSize())); + } + + @ApiOperation(value = "后台查询筛查列表", notes = "原:查询医院是否填写了调查筛查") @RequestMapping(value = "/admin/queryDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> adminQueryDetail(@ApiParam @Validated @RequestBody BaseDto param) { @@ -87,6 +93,7 @@ public class ScreeningController { return JsonResponse.ok(detailInfo); } +<<<<<<< HEAD private void changeDataSource(Long tenantId) { DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(tenantId); if (dmsTenant != null) { @@ -101,6 +108,8 @@ public class ScreeningController { } } +======= +>>>>>>> new @ApiOperation(value = "提交筛查", notes = "") @RequestMapping(value = "/submit", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse submitQuestionnaire(@ApiParam @Validated @RequestBody BaseDto params) throws Exception { diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/TaskController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/TaskController.java deleted file mode 100644 index 1a08d188..00000000 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/TaskController.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.acupuncture.web.controller.web; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import com.acupuncture.common.annotation.Anonymous; -import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; -import com.acupuncture.system.domain.po.FmsFollowupTask; -import com.acupuncture.system.domain.po.FmsPatientQueueRelation; -import com.acupuncture.system.domain.vo.FmsFollowupVo; -import com.acupuncture.system.domain.vo.UmsDataSourceVo; -import com.acupuncture.system.persist.dao.FmsFollowupDao; -import com.acupuncture.system.persist.dao.UmsDataSourceDao; -import com.acupuncture.system.persist.mapper.FmsFollowupTaskMapper; -import com.acupuncture.system.persist.mapper.FmsPatientQueueRelationMapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.quartz.TriggerUtils; -import org.quartz.impl.triggers.CronTriggerImpl; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -/** - * @Author zzc - * @Package com.acupuncture.web.controller.web - * @Date 2025/2/13 8:50 - * @description: - */ -@Slf4j -@Api(tags = "定时任务相关") -@RestController -@RequestMapping("/task") -@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) -public class TaskController { - - @Resource - private FmsFollowupDao fmsFollowupDao; - @Resource - private FmsFollowupTaskMapper fmsFollowupTaskMapper; - @Resource - private UmsDataSourceDao umsDataSourceDao; - @Resource - private FmsPatientQueueRelationMapper fmsPatientQueueRelationMapper; - - @ApiOperation("定时任务添加随访工单") - @PostMapping("/task") -// @Scheduled(fixedRate = 10000) - @Anonymous - public void task() { - // TODO 生成工单第一次生成之后2周的，往后只生成之后一周。第一次随访时间： （ 患者的出院时间 - 7 + 轮次时间） 到 （患者的出院时间 + 7 + 轮次时间 ） - - //查询租户，根据租户循环切换数据源，定时处理所有医院的随访工单 -// UmsDataSourceVo.Result result1 = new UmsDataSourceVo.Result(); -// result1.setDataSourceKey("MASTER"); -// changeDataSource(result1); - List query = umsDataSourceDao.query(null); - if (CollectionUtil.isEmpty(query)) { - return; - } - //查询公共队列 - List queueResults = fmsFollowupDao.queryCommonQueue(null); - //切换数据源 - for (UmsDataSourceVo.Result result : query) { - if ("MASTER".equals(result.getDataSourceKey())) { - continue; - } - changeDataSource(result); - { - //获取随访患者列表，根据患者出院日时间和队列添加工单 - //1. 查询队列 - List queueList = fmsFollowupDao.selectQueueList(null, null, null, result.getTenantId()); - - if (CollectionUtil.isEmpty(queueList)) { - queueList = queueResults; - } else { - queueList.addAll(queueResults); - } - for (FmsFollowupVo.FollowupQueueVO followupQueueVO : queueList) { - //2. 查询队列随访患者列表 - List patientList = fmsFollowupDao.queryPatient(followupQueueVO.getId(), (byte) 0, null, followupQueueVO.getTenantId()); - if (CollectionUtil.isEmpty(patientList)) { - continue; - } - //随访总月数 - Integer followupMonth = followupQueueVO.getFollowupMonth(); - for (FmsFollowupVo.FollowupPatient followupPatient : patientList) { - //获取随访到期时间 出院时间+随访总月数 = 到期时间 - Calendar calendar = Calendar.getInstance(); - calendar.setTime(followupPatient.getDischargeTime()); - calendar.set(Calendar.MONTH, followupMonth); - Date time = calendar.getTime(); - - //获取队列信息 - String frequency = followupQueueVO.getFrequency(); - List dateList = new ArrayList<>(); - try { - CronTriggerImpl cronTrigger = new CronTriggerImpl(); - cronTrigger.setCronExpression(frequency); - //TriggerUtils.computeFireTimesBetween(要计算触发时间的触发器对象, 用于计算触发时间的日历对象, 计算触发时间的起始时间点, 计算触发时间的结束时间点); - dateList = TriggerUtils.computeFireTimesBetween(cronTrigger, null, followupPatient.getDischargeTime(), time); - if (CollectionUtil.isEmpty(dateList)) { - continue; - } - } catch (Exception e) { - e.printStackTrace(); - } - //3. 判断随访类型 - if (followupQueueVO.getFollowupType() == 0) { - //单次 - FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); - BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); - fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); - fmsFollowupTask.setName(followupPatient.getName()); - fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); - fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); - fmsFollowupTask.setGender(followupPatient.getGender()); - if (followupPatient.getBirthDate() != null) { - fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); - } - fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); - fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); - fmsFollowupTask.setPhone(followupPatient.getPhone()); - fmsFollowupTask.setTenantId(followupPatient.getTenantId()); - fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); - fmsFollowupTask.setIdCard(followupPatient.getIdCard()); - fmsFollowupTask.setTimes(1); - fmsFollowupTask.setQueueId(followupQueueVO.getId()); - fmsFollowupTask.setPatientId(followupPatient.getId()); - fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); - fmsFollowupTask.setDelFlag((byte) 0); - fmsFollowupTask.setCreateTime(new Date()); - fmsFollowupTask.setStatus((byte) 0); - fmsFollowupTask.setStartTime(dateList.get(0)); - fmsFollowupTask.setEndTime(dateList.get(0)); - fmsFollowupTask.setFollowuper(followupQueueVO.getPersonInCharge()); - fmsFollowupTask.setFollowupTime(dateList.get(0)); - changeDataSource(result); - fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); - - } else { - //周期 - //4. 根据频次和总月数添加 - int i = 0; - for (Date date : dateList) { - i+=1; - //单次 - FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); - BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); - fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); - fmsFollowupTask.setName(followupPatient.getName()); - fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); - fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); - fmsFollowupTask.setGender(followupPatient.getGender()); - if (followupPatient.getBirthDate() != null) { - fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); - } - fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); - fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); - fmsFollowupTask.setTimes(i); - fmsFollowupTask.setPhone(followupPatient.getPhone()); - fmsFollowupTask.setTenantId(followupPatient.getTenantId()); - fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); - fmsFollowupTask.setIdCard(followupPatient.getIdCard()); - fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); - fmsFollowupTask.setQueueId(followupQueueVO.getId()); - fmsFollowupTask.setDelFlag((byte) 0); - fmsFollowupTask.setCreateTime(new Date()); - fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); - fmsFollowupTask.setStatus((byte) 0); - fmsFollowupTask.setStartTime(date); - fmsFollowupTask.setEndTime(date); - fmsFollowupTask.setFollowuper(followupQueueVO.getPersonInCharge()); - fmsFollowupTask.setFollowupTime(date); - changeDataSource(result); - fmsFollowupTask.setPatientId(followupPatient.getId()); - fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); - } - } - changeDataSource(result); - //将患者设置为已生成工单 - FmsPatientQueueRelation fmsPatientQueueRelation = BeanUtil.copyProperties(followupPatient, FmsPatientQueueRelation.class); - fmsPatientQueueRelation.setTaskFlag((byte) 1); - fmsPatientQueueRelation.setPatientId(followupPatient.getId()); - fmsPatientQueueRelationMapper.updateByPrimaryKeySelective(fmsPatientQueueRelation); - } - } - - } - } - } - - private static void changeDataSource(UmsDataSourceVo.Result result) { - try { - DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); - }finally { - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } -} diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java index f2d2dc90..a053d9f4 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java @@ -1,7 +1,5 @@ package com.acupuncture.web.controller.web; -import cn.hutool.core.bean.BeanUtil; -import com.acupuncture.common.annotation.Anonymous; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; import com.acupuncture.system.domain.dto.AmsWxQrCodeDto; diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ZytzController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ZytzController.java new file mode 100644 index 00000000..033563c5 --- /dev/null +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ZytzController.java @@ -0,0 +1,87 @@ +package com.acupuncture.web.controller.web; + +import com.acupuncture.common.annotation.Anonymous; +import com.acupuncture.common.core.domain.BaseDto; +import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.common.exception.base.BaseException; +import com.acupuncture.common.utils.SecurityUtils; +import com.acupuncture.system.domain.dto.PmsTreatmentDto; +import com.acupuncture.system.domain.dto.ZytzDto; +import com.acupuncture.system.domain.vo.ZytzVo; +import com.acupuncture.system.service.ZytzService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author zhangsan + * @description + * @date 2025/4/6 18:37 + */ + +@Slf4j +@Api(tags = "中医体质测评相关") +@RestController +@RequestMapping("/zytz") +public class ZytzController { + @Resource + private ZytzService zytzService; + + @ApiOperation("生成中医体质辨识二维码") + @PostMapping("/qrcode") + public JsonResponse getZytzQrcode(@RequestBody @Validated BaseDto dto){ + Long tenantId = SecurityUtils.getTenantId(); + if(tenantId == null){ + throw new BaseException("未找到tenantId"); + } + return JsonResponse.ok(zytzService.getZytzQrcode(dto.getParam(), tenantId)); + } + + /** + * 查询测评题目及选项 + */ + @Anonymous + @PostMapping("/questions/list") + public JsonResponse evaQuestionList(@Validated @RequestBody BaseDto dto) { + return JsonResponse.ok(zytzService.evaQuestionList(dto.getParam())); + } + + /** + * 提交测评 + */ + @Anonymous + @PostMapping("/questions/submit") + public JsonResponse evaQuestionSubmit(@Validated @RequestBody BaseDto dto) { + return JsonResponse.ok(zytzService.evaQuestionSubmit(dto.getParam())); + } + + /** + * 完成测评（生成报告单） + * @param dto + * @return + */ + @Anonymous + @PostMapping("/eva/complete") + public JsonResponse evaComplete(@Validated @RequestBody BaseDto dto) { + return JsonResponse.ok(zytzService.evaComplete(dto.getParam())); + } + + /** + * 查看报告单 + * @param dto + * @return + */ + @Anonymous + @PostMapping("/report/view") + public JsonResponse reportView(@Validated @RequestBody BaseDto dto) { + return JsonResponse.ok(zytzService.reportView(dto.getParam())); + } + +} diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java index b97f7b35..5136b864 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java @@ -1,3 +1,4 @@ +<<<<<<< HEAD //package com.acupuncture.web.controller.web; // //import cn.hutool.core.bean.BeanUtil; @@ -341,6 +342,8 @@ // private Integer index; // } //} +======= +>>>>>>> new package com.acupuncture.web.task; import cn.hutool.core.bean.BeanUtil; @@ -349,7 +352,9 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.acupuncture.common.annotation.Anonymous; +import com.acupuncture.common.annotation.DataSource; import com.acupuncture.common.core.redis.RedisCache; +import com.acupuncture.common.enums.DataSourceType; import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; import com.acupuncture.system.domain.dto.FmsFollowupDto; import com.acupuncture.system.domain.po.FmsFollowupTask; @@ -391,7 +396,7 @@ import java.util.stream.Collectors; @Api(tags = "定时任务相关") @RestController @RequestMapping("/task") -@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +//@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) public class TaskController { @Resource @@ -419,199 +424,165 @@ public class TaskController { //查询从库队列 //1. 查询队列 List slavelQueueList = fmsFollowupDao.selectQueueList(null, null, null, null); - - //合并公共队列和从库的队列 + log.info("sa:{}", slavelQueueList); +// //合并公共队列和从库的队列 slavelQueueList.addAll(commonQueue); //查询每个队列的对象 - for (FmsFollowupVo.FollowupQueueVO queue : slavelQueueList) { + for (FmsFollowupVo.FollowupQueueVO followupQueueVO : slavelQueueList) { FmsFollowupDto.FollowupPatientQueryDTO followupPatientQueryDTO = new FmsFollowupDto.FollowupPatientQueryDTO(); - followupPatientQueryDTO.setQueueId(queue.getId()); - followupPatientQueryDTO.setTenantId(queue.getTenantId()); + followupPatientQueryDTO.setQueueId(followupQueueVO.getId()); + followupPatientQueryDTO.setTenantId(followupQueueVO.getTenantId()); List patientList = fmsFollowupService.queryPatient(followupPatientQueryDTO); log.info("查询每个队列的对象:{}", patientList); - } + if (CollectionUtil.isEmpty(patientList)) { + continue; + } + Integer followWindowAdys = followupQueueVO.getFollowWindowAdys(); + //随访总月数 + Integer followupMonth = followupQueueVO.getFollowupMonth(); + for (FmsFollowupVo.FollowupPatient followupPatient : patientList) { + //获取随访到期时间 出院时间+随访总月数 = 到期时间 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(followupPatient.getDischargeTime()); + calendar.set(Calendar.MONTH, followupMonth); + Date time = calendar.getTime(); - //定时任务 + //获取队列信息 + String frequency = followupQueueVO.getFrequency(); + List dateList = new ArrayList<>(); + try { + CronTriggerImpl cronTrigger = new CronTriggerImpl(); + cronTrigger.setCronExpression(frequency); + //TriggerUtils.computeFireTimesBetween(要计算触发时间的触发器对象, 用于计算触发时间的日历对象, 计算触发时间的起始时间点, 计算触发时间的结束时间点); + dateList = TriggerUtils.computeFireTimesBetween(cronTrigger, null, followupPatient.getDischargeTime(), time); + if (CollectionUtil.isEmpty(dateList)) { + continue; + } + } catch (Exception e) { + e.printStackTrace(); + }finally { + if (CollectionUtil.isEmpty(dateList)) { + continue; + } + } + //3. 判断随访类型 + if (followupQueueVO.getFollowupType() == 0) { + //单次 -// //循环租户 -// for (UmsDataSourceVo.Result tenant : tenantList) { -// if ("MASTER".equals(tenant.getDataSourceKey())) { -// continue; -// } -// changeDataSource(tenant); -// { -// //获取随访患者列表，根据患者出院日时间和队列添加工单 -// //1. 查询队列 -// List queueList = fmsFollowupDao.selectQueueList(null, null, null, null); -// -// if (CollectionUtil.isEmpty(queueList)) { -// queueList = followupQueueVOS; -// } else { -// if (CollectionUtil.isEmpty(followupQueueVOS)) { -// queueList.addAll(followupQueueVOS); -// } -// } -// for (FmsFollowupVo.FollowupQueueVO followupQueueVO : queueList) { -// Integer followWindowAdys = followupQueueVO.getFollowWindowAdys(); -// -// //2. 查询队列随访患者列表 -//// changeDataSource(result); -// FmsFollowupDto.FollowupPatientQueryDTO followupPatientQueryDTO = new FmsFollowupDto.FollowupPatientQueryDTO(); -// followupPatientQueryDTO.setQueueId(followupQueueVO.getId()); -// followupPatientQueryDTO.setTenantId(followupQueueVO.getTenantId()); -// changeDataSource(result); -// -// List patientList = fmsFollowupService.queryPatient(followupPatientQueryDTO); -//// List patientList = fmsFollowupDao.queryPatient(followupQueueVO.getId(), null, null); -// if (CollectionUtil.isEmpty(patientList)) { -// continue; -// } -// //随访总月数 -// Integer followupMonth = followupQueueVO.getFollowupMonth(); -// for (FmsFollowupVo.FollowupPatient followupPatient : patientList) { -// //获取随访到期时间 出院时间+随访总月数 = 到期时间 -// Calendar calendar = Calendar.getInstance(); -// calendar.setTime(followupPatient.getDischargeTime()); -// calendar.set(Calendar.MONTH, followupMonth); -// Date time = calendar.getTime(); -// -// //获取队列信息 -// String frequency = followupQueueVO.getFrequency(); -// List dateList = new ArrayList<>(); -// try { -// CronTriggerImpl cronTrigger = new CronTriggerImpl(); -// cronTrigger.setCronExpression(frequency); -// //TriggerUtils.computeFireTimesBetween(要计算触发时间的触发器对象, 用于计算触发时间的日历对象, 计算触发时间的起始时间点, 计算触发时间的结束时间点); -// dateList = TriggerUtils.computeFireTimesBetween(cronTrigger, null, followupPatient.getDischargeTime(), time); -// if (CollectionUtil.isEmpty(dateList)) { -// continue; -// } -// } catch (Exception e) { -// e.printStackTrace(); -// } -// //3. 判断随访类型 -// if (followupQueueVO.getFollowupType() == 0) { -// //单次 -// -// //判断是否已有该次随访 -// FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); -// fmsFollowupTaskExample.createCriteria().andTimesEqualTo(1).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); -// List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); -// if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { -// continue; -// } -// FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); -// BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); -// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); -// fmsFollowupTask.setName(followupPatient.getName()); -// fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); -// fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); -// fmsFollowupTask.setGender(followupPatient.getGender()); -// if (followupPatient.getBirthDate() != null) { -// fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); -// } -// fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); -// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); -// fmsFollowupTask.setPhone(followupPatient.getPhone()); -// fmsFollowupTask.setTenantId(followupPatient.getTenantId()); -// fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); -// fmsFollowupTask.setIdCard(followupPatient.getIdCard()); -// fmsFollowupTask.setTimes(1); -// fmsFollowupTask.setQueueId(followupQueueVO.getId()); -// fmsFollowupTask.setPatientId(followupPatient.getId()); -// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); -// fmsFollowupTask.setDelFlag((byte) 0); -// fmsFollowupTask.setCreateTime(new Date()); -// fmsFollowupTask.setStatus((byte) 0); -// -// //计算第一次随访的时间 -// DateComparator dateComparator = getDate(dateList); -// if (dateComparator.getDate() != null) { -// fmsFollowupTask.setStartTime(dateComparator.getDate()); -// } else { -// Calendar instance = Calendar.getInstance(); -// instance.setTime(dateList.get(0)); -// instance.add(Calendar.DATE, -followWindowAdys / 2); -// fmsFollowupTask.setStartTime(instance.getTime()); -// } -// Calendar instance1 = Calendar.getInstance(); -// instance1.setTime(dateList.get(0)); -// instance1.add(Calendar.DATE, followWindowAdys / 2); -// fmsFollowupTask.setEndTime(instance1.getTime()); -// fmsFollowupTask.setFollowuper(followupQueueVO.getPersonInCharge()); -// fmsFollowupTask.setFollowupTime(dateList.get(0)); -// changeDataSource(result); -// fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); -// -// } else { -// //周期 -// //4. 根据频次和总月数添加 -// DateComparator dateComparator = getDate(dateList); -// if (dateComparator.getDate() == null || dateComparator.getIndex() == null) { -// continue; -// } -// Date date = dateComparator.getDate(); -// Integer index = dateComparator.getIndex(); -// -// //判断是否已有该次随访 -// FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); -// fmsFollowupTaskExample.createCriteria().andTimesEqualTo(index).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); -// List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); -// if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { -// continue; -// } -// -// FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); -// BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); -// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); -// fmsFollowupTask.setName(followupPatient.getName()); -// fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); -// fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); -// fmsFollowupTask.setGender(followupPatient.getGender()); -// if (followupPatient.getBirthDate() != null) { -// fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); -// } -// fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); -// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); -// fmsFollowupTask.setTimes(index); -// fmsFollowupTask.setPhone(followupPatient.getPhone()); -// fmsFollowupTask.setTenantId(followupPatient.getTenantId()); -// fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); -// fmsFollowupTask.setIdCard(followupPatient.getIdCard()); -// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); -// fmsFollowupTask.setQueueId(followupQueueVO.getId()); -// fmsFollowupTask.setDelFlag((byte) 0); -// fmsFollowupTask.setCreateTime(new Date()); -// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); -// fmsFollowupTask.setStatus((byte) 0); -// -// fmsFollowupTask.setStartTime(date); -// Calendar instance = Calendar.getInstance(); -// instance.setTime(date); -// instance.add(Calendar.DATE, followWindowAdys / 2); -// -// fmsFollowupTask.setEndTime(instance.getTime()); -// changeDataSource(result); -// fmsFollowupTask.setPatientId(followupPatient.getId()); -// fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); -// } -// } -// } -// -// } -// } + //判断是否已有该次随访 + FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); + fmsFollowupTaskExample.createCriteria().andTimesEqualTo(1).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); + List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); + if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { + continue; + } + FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); + BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); + fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); + fmsFollowupTask.setName(followupPatient.getName()); + fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); + fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); + fmsFollowupTask.setGender(followupPatient.getGender()); + if (followupPatient.getBirthDate() != null) { + fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); + } + fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); + fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); + fmsFollowupTask.setPhone(followupPatient.getPhone()); + fmsFollowupTask.setTenantId(followupPatient.getTenantId()); + fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); + fmsFollowupTask.setIdCard(followupPatient.getIdCard()); + fmsFollowupTask.setTimes(1); + fmsFollowupTask.setQueueId(followupQueueVO.getId()); + fmsFollowupTask.setPatientId(followupPatient.getId()); + fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); + fmsFollowupTask.setDelFlag((byte) 0); + fmsFollowupTask.setCreateTime(new Date()); + fmsFollowupTask.setStatus((byte) 0); + + //计算第一次随访的时间 + DateComparator dateComparator = getDate(dateList); + if (dateComparator.getDate() != null) { + fmsFollowupTask.setStartTime(dateComparator.getDate()); + } else { + Calendar instance = Calendar.getInstance(); + instance.setTime(dateList.get(0)); + instance.add(Calendar.DATE, -followWindowAdys / 2); + fmsFollowupTask.setStartTime(instance.getTime()); + } + Calendar instance1 = Calendar.getInstance(); + instance1.setTime(dateList.get(0)); + instance1.add(Calendar.DATE, followWindowAdys / 2); + fmsFollowupTask.setEndTime(instance1.getTime()); + fmsFollowupTask.setFollowuper(followupQueueVO.getPersonInCharge()); + fmsFollowupTask.setFollowupTime(dateList.get(0)); + fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); + } else { + //周期 + //4. 根据频次和总月数添加 + DateComparator dateComparator = getDate(dateList); + if (dateComparator.getDate() == null || dateComparator.getIndex() == null) { + continue; + } + Date date = dateComparator.getDate(); + Integer index = dateComparator.getIndex(); + + //判断是否已有该次随访 + FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); + fmsFollowupTaskExample.createCriteria().andTimesEqualTo(index).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); + List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); + if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { + continue; + } + + FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); + BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); + fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); + fmsFollowupTask.setName(followupPatient.getName()); + fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); + fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); + fmsFollowupTask.setGender(followupPatient.getGender()); + if (followupPatient.getBirthDate() != null) { + fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); + } + fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); + fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); + fmsFollowupTask.setTimes(index); + fmsFollowupTask.setPhone(followupPatient.getPhone()); + fmsFollowupTask.setTenantId(followupPatient.getTenantId()); + fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); + fmsFollowupTask.setIdCard(followupPatient.getIdCard()); + fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); + fmsFollowupTask.setQueueId(followupQueueVO.getId()); + fmsFollowupTask.setDelFlag((byte) 0); + fmsFollowupTask.setCreateTime(new Date()); + fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); + fmsFollowupTask.setStatus((byte) 0); + + fmsFollowupTask.setStartTime(date); + Calendar instance = Calendar.getInstance(); + instance.setTime(date); + instance.add(Calendar.DATE, followWindowAdys / 2); + + fmsFollowupTask.setEndTime(instance.getTime()); + fmsFollowupTask.setPatientId(followupPatient.getId()); + fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); + } + } + } } + @DataSource(DataSourceType.MASTER) @ApiOperation("定时任务添加随访工单") @PostMapping("/task") - @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(cron = "0 0 0 * * 1") @Anonymous public void task() { // TODO 生成工单第一次生成之后2周的，往后只生成之后一周。第一次随访时间： （ 患者的出院时间 - 7 + 轮次时间） 到 （患者的出院时间 + 7 + 轮次时间 ） //查询租户，根据租户循环切换数据源，定时处理所有医院的随访工单 - List tenantList = umsDataSourceDao.query(null); + List tenantList = umsDataSourceDao.query1(null); if (CollectionUtil.isEmpty(tenantList)) { return; } @@ -636,10 +607,6 @@ public class TaskController { } - private static void changeDataSource(UmsDataSourceVo.Result result) { - DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); - } - /** * 法用于计算在指定时间范围内触发器的触发时间点。具体步骤如下： * 初始化一个空列表 lst 存储触发时间点。 diff --git a/acupuncture-admin/src/main/resources/TreamtmentPgTemplate.docx b/acupuncture-admin/src/main/resources/TreamtmentPgTemplate.docx index e370ede7..5301bbe0 100644 --- a/acupuncture-admin/src/main/resources/TreamtmentPgTemplate.docx +++ b/acupuncture-admin/src/main/resources/TreamtmentPgTemplate.docx @@ -1,18 +1,14 @@ -------------------------------------------------------------------------------- {{h_name}}评估报告 - 基本信息 姓名：{{name}} 性别：{{sex}} 年龄：{{age}} 编号：{{visitNum}} 责任医生：{{doctor}} -检查日期：{{visitTime}} - +检查日期：{{report_date}} 主要诊断 {{Clinical_diagnosis}} - - 病情评估 -------------------------------------------------------------------------------- {{?rtcf_flag}} @@ -81,15 +77,10 @@ 2 焦虑自评(SAS) {{score8}} - {{/jlpg_flag}} - - - - 测评人： 审核人： 报告日期：{{report_date}} diff --git a/acupuncture-admin/src/main/resources/application-dev.yml b/acupuncture-admin/src/main/resources/application-dev.yml index a020b54a..1b9c6176 100644 --- a/acupuncture-admin/src/main/resources/application-dev.yml +++ b/acupuncture-admin/src/main/resources/application-dev.yml @@ -66,4 +66,4 @@ file: wxQrCodeTemplate: /home/acupuncture/server/profile/wxQrCodeTemplate.docx screenQrCodeTemplate: /home/acupuncture/server/profile/screenQrCodeTemplate.docx hbTemplate: /home/acupuncture/server/profile/screenHbQrCodeTemplate.docx - screenPath: http://test.tall.wiki/acupuncture/web-admin/screening/H5?hospitalId=hosId&hospitalName=hosName¢erId=cId \ No newline at end of file + screenPath: http://test.tall.wiki/acupuncture/web-admin/screening/H5?hospitalId=hosId&hospitalName=hosName¢erId=cId diff --git a/acupuncture-admin/src/main/resources/application-prod.yml b/acupuncture-admin/src/main/resources/application-prod.yml index df8ba8d3..f7db2c08 100644 --- a/acupuncture-admin/src/main/resources/application-prod.yml +++ b/acupuncture-admin/src/main/resources/application-prod.yml @@ -90,3 +90,4 @@ file: screenPath: http://test.tall.wiki/acupuncture/web-admin/screening/H5?hospitalId=hosId&hospitalName=hosName¢erId=cId pgTemplate: /home/acupuncture/server/profile/TreamtmentPgTemplate.docx jmrsUrl: /home/acupuncture/server/profile/uploads/jmrsTemplate.docx + diff --git a/acupuncture-admin/src/main/resources/application.yml b/acupuncture-admin/src/main/resources/application.yml index 7a586722..40a39b86 100644 --- a/acupuncture-admin/src/main/resources/application.yml +++ b/acupuncture-admin/src/main/resources/application.yml @@ -48,6 +48,11 @@ user: # Spring配置 spring: + jpa: + show-sql: true + properties: + hibernate: + format_sql: true # 资源信息 messages: # 国际化资源文件路径 diff --git a/acupuncture-common/src/main/java/com/acupuncture/common/config/RuoYiConfig.java b/acupuncture-common/src/main/java/com/acupuncture/common/config/RuoYiConfig.java index 9509d51d..468ec2b8 100644 --- a/acupuncture-common/src/main/java/com/acupuncture/common/config/RuoYiConfig.java +++ b/acupuncture-common/src/main/java/com/acupuncture/common/config/RuoYiConfig.java @@ -24,6 +24,9 @@ public class RuoYiConfig /** 上传路径 */ private static String profile; + /** 资源路径 */ + private static String profileUrl; + /** 获取地址开关 */ private static boolean addressEnabled; @@ -70,6 +73,16 @@ public class RuoYiConfig RuoYiConfig.profile = profile; } + public static String getProfileUrl() + { + return profileUrl; + } + + public void setProfileUrl(String profileUrl) + { + RuoYiConfig.profileUrl = profileUrl; + } + public static boolean isAddressEnabled() { return addressEnabled; @@ -119,4 +132,17 @@ public class RuoYiConfig { return getProfile() + "/upload"; } + + /** + * 获取中医体质二维码存放路径 + */ + public static String getZytzQrcodePath() + { + return getProfile() + "/zytz"; + } + + public static String getZytzQrcodeUrl() + { + return getProfileUrl() + "/zytz"; + } } diff --git a/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java b/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java index bd8bafcf..c08cf8a3 100644 --- a/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java +++ b/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java @@ -100,6 +100,10 @@ public class SysUser extends BaseEntity @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") private Byte slaverAdmin; +<<<<<<< HEAD +======= + +>>>>>>> new public SysUser() { diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java index b7e356b0..62d3c566 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java @@ -37,8 +37,6 @@ import javax.servlet.http.HttpServletRequest; public class AdminGlobalDataSourceAspect { protected Logger logger = LoggerFactory.getLogger(getClass()); - // @Autowired -// private UmsDataSourceMapper umsDataSourceMapper; @Resource private DmsLoginService dmsLoginService; @@ -51,10 +49,14 @@ public class AdminGlobalDataSourceAspect { @Around("dsPointCut()") public Object around(ProceedingJoinPoint point) throws Throwable { - String dataSourceKey = getDataSource(point); - - if (StringUtils.isNotNull(dataSourceKey)) { - DataSourceManager.setDataSourceKey(dataSourceKey); + //获取datasource + try { + String dataSourceKey = getDataSource(point); + if (StringUtils.isNotEmpty(dataSourceKey)) { + DataSourceManager.setDataSourceKey(dataSourceKey); + } + }catch (Exception e){ + throw new BaseException(StrUtil.format("获取数据源错误：{}", e)); } try { @@ -70,6 +72,7 @@ public class AdminGlobalDataSourceAspect { */ public String getDataSource(ProceedingJoinPoint point) { // 获取请求携带的令牌 +<<<<<<< HEAD ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); HttpServletRequest request; @@ -80,30 +83,36 @@ public class AdminGlobalDataSourceAspect { request = requestAttributes.getRequest(); //token为空 Long tenantId; +======= + HttpServletRequest request = ((ServletRequestAttributes) + RequestContextHolder.getRequestAttributes()).getRequest(); + Long tenantId = null; +>>>>>>> new String header = request.getHeader(UserConstants.DEPT); if(StrUtil.isNotEmpty(header)){ tenantId = Long.parseLong(header); }else { - String authHeader = request.getHeader(UserConstants.HEADER_KEY_TOKEN); - if (StrUtil.isEmpty(authHeader)) { - return null; - } - tenantId = SecurityUtils.getTenantId(); - if (tenantId == null) { - return null; + if (StrUtil.isNotEmpty(request.getHeader(UserConstants.HEADER_KEY_TOKEN))) { + tenantId = SecurityUtils.getTenantId(); } } +<<<<<<< HEAD //设置所属医院和数据源l // LoginUser loginUser = SecurityUtils.getLoginUser(); // if(ObjectUtil.isNull(loginUser) || loginUser.getUser().isAdmin()){ // return null; // } +======= +>>>>>>> new //根据组织ID查询数据源 - UmsDataSource dataSource = dmsLoginService.getDataSourceByTenantId(tenantId); - if (dataSource == null) { - throw new BaseException(DATASOURCE_NOT_FOUND); + if(tenantId !=null) { + UmsDataSource dataSource = dmsLoginService.getDataSourceByTenantId(tenantId); + if (dataSource == null) { + throw new BaseException(DATASOURCE_NOT_FOUND); + } + return dataSource.getDataSourceKey(); } - return dataSource.getDataSourceKey(); + return null; } } diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/DataSourceAspect.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/DataSourceAspect.java index df745c47..1ef9e3fd 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/DataSourceAspect.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/DataSourceAspect.java @@ -28,8 +28,7 @@ public class DataSourceAspect protected Logger logger = LoggerFactory.getLogger(getClass()); @Pointcut("@annotation(com.acupuncture.common.annotation.DataSource)" - + "|| @within(com.acupuncture.common.annotation.DataSource)" + - "|| within(com.acupuncture.web.task.TaskController)") + + "|| @within(com.acupuncture.common.annotation.DataSource)") public void dsPointCut() { diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java index 8bc43fea..9828c552 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java @@ -114,7 +114,11 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 +<<<<<<< HEAD requests.antMatchers("/login", "/register", "/captchaImage", "/web/login", "/web/queryTenantById", "/api/http/getUserInfo", "/api/http/addReportImage", "/api/http/uploadMemberInfo", "/task/task", "/loginSimple").permitAll() +======= + requests.antMatchers("/login", "/register", "/captchaImage", "/web/login", "/web/queryTenantById", "/api/http/getUserInfo", "/api/http/addReportImage", "/api/http/uploadMemberInfo", "/task/task", "/loginSimple", "/screening/queryDetailNoToken").permitAll() +>>>>>>> new // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/static/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysLoginService.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysLoginService.java index 097e82ac..cb8a9bb7 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysLoginService.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysLoginService.java @@ -147,7 +147,10 @@ public class SysLoginService // 生成token return tokenService.createToken(loginUser); } +<<<<<<< HEAD +======= +>>>>>>> new /** * 登录验证 * diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java index 93dc3214..7a028599 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java @@ -100,6 +100,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { SysUser sysUser = new SysUser(); sysUser.setUserName(user.getUsername()); + sysUser.setPassword(user.getPassword()); sysUser.setUserId(user.getDmsUserId()); return new LoginUser(user.getDmsUserId(), user.getHospitalId(), sysUser, CollUtil.newHashSet(), user.getTenantId() ,user.getScoreId()); } diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java index b1817e21..1e98f6fd 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java @@ -62,7 +62,7 @@ public class WebDmsLoginService public String login(String username, String password, String code, String uuid) { // 验证码校验 - validateCaptcha(username, code, uuid); +// validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username, password); // 用户验证 diff --git a/acupuncture-generator/src/main/resources/mbg.xml b/acupuncture-generator/src/main/resources/mbg.xml index 7ab9460b..00d18bdc 100644 --- a/acupuncture-generator/src/main/resources/mbg.xml +++ b/acupuncture-generator/src/main/resources/mbg.xml @@ -20,7 +20,7 @@ @@ -57,20 +57,31 @@ - -
-
-
-
-
-
-
+ + + + + + + + - + + + + + + + + + + + - +
+ diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java index 0febe91e..db73c149 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java @@ -5,7 +5,10 @@ import com.acupuncture.system.domain.po.DmsUser; import com.acupuncture.system.service.AdminTenantUserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -18,7 +21,7 @@ public class AdminTenantUserDto { @Data public static class AddDto { - private Integer id; + private Long id; private Long tenantId; @@ -37,17 +40,17 @@ public class AdminTenantUserDto { private String status; private String contactPhone; +<<<<<<< HEAD +======= + +>>>>>>> new @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") - private Byte slaverAdmin; -// -// public Long getTenantId() { -// return SecurityUtils.getTenantId(); -// } + private Byte slaverAdmin = 0; } @Data public static class UpdDto { - private Integer id; + private Long id; private Long tenantId; @@ -64,20 +67,31 @@ public class AdminTenantUserDto { private String status; private String contactPhone; +<<<<<<< HEAD +======= + +>>>>>>> new @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") private Byte slaverAdmin; } @Data public static class DeleteDto { - private List idList; + private List idList; } @Data public static class Query { private Long tenantId; - private String tenantName; } + @Data + public static class ResetPwd { + @NotNull + private Long id; + @NotBlank + @Length(min = 6, max = 20) + private String password; + } } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ExternalDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ExternalDto.java index 45c63fa4..78a45641 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ExternalDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ExternalDto.java @@ -24,8 +24,14 @@ public class ExternalDto { @Data public static class MemberDto{ - @NotNull +// @NotNull private String memberId; + private Long id; + } + + @Data + public static class Weight{ + private String weightMachineId; } @Data diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/FmsFollowupDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/FmsFollowupDto.java index a9edf086..a2fc4d44 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/FmsFollowupDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/FmsFollowupDto.java @@ -127,6 +127,8 @@ public class FmsFollowupDto { @ApiModelProperty("0 无队列") private Integer haveQueue; private Long tenantId; + private String phone; + private String name; private String dataScore; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java index b32278eb..fca1a0e8 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java @@ -59,7 +59,8 @@ public class PmsPatientDto { private String idCard; private Byte source; - + private String weight; + private String height; private List currentIllnessHistory; private String currentIllnessHistoryQt; public String getCurrentIllnessHistory() { @@ -91,6 +92,8 @@ public class PmsPatientDto { private String idCard; private Byte source; + private String weight; + private String height; private List currentIllnessHistory; private String currentIllnessHistoryQt; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsTreatmentDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsTreatmentDto.java index 2c6fac15..461dc7a6 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsTreatmentDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsTreatmentDto.java @@ -134,6 +134,7 @@ public class PmsTreatmentDto { private Integer endAge; private String sourceId; private String phone; + private String name; private Long tenantId; } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ScreeningDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ScreeningDto.java index ad37fee1..47c36bf3 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ScreeningDto.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ScreeningDto.java @@ -184,6 +184,8 @@ public class ScreeningDto { @ApiModelProperty("问卷详情id") private Long detailId; private Long tenantId; + private String phone; + private String name; } @Data @@ -287,6 +289,11 @@ public class ScreeningDto { private Long tenantId; private Long centerId; + + //用以下两个参数判断是否筛查过，如筛查过返回旧筛查ID，没有才创建新的筛查 + private String name; + private String phone; + } @Data diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ZytzDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ZytzDto.java new file mode 100644 index 00000000..43918c0d --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ZytzDto.java @@ -0,0 +1,172 @@ +package com.acupuncture.system.domain.dto; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdcardUtil; +import cn.hutool.core.util.StrUtil; +import com.acupuncture.common.constant.UserConstants; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + * @Author zzc + * @Package com.acupuncture.system.domain.dto + * @Date 2025/2/11 15:05 + * @description: + */ +public class ZytzDto { + @Data + public static class ZytzQrcode { + //诊疗档案id + @NotNull(message = "id不能为空") + private Long id; + //路径 + @NotNull(message = "path不能为空") + private String path; + //是否总是重新生成(1总是重新生成)，测试用 + int rewrite = 0; + } + + @Data + public static class PatientQuery { + //关键词 + private String keywords; + //患者id + private Long patientId; + } + + @Data + public static class PatientSaveOrUpdate { + private Long patientId; + @NotBlank + private String name; + private Integer gender; + private String birthday; + private String idcard; + private String phone; + private String height; + private String weight; + private String waistline; + private List sickness; + + public String getBirthday() { + if (StrUtil.isNotBlank(idcard)) { + if (IdcardUtil.isValidCard(idcard)) { + return DateUtil.format(IdcardUtil.getBirthDate(idcard), "yyyy-MM-dd"); + } + } + return birthday; + } + } + + @Data + public static class EvaSave { + @NotNull + private Long patientId; + @NotBlank + private String scaleCode; + } + + @Data + public static class EvaQuestionList { + @NotNull + private Long evaId; + } + + @Data + public static class EvaQuestionSubmit { + @NotNull + private Long evaId; + @NotEmpty + @Valid + private List questions; + + @Data + public static class Question { + @NotBlank + private String quesCode; + @NotBlank + private String optionCode; + @NotBlank + private String optionName; + @NotBlank + private String optionScore; + } + } + + @Data + public static class EvaStop { + @NotNull + private Long evaId; + } + + @Data + public static class EvaComplete { + @NotNull + private Long evaId; + } + + @Data + public static class ReportView { + @NotNull + private Long evaId; + } + + @Data + public static class ReportUpdate { + @NotNull + private Long reportId; + private String name; + private String gender; + private String birthday; + private String age; + private String idcard; + private String phone; + private String height; + private String weight; + private String waistline; + private String blh; + } + + @Data + public static class ReportExport { + @NotNull + private Long reportId; + } + + @Data + public static class EvaList { + //关键词 + private String keywords; + //性别(1男 2女) + private Integer gender; + //年龄小 + private Integer ageMin; + //年龄大 + private Integer ageMax; + //日期小 + private Date evaDateMin; + //日期大 + private Date evaDateMax; + //量表 + private String scaleCode; + //状态 + private Integer evaStatus; + } + + @Data + public static class EvaDelete { + private List evaIds ; + } +} diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java index bc916b5f..a2a0ca44 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.Date; public class DmsUser implements Serializable { - private Integer id; + private Long id; private Long tenantId; @@ -20,6 +20,8 @@ public class DmsUser implements Serializable { private String sex; + private Byte slaverAdmin; + private String status; private Byte delFlag; @@ -36,11 +38,11 @@ public class DmsUser implements Serializable { private static final long serialVersionUID = 1L; - public Integer getId() { + public Long getId() { return id; } - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } @@ -100,6 +102,14 @@ public class DmsUser implements Serializable { this.sex = sex == null ? null : sex.trim(); } + public Byte getSlaverAdmin() { + return slaverAdmin; + } + + public void setSlaverAdmin(Byte slaverAdmin) { + this.slaverAdmin = slaverAdmin; + } + public String getStatus() { return status; } @@ -170,6 +180,7 @@ public class DmsUser implements Serializable { sb.append(", email=").append(email); sb.append(", phonenumber=").append(phonenumber); sb.append(", sex=").append(sex); + sb.append(", slaverAdmin=").append(slaverAdmin); sb.append(", status=").append(status); sb.append(", delFlag=").append(delFlag); sb.append(", createBy=").append(createBy); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java index ce2395c7..9acc5265 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java @@ -115,52 +115,52 @@ public class DmsUserExample { return (Criteria) this; } - public Criteria andIdEqualTo(Integer value) { + public Criteria andIdEqualTo(Long value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Integer value) { + public Criteria andIdNotEqualTo(Long value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Integer value) { + public Criteria andIdGreaterThan(Long value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Integer value) { + public Criteria andIdGreaterThanOrEqualTo(Long value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Integer value) { + public Criteria andIdLessThan(Long value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Integer value) { + public Criteria andIdLessThanOrEqualTo(Long value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Integer value1, Integer value2) { + public Criteria andIdBetween(Long value1, Long value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Integer value1, Integer value2) { + public Criteria andIdNotBetween(Long value1, Long value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } @@ -645,6 +645,66 @@ public class DmsUserExample { return (Criteria) this; } + public Criteria andSlaverAdminIsNull() { + addCriterion("slaver_admin is null"); + return (Criteria) this; + } + + public Criteria andSlaverAdminIsNotNull() { + addCriterion("slaver_admin is not null"); + return (Criteria) this; + } + + public Criteria andSlaverAdminEqualTo(Byte value) { + addCriterion("slaver_admin =", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminNotEqualTo(Byte value) { + addCriterion("slaver_admin <>", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminGreaterThan(Byte value) { + addCriterion("slaver_admin >", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminGreaterThanOrEqualTo(Byte value) { + addCriterion("slaver_admin >=", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminLessThan(Byte value) { + addCriterion("slaver_admin <", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminLessThanOrEqualTo(Byte value) { + addCriterion("slaver_admin <=", value, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminIn(List values) { + addCriterion("slaver_admin in", values, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminNotIn(List values) { + addCriterion("slaver_admin not in", values, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminBetween(Byte value1, Byte value2) { + addCriterion("slaver_admin between", value1, value2, "slaverAdmin"); + return (Criteria) this; + } + + public Criteria andSlaverAdminNotBetween(Byte value1, Byte value2) { + addCriterion("slaver_admin not between", value1, value2, "slaverAdmin"); + return (Criteria) this; + } + public Criteria andStatusIsNull() { addCriterion("status is null"); return (Criteria) this; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeight.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeight.java new file mode 100644 index 00000000..bfcdcdb0 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeight.java @@ -0,0 +1,61 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; + +public class HmsWeightHeight implements Serializable { + private Long id; + + private String height; + + private String weight; + + private String testId; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height == null ? null : height.trim(); + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight == null ? null : weight.trim(); + } + + public String getTestId() { + return testId; + } + + public void setTestId(String testId) { + this.testId = testId == null ? null : testId.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", height=").append(height); + sb.append(", weight=").append(weight); + sb.append(", testId=").append(testId); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeightExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeightExample.java new file mode 100644 index 00000000..413252e9 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/HmsWeightHeightExample.java @@ -0,0 +1,470 @@ +package com.acupuncture.system.domain.po; + +import java.util.ArrayList; +import java.util.List; + +public class HmsWeightHeightExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public HmsWeightHeightExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andHeightIsNull() { + addCriterion("height is null"); + return (Criteria) this; + } + + public Criteria andHeightIsNotNull() { + addCriterion("height is not null"); + return (Criteria) this; + } + + public Criteria andHeightEqualTo(String value) { + addCriterion("height =", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotEqualTo(String value) { + addCriterion("height <>", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThan(String value) { + addCriterion("height >", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThanOrEqualTo(String value) { + addCriterion("height >=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThan(String value) { + addCriterion("height <", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThanOrEqualTo(String value) { + addCriterion("height <=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLike(String value) { + addCriterion("height like", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotLike(String value) { + addCriterion("height not like", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightIn(List values) { + addCriterion("height in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotIn(List values) { + addCriterion("height not in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightBetween(String value1, String value2) { + addCriterion("height between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotBetween(String value1, String value2) { + addCriterion("height not between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andWeightIsNull() { + addCriterion("weight is null"); + return (Criteria) this; + } + + public Criteria andWeightIsNotNull() { + addCriterion("weight is not null"); + return (Criteria) this; + } + + public Criteria andWeightEqualTo(String value) { + addCriterion("weight =", value, "weight"); + return (Criteria) this; + } + + public Criteria andWeightNotEqualTo(String value) { + addCriterion("weight <>", value, "weight"); + return (Criteria) this; + } + + public Criteria andWeightGreaterThan(String value) { + addCriterion("weight >", value, "weight"); + return (Criteria) this; + } + + public Criteria andWeightGreaterThanOrEqualTo(String value) { + addCriterion("weight >=", value, "weight"); + return (Criteria) this; + } + + public Criteria andWeightLessThan(String value) { + addCriterion("weight <", value, "weight"); + return (Criteria) this; + } + + public Criteria andWeightLessThanOrEqualTo(String value) { + addCriterion("weight <=", value, "weight"); + return (Criteria) this; + } + + public Criteria andWeightLike(String value) { + addCriterion("weight like", value, "weight"); + return (Criteria) this; + } + + public Criteria andWeightNotLike(String value) { + addCriterion("weight not like", value, "weight"); + return (Criteria) this; + } + + public Criteria andWeightIn(List values) { + addCriterion("weight in", values, "weight"); + return (Criteria) this; + } + + public Criteria andWeightNotIn(List values) { + addCriterion("weight not in", values, "weight"); + return (Criteria) this; + } + + public Criteria andWeightBetween(String value1, String value2) { + addCriterion("weight between", value1, value2, "weight"); + return (Criteria) this; + } + + public Criteria andWeightNotBetween(String value1, String value2) { + addCriterion("weight not between", value1, value2, "weight"); + return (Criteria) this; + } + + public Criteria andTestIdIsNull() { + addCriterion("test_id is null"); + return (Criteria) this; + } + + public Criteria andTestIdIsNotNull() { + addCriterion("test_id is not null"); + return (Criteria) this; + } + + public Criteria andTestIdEqualTo(String value) { + addCriterion("test_id =", value, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdNotEqualTo(String value) { + addCriterion("test_id <>", value, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdGreaterThan(String value) { + addCriterion("test_id >", value, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdGreaterThanOrEqualTo(String value) { + addCriterion("test_id >=", value, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdLessThan(String value) { + addCriterion("test_id <", value, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdLessThanOrEqualTo(String value) { + addCriterion("test_id <=", value, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdLike(String value) { + addCriterion("test_id like", value, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdNotLike(String value) { + addCriterion("test_id not like", value, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdIn(List values) { + addCriterion("test_id in", values, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdNotIn(List values) { + addCriterion("test_id not in", values, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdBetween(String value1, String value2) { + addCriterion("test_id between", value1, value2, "testId"); + return (Criteria) this; + } + + public Criteria andTestIdNotBetween(String value1, String value2) { + addCriterion("test_id not between", value1, value2, "testId"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java index 809e35d3..137399ef 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java @@ -30,7 +30,9 @@ public class PmsPatient implements Serializable { private String currentIllnessHistory; - private String currentIllnessHistoryQt; + private String weight; + + private String height; private Byte delFlag; @@ -46,6 +48,10 @@ public class PmsPatient implements Serializable { private String remark; + private String currentIllnessHistoryQt; + + private String weightId; + private static final long serialVersionUID = 1L; public Long getId() { @@ -152,12 +158,20 @@ public class PmsPatient implements Serializable { this.currentIllnessHistory = currentIllnessHistory == null ? null : currentIllnessHistory.trim(); } - public String getCurrentIllnessHistoryQt() { - return currentIllnessHistoryQt; + public String getWeight() { + return weight; } - public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) { - this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim(); + public void setWeight(String weight) { + this.weight = weight == null ? null : weight.trim(); + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height == null ? null : height.trim(); } public Byte getDelFlag() { @@ -216,6 +230,22 @@ public class PmsPatient implements Serializable { this.remark = remark == null ? null : remark.trim(); } + public String getCurrentIllnessHistoryQt() { + return currentIllnessHistoryQt; + } + + public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) { + this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim(); + } + + public String getWeightId() { + return weightId; + } + + public void setWeightId(String weightId) { + this.weightId = weightId == null ? null : weightId.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -235,7 +265,8 @@ public class PmsPatient implements Serializable { sb.append(", idCard=").append(idCard); sb.append(", source=").append(source); sb.append(", currentIllnessHistory=").append(currentIllnessHistory); - sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt); + sb.append(", weight=").append(weight); + sb.append(", height=").append(height); sb.append(", delFlag=").append(delFlag); sb.append(", tenantId=").append(tenantId); sb.append(", createBy=").append(createBy); @@ -243,6 +274,8 @@ public class PmsPatient implements Serializable { sb.append(", updateBy=").append(updateBy); sb.append(", updateTime=").append(updateTime); sb.append(", remark=").append(remark); + sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt); + sb.append(", weightId=").append(weightId); sb.append("]"); return sb.toString(); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java index f386307f..72567fd8 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java @@ -982,73 +982,143 @@ public class PmsPatientExample { return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtIsNull() { - addCriterion("current_illness_history_qt is null"); + public Criteria andWeightIsNull() { + addCriterion("weight is null"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtIsNotNull() { - addCriterion("current_illness_history_qt is not null"); + public Criteria andWeightIsNotNull() { + addCriterion("weight is not null"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtEqualTo(String value) { - addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt"); + public Criteria andWeightEqualTo(String value) { + addCriterion("weight =", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) { - addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt"); + public Criteria andWeightNotEqualTo(String value) { + addCriterion("weight <>", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) { - addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt"); + public Criteria andWeightGreaterThan(String value) { + addCriterion("weight >", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) { - addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt"); + public Criteria andWeightGreaterThanOrEqualTo(String value) { + addCriterion("weight >=", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtLessThan(String value) { - addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt"); + public Criteria andWeightLessThan(String value) { + addCriterion("weight <", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) { - addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt"); + public Criteria andWeightLessThanOrEqualTo(String value) { + addCriterion("weight <=", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtLike(String value) { - addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt"); + public Criteria andWeightLike(String value) { + addCriterion("weight like", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtNotLike(String value) { - addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt"); + public Criteria andWeightNotLike(String value) { + addCriterion("weight not like", value, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtIn(List values) { - addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt"); + public Criteria andWeightIn(List values) { + addCriterion("weight in", values, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtNotIn(List values) { - addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt"); + public Criteria andWeightNotIn(List values) { + addCriterion("weight not in", values, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) { - addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt"); + public Criteria andWeightBetween(String value1, String value2) { + addCriterion("weight between", value1, value2, "weight"); return (Criteria) this; } - public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) { - addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt"); + public Criteria andWeightNotBetween(String value1, String value2) { + addCriterion("weight not between", value1, value2, "weight"); + return (Criteria) this; + } + + public Criteria andHeightIsNull() { + addCriterion("height is null"); + return (Criteria) this; + } + + public Criteria andHeightIsNotNull() { + addCriterion("height is not null"); + return (Criteria) this; + } + + public Criteria andHeightEqualTo(String value) { + addCriterion("height =", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotEqualTo(String value) { + addCriterion("height <>", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThan(String value) { + addCriterion("height >", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThanOrEqualTo(String value) { + addCriterion("height >=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThan(String value) { + addCriterion("height <", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThanOrEqualTo(String value) { + addCriterion("height <=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLike(String value) { + addCriterion("height like", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotLike(String value) { + addCriterion("height not like", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightIn(List values) { + addCriterion("height in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotIn(List values) { + addCriterion("height not in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightBetween(String value1, String value2) { + addCriterion("height between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotBetween(String value1, String value2) { + addCriterion("height not between", value1, value2, "height"); return (Criteria) this; } @@ -1501,6 +1571,146 @@ public class PmsPatientExample { addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } + + public Criteria andCurrentIllnessHistoryQtIsNull() { + addCriterion("current_illness_history_qt is null"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtIsNotNull() { + addCriterion("current_illness_history_qt is not null"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtEqualTo(String value) { + addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) { + addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) { + addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) { + addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtLessThan(String value) { + addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) { + addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtLike(String value) { + addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtNotLike(String value) { + addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtIn(List values) { + addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtNotIn(List values) { + addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) { + addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) { + addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt"); + return (Criteria) this; + } + + public Criteria andWeightIdIsNull() { + addCriterion("weight_id is null"); + return (Criteria) this; + } + + public Criteria andWeightIdIsNotNull() { + addCriterion("weight_id is not null"); + return (Criteria) this; + } + + public Criteria andWeightIdEqualTo(String value) { + addCriterion("weight_id =", value, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdNotEqualTo(String value) { + addCriterion("weight_id <>", value, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdGreaterThan(String value) { + addCriterion("weight_id >", value, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdGreaterThanOrEqualTo(String value) { + addCriterion("weight_id >=", value, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdLessThan(String value) { + addCriterion("weight_id <", value, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdLessThanOrEqualTo(String value) { + addCriterion("weight_id <=", value, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdLike(String value) { + addCriterion("weight_id like", value, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdNotLike(String value) { + addCriterion("weight_id not like", value, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdIn(List values) { + addCriterion("weight_id in", values, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdNotIn(List values) { + addCriterion("weight_id not in", values, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdBetween(String value1, String value2) { + addCriterion("weight_id between", value1, value2, "weightId"); + return (Criteria) this; + } + + public Criteria andWeightIdNotBetween(String value1, String value2) { + addCriterion("weight_id not between", value1, value2, "weightId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatment.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatment.java index 68bee48d..3bc166ab 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatment.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatment.java @@ -48,6 +48,8 @@ public class PmsTreatment implements Serializable { private Byte status; + private Long memberId; + private Byte delFlag; private Long tenantId; @@ -240,6 +242,14 @@ public class PmsTreatment implements Serializable { this.status = status; } + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + public Byte getDelFlag() { return delFlag; } @@ -324,6 +334,7 @@ public class PmsTreatment implements Serializable { sb.append(", diagnosisCode=").append(diagnosisCode); sb.append(", diagnosisName=").append(diagnosisName); sb.append(", status=").append(status); + sb.append(", memberId=").append(memberId); sb.append(", delFlag=").append(delFlag); sb.append(", tenantId=").append(tenantId); sb.append(", createBy=").append(createBy); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatmentExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatmentExample.java index 677c8114..96f09b92 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatmentExample.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsTreatmentExample.java @@ -1562,6 +1562,66 @@ public class PmsTreatmentExample { return (Criteria) this; } + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } + public Criteria andDelFlagIsNull() { addCriterion("del_flag is null"); return (Criteria) this; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzEmsEvaAnswer.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzEmsEvaAnswer.java new file mode 100644 index 00000000..d451ff97 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzEmsEvaAnswer.java @@ -0,0 +1,129 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class ZytzEmsEvaAnswer implements Serializable { + private Long answerId; + + private Long evaId; + + private String quesCode; + + private String optionCode; + + private String optionName; + + private BigDecimal optionScore; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getAnswerId() { + return answerId; + } + + public void setAnswerId(Long answerId) { + this.answerId = answerId; + } + + public Long getEvaId() { + return evaId; + } + + public void setEvaId(Long evaId) { + this.evaId = evaId; + } + + public String getQuesCode() { + return quesCode; + } + + public void setQuesCode(String quesCode) { + this.quesCode = quesCode == null ? null : quesCode.trim(); + } + + public String getOptionCode() { + return optionCode; + } + + public void setOptionCode(String optionCode) { + this.optionCode = optionCode == null ? null : optionCode.trim(); + } + + public String getOptionName() { + return optionName; + } + + public void setOptionName(String optionName) { + this.optionName = optionName == null ? null : optionName.trim(); + } + + public BigDecimal getOptionScore() { + return optionScore; + } + + public void setOptionScore(BigDecimal optionScore) { + this.optionScore = optionScore; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", answerId=").append(answerId); + sb.append(", evaId=").append(evaId); + sb.append(", quesCode=").append(quesCode); + sb.append(", optionCode=").append(optionCode); + sb.append(", optionName=").append(optionName); + sb.append(", optionScore=").append(optionScore); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzEmsEvaAnswerExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzEmsEvaAnswerExample.java new file mode 100644 index 00000000..a7380214 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzEmsEvaAnswerExample.java @@ -0,0 +1,852 @@ +package com.acupuncture.system.domain.po; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzEmsEvaAnswerExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzEmsEvaAnswerExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andAnswerIdIsNull() { + addCriterion("answer_id is null"); + return (Criteria) this; + } + + public Criteria andAnswerIdIsNotNull() { + addCriterion("answer_id is not null"); + return (Criteria) this; + } + + public Criteria andAnswerIdEqualTo(Long value) { + addCriterion("answer_id =", value, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdNotEqualTo(Long value) { + addCriterion("answer_id <>", value, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdGreaterThan(Long value) { + addCriterion("answer_id >", value, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdGreaterThanOrEqualTo(Long value) { + addCriterion("answer_id >=", value, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdLessThan(Long value) { + addCriterion("answer_id <", value, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdLessThanOrEqualTo(Long value) { + addCriterion("answer_id <=", value, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdIn(List values) { + addCriterion("answer_id in", values, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdNotIn(List values) { + addCriterion("answer_id not in", values, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdBetween(Long value1, Long value2) { + addCriterion("answer_id between", value1, value2, "answerId"); + return (Criteria) this; + } + + public Criteria andAnswerIdNotBetween(Long value1, Long value2) { + addCriterion("answer_id not between", value1, value2, "answerId"); + return (Criteria) this; + } + + public Criteria andEvaIdIsNull() { + addCriterion("eva_id is null"); + return (Criteria) this; + } + + public Criteria andEvaIdIsNotNull() { + addCriterion("eva_id is not null"); + return (Criteria) this; + } + + public Criteria andEvaIdEqualTo(Long value) { + addCriterion("eva_id =", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdNotEqualTo(Long value) { + addCriterion("eva_id <>", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdGreaterThan(Long value) { + addCriterion("eva_id >", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdGreaterThanOrEqualTo(Long value) { + addCriterion("eva_id >=", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdLessThan(Long value) { + addCriterion("eva_id <", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdLessThanOrEqualTo(Long value) { + addCriterion("eva_id <=", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdIn(List values) { + addCriterion("eva_id in", values, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdNotIn(List values) { + addCriterion("eva_id not in", values, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdBetween(Long value1, Long value2) { + addCriterion("eva_id between", value1, value2, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdNotBetween(Long value1, Long value2) { + addCriterion("eva_id not between", value1, value2, "evaId"); + return (Criteria) this; + } + + public Criteria andQuesCodeIsNull() { + addCriterion("ques_code is null"); + return (Criteria) this; + } + + public Criteria andQuesCodeIsNotNull() { + addCriterion("ques_code is not null"); + return (Criteria) this; + } + + public Criteria andQuesCodeEqualTo(String value) { + addCriterion("ques_code =", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotEqualTo(String value) { + addCriterion("ques_code <>", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeGreaterThan(String value) { + addCriterion("ques_code >", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeGreaterThanOrEqualTo(String value) { + addCriterion("ques_code >=", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLessThan(String value) { + addCriterion("ques_code <", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLessThanOrEqualTo(String value) { + addCriterion("ques_code <=", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLike(String value) { + addCriterion("ques_code like", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotLike(String value) { + addCriterion("ques_code not like", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeIn(List values) { + addCriterion("ques_code in", values, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotIn(List values) { + addCriterion("ques_code not in", values, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeBetween(String value1, String value2) { + addCriterion("ques_code between", value1, value2, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotBetween(String value1, String value2) { + addCriterion("ques_code not between", value1, value2, "quesCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeIsNull() { + addCriterion("option_code is null"); + return (Criteria) this; + } + + public Criteria andOptionCodeIsNotNull() { + addCriterion("option_code is not null"); + return (Criteria) this; + } + + public Criteria andOptionCodeEqualTo(String value) { + addCriterion("option_code =", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeNotEqualTo(String value) { + addCriterion("option_code <>", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeGreaterThan(String value) { + addCriterion("option_code >", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeGreaterThanOrEqualTo(String value) { + addCriterion("option_code >=", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeLessThan(String value) { + addCriterion("option_code <", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeLessThanOrEqualTo(String value) { + addCriterion("option_code <=", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeLike(String value) { + addCriterion("option_code like", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeNotLike(String value) { + addCriterion("option_code not like", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeIn(List values) { + addCriterion("option_code in", values, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeNotIn(List values) { + addCriterion("option_code not in", values, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeBetween(String value1, String value2) { + addCriterion("option_code between", value1, value2, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeNotBetween(String value1, String value2) { + addCriterion("option_code not between", value1, value2, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionNameIsNull() { + addCriterion("option_name is null"); + return (Criteria) this; + } + + public Criteria andOptionNameIsNotNull() { + addCriterion("option_name is not null"); + return (Criteria) this; + } + + public Criteria andOptionNameEqualTo(String value) { + addCriterion("option_name =", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotEqualTo(String value) { + addCriterion("option_name <>", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameGreaterThan(String value) { + addCriterion("option_name >", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameGreaterThanOrEqualTo(String value) { + addCriterion("option_name >=", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLessThan(String value) { + addCriterion("option_name <", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLessThanOrEqualTo(String value) { + addCriterion("option_name <=", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLike(String value) { + addCriterion("option_name like", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotLike(String value) { + addCriterion("option_name not like", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameIn(List values) { + addCriterion("option_name in", values, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotIn(List values) { + addCriterion("option_name not in", values, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameBetween(String value1, String value2) { + addCriterion("option_name between", value1, value2, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotBetween(String value1, String value2) { + addCriterion("option_name not between", value1, value2, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionScoreIsNull() { + addCriterion("option_score is null"); + return (Criteria) this; + } + + public Criteria andOptionScoreIsNotNull() { + addCriterion("option_score is not null"); + return (Criteria) this; + } + + public Criteria andOptionScoreEqualTo(BigDecimal value) { + addCriterion("option_score =", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreNotEqualTo(BigDecimal value) { + addCriterion("option_score <>", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreGreaterThan(BigDecimal value) { + addCriterion("option_score >", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("option_score >=", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreLessThan(BigDecimal value) { + addCriterion("option_score <", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("option_score <=", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreIn(List values) { + addCriterion("option_score in", values, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreNotIn(List values) { + addCriterion("option_score not in", values, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("option_score between", value1, value2, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("option_score not between", value1, value2, "optionScore"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScale.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScale.java new file mode 100644 index 00000000..d32759ad --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScale.java @@ -0,0 +1,106 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.util.Date; + +public class ZytzQmsScale implements Serializable { + private Long scaleId; + + private String scaleCode; + + private String scaleName; + + private String delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getScaleId() { + return scaleId; + } + + public void setScaleId(Long scaleId) { + this.scaleId = scaleId; + } + + public String getScaleCode() { + return scaleCode; + } + + public void setScaleCode(String scaleCode) { + this.scaleCode = scaleCode == null ? null : scaleCode.trim(); + } + + public String getScaleName() { + return scaleName; + } + + public void setScaleName(String scaleName) { + this.scaleName = scaleName == null ? null : scaleName.trim(); + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag == null ? null : delFlag.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", scaleId=").append(scaleId); + sb.append(", scaleCode=").append(scaleCode); + sb.append(", scaleName=").append(scaleName); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConsti.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConsti.java new file mode 100644 index 00000000..e499db6b --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConsti.java @@ -0,0 +1,117 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.util.Date; + +public class ZytzQmsScaleConsti implements Serializable { + private Long constiId; + + private String scaleCode; + + private String constiCode; + + private String constiName; + + private String delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getConstiId() { + return constiId; + } + + public void setConstiId(Long constiId) { + this.constiId = constiId; + } + + public String getScaleCode() { + return scaleCode; + } + + public void setScaleCode(String scaleCode) { + this.scaleCode = scaleCode == null ? null : scaleCode.trim(); + } + + public String getConstiCode() { + return constiCode; + } + + public void setConstiCode(String constiCode) { + this.constiCode = constiCode == null ? null : constiCode.trim(); + } + + public String getConstiName() { + return constiName; + } + + public void setConstiName(String constiName) { + this.constiName = constiName == null ? null : constiName.trim(); + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag == null ? null : delFlag.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", constiId=").append(constiId); + sb.append(", scaleCode=").append(scaleCode); + sb.append(", constiCode=").append(constiCode); + sb.append(", constiName=").append(constiName); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiExample.java new file mode 100644 index 00000000..6b1317a7 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiExample.java @@ -0,0 +1,801 @@ +package com.acupuncture.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzQmsScaleConstiExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzQmsScaleConstiExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andConstiIdIsNull() { + addCriterion("consti_id is null"); + return (Criteria) this; + } + + public Criteria andConstiIdIsNotNull() { + addCriterion("consti_id is not null"); + return (Criteria) this; + } + + public Criteria andConstiIdEqualTo(Long value) { + addCriterion("consti_id =", value, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdNotEqualTo(Long value) { + addCriterion("consti_id <>", value, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdGreaterThan(Long value) { + addCriterion("consti_id >", value, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdGreaterThanOrEqualTo(Long value) { + addCriterion("consti_id >=", value, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdLessThan(Long value) { + addCriterion("consti_id <", value, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdLessThanOrEqualTo(Long value) { + addCriterion("consti_id <=", value, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdIn(List values) { + addCriterion("consti_id in", values, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdNotIn(List values) { + addCriterion("consti_id not in", values, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdBetween(Long value1, Long value2) { + addCriterion("consti_id between", value1, value2, "constiId"); + return (Criteria) this; + } + + public Criteria andConstiIdNotBetween(Long value1, Long value2) { + addCriterion("consti_id not between", value1, value2, "constiId"); + return (Criteria) this; + } + + public Criteria andScaleCodeIsNull() { + addCriterion("scale_code is null"); + return (Criteria) this; + } + + public Criteria andScaleCodeIsNotNull() { + addCriterion("scale_code is not null"); + return (Criteria) this; + } + + public Criteria andScaleCodeEqualTo(String value) { + addCriterion("scale_code =", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotEqualTo(String value) { + addCriterion("scale_code <>", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeGreaterThan(String value) { + addCriterion("scale_code >", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeGreaterThanOrEqualTo(String value) { + addCriterion("scale_code >=", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLessThan(String value) { + addCriterion("scale_code <", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLessThanOrEqualTo(String value) { + addCriterion("scale_code <=", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLike(String value) { + addCriterion("scale_code like", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotLike(String value) { + addCriterion("scale_code not like", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeIn(List values) { + addCriterion("scale_code in", values, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotIn(List values) { + addCriterion("scale_code not in", values, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeBetween(String value1, String value2) { + addCriterion("scale_code between", value1, value2, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotBetween(String value1, String value2) { + addCriterion("scale_code not between", value1, value2, "scaleCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNull() { + addCriterion("consti_code is null"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNotNull() { + addCriterion("consti_code is not null"); + return (Criteria) this; + } + + public Criteria andConstiCodeEqualTo(String value) { + addCriterion("consti_code =", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotEqualTo(String value) { + addCriterion("consti_code <>", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThan(String value) { + addCriterion("consti_code >", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThanOrEqualTo(String value) { + addCriterion("consti_code >=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThan(String value) { + addCriterion("consti_code <", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThanOrEqualTo(String value) { + addCriterion("consti_code <=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLike(String value) { + addCriterion("consti_code like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotLike(String value) { + addCriterion("consti_code not like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeIn(List values) { + addCriterion("consti_code in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotIn(List values) { + addCriterion("consti_code not in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeBetween(String value1, String value2) { + addCriterion("consti_code between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotBetween(String value1, String value2) { + addCriterion("consti_code not between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiNameIsNull() { + addCriterion("consti_name is null"); + return (Criteria) this; + } + + public Criteria andConstiNameIsNotNull() { + addCriterion("consti_name is not null"); + return (Criteria) this; + } + + public Criteria andConstiNameEqualTo(String value) { + addCriterion("consti_name =", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotEqualTo(String value) { + addCriterion("consti_name <>", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameGreaterThan(String value) { + addCriterion("consti_name >", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameGreaterThanOrEqualTo(String value) { + addCriterion("consti_name >=", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLessThan(String value) { + addCriterion("consti_name <", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLessThanOrEqualTo(String value) { + addCriterion("consti_name <=", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLike(String value) { + addCriterion("consti_name like", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotLike(String value) { + addCriterion("consti_name not like", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameIn(List values) { + addCriterion("consti_name in", values, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotIn(List values) { + addCriterion("consti_name not in", values, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameBetween(String value1, String value2) { + addCriterion("consti_name between", value1, value2, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotBetween(String value1, String value2) { + addCriterion("consti_name not between", value1, value2, "constiName"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(String value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(String value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(String value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(String value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(String value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(String value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLike(String value) { + addCriterion("del_flag like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotLike(String value) { + addCriterion("del_flag not like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(String value1, String value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(String value1, String value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiQuesRel.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiQuesRel.java new file mode 100644 index 00000000..a77c4572 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiQuesRel.java @@ -0,0 +1,117 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.util.Date; + +public class ZytzQmsScaleConstiQuesRel implements Serializable { + private Long id; + + private String constiCode; + + private String quesCode; + + private Byte reverse; + + private String delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getConstiCode() { + return constiCode; + } + + public void setConstiCode(String constiCode) { + this.constiCode = constiCode == null ? null : constiCode.trim(); + } + + public String getQuesCode() { + return quesCode; + } + + public void setQuesCode(String quesCode) { + this.quesCode = quesCode == null ? null : quesCode.trim(); + } + + public Byte getReverse() { + return reverse; + } + + public void setReverse(Byte reverse) { + this.reverse = reverse; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag == null ? null : delFlag.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", constiCode=").append(constiCode); + sb.append(", quesCode=").append(quesCode); + sb.append(", reverse=").append(reverse); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiQuesRelExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiQuesRelExample.java new file mode 100644 index 00000000..6b66b9ce --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiQuesRelExample.java @@ -0,0 +1,791 @@ +package com.acupuncture.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzQmsScaleConstiQuesRelExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzQmsScaleConstiQuesRelExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNull() { + addCriterion("consti_code is null"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNotNull() { + addCriterion("consti_code is not null"); + return (Criteria) this; + } + + public Criteria andConstiCodeEqualTo(String value) { + addCriterion("consti_code =", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotEqualTo(String value) { + addCriterion("consti_code <>", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThan(String value) { + addCriterion("consti_code >", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThanOrEqualTo(String value) { + addCriterion("consti_code >=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThan(String value) { + addCriterion("consti_code <", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThanOrEqualTo(String value) { + addCriterion("consti_code <=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLike(String value) { + addCriterion("consti_code like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotLike(String value) { + addCriterion("consti_code not like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeIn(List values) { + addCriterion("consti_code in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotIn(List values) { + addCriterion("consti_code not in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeBetween(String value1, String value2) { + addCriterion("consti_code between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotBetween(String value1, String value2) { + addCriterion("consti_code not between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeIsNull() { + addCriterion("ques_code is null"); + return (Criteria) this; + } + + public Criteria andQuesCodeIsNotNull() { + addCriterion("ques_code is not null"); + return (Criteria) this; + } + + public Criteria andQuesCodeEqualTo(String value) { + addCriterion("ques_code =", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotEqualTo(String value) { + addCriterion("ques_code <>", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeGreaterThan(String value) { + addCriterion("ques_code >", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeGreaterThanOrEqualTo(String value) { + addCriterion("ques_code >=", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLessThan(String value) { + addCriterion("ques_code <", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLessThanOrEqualTo(String value) { + addCriterion("ques_code <=", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLike(String value) { + addCriterion("ques_code like", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotLike(String value) { + addCriterion("ques_code not like", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeIn(List values) { + addCriterion("ques_code in", values, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotIn(List values) { + addCriterion("ques_code not in", values, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeBetween(String value1, String value2) { + addCriterion("ques_code between", value1, value2, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotBetween(String value1, String value2) { + addCriterion("ques_code not between", value1, value2, "quesCode"); + return (Criteria) this; + } + + public Criteria andReverseIsNull() { + addCriterion("reverse is null"); + return (Criteria) this; + } + + public Criteria andReverseIsNotNull() { + addCriterion("reverse is not null"); + return (Criteria) this; + } + + public Criteria andReverseEqualTo(Byte value) { + addCriterion("reverse =", value, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseNotEqualTo(Byte value) { + addCriterion("reverse <>", value, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseGreaterThan(Byte value) { + addCriterion("reverse >", value, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseGreaterThanOrEqualTo(Byte value) { + addCriterion("reverse >=", value, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseLessThan(Byte value) { + addCriterion("reverse <", value, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseLessThanOrEqualTo(Byte value) { + addCriterion("reverse <=", value, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseIn(List values) { + addCriterion("reverse in", values, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseNotIn(List values) { + addCriterion("reverse not in", values, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseBetween(Byte value1, Byte value2) { + addCriterion("reverse between", value1, value2, "reverse"); + return (Criteria) this; + } + + public Criteria andReverseNotBetween(Byte value1, Byte value2) { + addCriterion("reverse not between", value1, value2, "reverse"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(String value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(String value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(String value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(String value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(String value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(String value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLike(String value) { + addCriterion("del_flag like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotLike(String value) { + addCriterion("del_flag not like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(String value1, String value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(String value1, String value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiRefScore.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiRefScore.java new file mode 100644 index 00000000..1068fbc7 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiRefScore.java @@ -0,0 +1,129 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class ZytzQmsScaleConstiRefScore implements Serializable { + private Long id; + + private String constiCode; + + private BigDecimal refScoreYes; + + private BigDecimal refScoreMaybe; + + private BigDecimal fullScore; + + private String delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getConstiCode() { + return constiCode; + } + + public void setConstiCode(String constiCode) { + this.constiCode = constiCode == null ? null : constiCode.trim(); + } + + public BigDecimal getRefScoreYes() { + return refScoreYes; + } + + public void setRefScoreYes(BigDecimal refScoreYes) { + this.refScoreYes = refScoreYes; + } + + public BigDecimal getRefScoreMaybe() { + return refScoreMaybe; + } + + public void setRefScoreMaybe(BigDecimal refScoreMaybe) { + this.refScoreMaybe = refScoreMaybe; + } + + public BigDecimal getFullScore() { + return fullScore; + } + + public void setFullScore(BigDecimal fullScore) { + this.fullScore = fullScore; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag == null ? null : delFlag.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", constiCode=").append(constiCode); + sb.append(", refScoreYes=").append(refScoreYes); + sb.append(", refScoreMaybe=").append(refScoreMaybe); + sb.append(", fullScore=").append(fullScore); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiRefScoreExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiRefScoreExample.java new file mode 100644 index 00000000..fbd7f821 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiRefScoreExample.java @@ -0,0 +1,842 @@ +package com.acupuncture.system.domain.po; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzQmsScaleConstiRefScoreExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzQmsScaleConstiRefScoreExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNull() { + addCriterion("consti_code is null"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNotNull() { + addCriterion("consti_code is not null"); + return (Criteria) this; + } + + public Criteria andConstiCodeEqualTo(String value) { + addCriterion("consti_code =", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotEqualTo(String value) { + addCriterion("consti_code <>", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThan(String value) { + addCriterion("consti_code >", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThanOrEqualTo(String value) { + addCriterion("consti_code >=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThan(String value) { + addCriterion("consti_code <", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThanOrEqualTo(String value) { + addCriterion("consti_code <=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLike(String value) { + addCriterion("consti_code like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotLike(String value) { + addCriterion("consti_code not like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeIn(List values) { + addCriterion("consti_code in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotIn(List values) { + addCriterion("consti_code not in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeBetween(String value1, String value2) { + addCriterion("consti_code between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotBetween(String value1, String value2) { + addCriterion("consti_code not between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andRefScoreYesIsNull() { + addCriterion("ref_score_yes is null"); + return (Criteria) this; + } + + public Criteria andRefScoreYesIsNotNull() { + addCriterion("ref_score_yes is not null"); + return (Criteria) this; + } + + public Criteria andRefScoreYesEqualTo(BigDecimal value) { + addCriterion("ref_score_yes =", value, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesNotEqualTo(BigDecimal value) { + addCriterion("ref_score_yes <>", value, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesGreaterThan(BigDecimal value) { + addCriterion("ref_score_yes >", value, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("ref_score_yes >=", value, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesLessThan(BigDecimal value) { + addCriterion("ref_score_yes <", value, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesLessThanOrEqualTo(BigDecimal value) { + addCriterion("ref_score_yes <=", value, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesIn(List values) { + addCriterion("ref_score_yes in", values, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesNotIn(List values) { + addCriterion("ref_score_yes not in", values, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("ref_score_yes between", value1, value2, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreYesNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("ref_score_yes not between", value1, value2, "refScoreYes"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeIsNull() { + addCriterion("ref_score_Maybe is null"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeIsNotNull() { + addCriterion("ref_score_Maybe is not null"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeEqualTo(BigDecimal value) { + addCriterion("ref_score_Maybe =", value, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeNotEqualTo(BigDecimal value) { + addCriterion("ref_score_Maybe <>", value, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeGreaterThan(BigDecimal value) { + addCriterion("ref_score_Maybe >", value, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("ref_score_Maybe >=", value, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeLessThan(BigDecimal value) { + addCriterion("ref_score_Maybe <", value, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeLessThanOrEqualTo(BigDecimal value) { + addCriterion("ref_score_Maybe <=", value, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeIn(List values) { + addCriterion("ref_score_Maybe in", values, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeNotIn(List values) { + addCriterion("ref_score_Maybe not in", values, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("ref_score_Maybe between", value1, value2, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andRefScoreMaybeNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("ref_score_Maybe not between", value1, value2, "refScoreMaybe"); + return (Criteria) this; + } + + public Criteria andFullScoreIsNull() { + addCriterion("full_score is null"); + return (Criteria) this; + } + + public Criteria andFullScoreIsNotNull() { + addCriterion("full_score is not null"); + return (Criteria) this; + } + + public Criteria andFullScoreEqualTo(BigDecimal value) { + addCriterion("full_score =", value, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreNotEqualTo(BigDecimal value) { + addCriterion("full_score <>", value, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreGreaterThan(BigDecimal value) { + addCriterion("full_score >", value, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("full_score >=", value, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreLessThan(BigDecimal value) { + addCriterion("full_score <", value, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("full_score <=", value, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreIn(List values) { + addCriterion("full_score in", values, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreNotIn(List values) { + addCriterion("full_score not in", values, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("full_score between", value1, value2, "fullScore"); + return (Criteria) this; + } + + public Criteria andFullScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("full_score not between", value1, value2, "fullScore"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(String value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(String value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(String value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(String value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(String value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(String value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLike(String value) { + addCriterion("del_flag like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotLike(String value) { + addCriterion("del_flag not like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(String value1, String value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(String value1, String value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiYsfa.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiYsfa.java new file mode 100644 index 00000000..c3204b23 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiYsfa.java @@ -0,0 +1,106 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.util.Date; + +public class ZytzQmsScaleConstiYsfa implements Serializable { + private Long id; + + private String constiCode; + + private String delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private String constiYsfaTemplate; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getConstiCode() { + return constiCode; + } + + public void setConstiCode(String constiCode) { + this.constiCode = constiCode == null ? null : constiCode.trim(); + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag == null ? null : delFlag.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getConstiYsfaTemplate() { + return constiYsfaTemplate; + } + + public void setConstiYsfaTemplate(String constiYsfaTemplate) { + this.constiYsfaTemplate = constiYsfaTemplate == null ? null : constiYsfaTemplate.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", constiCode=").append(constiCode); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append(", constiYsfaTemplate=").append(constiYsfaTemplate); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiYsfaExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiYsfaExample.java new file mode 100644 index 00000000..fdb59c07 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleConstiYsfaExample.java @@ -0,0 +1,661 @@ +package com.acupuncture.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzQmsScaleConstiYsfaExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzQmsScaleConstiYsfaExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNull() { + addCriterion("consti_code is null"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNotNull() { + addCriterion("consti_code is not null"); + return (Criteria) this; + } + + public Criteria andConstiCodeEqualTo(String value) { + addCriterion("consti_code =", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotEqualTo(String value) { + addCriterion("consti_code <>", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThan(String value) { + addCriterion("consti_code >", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThanOrEqualTo(String value) { + addCriterion("consti_code >=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThan(String value) { + addCriterion("consti_code <", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThanOrEqualTo(String value) { + addCriterion("consti_code <=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLike(String value) { + addCriterion("consti_code like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotLike(String value) { + addCriterion("consti_code not like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeIn(List values) { + addCriterion("consti_code in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotIn(List values) { + addCriterion("consti_code not in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeBetween(String value1, String value2) { + addCriterion("consti_code between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotBetween(String value1, String value2) { + addCriterion("consti_code not between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(String value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(String value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(String value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(String value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(String value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(String value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLike(String value) { + addCriterion("del_flag like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotLike(String value) { + addCriterion("del_flag not like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(String value1, String value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(String value1, String value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleExample.java new file mode 100644 index 00000000..5d7cf77f --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleExample.java @@ -0,0 +1,731 @@ +package com.acupuncture.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzQmsScaleExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzQmsScaleExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andScaleIdIsNull() { + addCriterion("scale_id is null"); + return (Criteria) this; + } + + public Criteria andScaleIdIsNotNull() { + addCriterion("scale_id is not null"); + return (Criteria) this; + } + + public Criteria andScaleIdEqualTo(Long value) { + addCriterion("scale_id =", value, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdNotEqualTo(Long value) { + addCriterion("scale_id <>", value, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdGreaterThan(Long value) { + addCriterion("scale_id >", value, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdGreaterThanOrEqualTo(Long value) { + addCriterion("scale_id >=", value, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdLessThan(Long value) { + addCriterion("scale_id <", value, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdLessThanOrEqualTo(Long value) { + addCriterion("scale_id <=", value, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdIn(List values) { + addCriterion("scale_id in", values, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdNotIn(List values) { + addCriterion("scale_id not in", values, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdBetween(Long value1, Long value2) { + addCriterion("scale_id between", value1, value2, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleIdNotBetween(Long value1, Long value2) { + addCriterion("scale_id not between", value1, value2, "scaleId"); + return (Criteria) this; + } + + public Criteria andScaleCodeIsNull() { + addCriterion("scale_code is null"); + return (Criteria) this; + } + + public Criteria andScaleCodeIsNotNull() { + addCriterion("scale_code is not null"); + return (Criteria) this; + } + + public Criteria andScaleCodeEqualTo(String value) { + addCriterion("scale_code =", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotEqualTo(String value) { + addCriterion("scale_code <>", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeGreaterThan(String value) { + addCriterion("scale_code >", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeGreaterThanOrEqualTo(String value) { + addCriterion("scale_code >=", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLessThan(String value) { + addCriterion("scale_code <", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLessThanOrEqualTo(String value) { + addCriterion("scale_code <=", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLike(String value) { + addCriterion("scale_code like", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotLike(String value) { + addCriterion("scale_code not like", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeIn(List values) { + addCriterion("scale_code in", values, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotIn(List values) { + addCriterion("scale_code not in", values, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeBetween(String value1, String value2) { + addCriterion("scale_code between", value1, value2, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotBetween(String value1, String value2) { + addCriterion("scale_code not between", value1, value2, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleNameIsNull() { + addCriterion("scale_name is null"); + return (Criteria) this; + } + + public Criteria andScaleNameIsNotNull() { + addCriterion("scale_name is not null"); + return (Criteria) this; + } + + public Criteria andScaleNameEqualTo(String value) { + addCriterion("scale_name =", value, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameNotEqualTo(String value) { + addCriterion("scale_name <>", value, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameGreaterThan(String value) { + addCriterion("scale_name >", value, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameGreaterThanOrEqualTo(String value) { + addCriterion("scale_name >=", value, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameLessThan(String value) { + addCriterion("scale_name <", value, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameLessThanOrEqualTo(String value) { + addCriterion("scale_name <=", value, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameLike(String value) { + addCriterion("scale_name like", value, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameNotLike(String value) { + addCriterion("scale_name not like", value, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameIn(List values) { + addCriterion("scale_name in", values, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameNotIn(List values) { + addCriterion("scale_name not in", values, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameBetween(String value1, String value2) { + addCriterion("scale_name between", value1, value2, "scaleName"); + return (Criteria) this; + } + + public Criteria andScaleNameNotBetween(String value1, String value2) { + addCriterion("scale_name not between", value1, value2, "scaleName"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(String value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(String value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(String value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(String value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(String value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(String value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLike(String value) { + addCriterion("del_flag like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotLike(String value) { + addCriterion("del_flag not like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(String value1, String value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(String value1, String value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestion.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestion.java new file mode 100644 index 00000000..6b60bf21 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestion.java @@ -0,0 +1,139 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.util.Date; + +public class ZytzQmsScaleQuestion implements Serializable { + private Long quesId; + + private String scaleCode; + + private String quesCode; + + private Integer quesSort; + + private String quesName; + + private String genderApply; + + private String delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getQuesId() { + return quesId; + } + + public void setQuesId(Long quesId) { + this.quesId = quesId; + } + + public String getScaleCode() { + return scaleCode; + } + + public void setScaleCode(String scaleCode) { + this.scaleCode = scaleCode == null ? null : scaleCode.trim(); + } + + public String getQuesCode() { + return quesCode; + } + + public void setQuesCode(String quesCode) { + this.quesCode = quesCode == null ? null : quesCode.trim(); + } + + public Integer getQuesSort() { + return quesSort; + } + + public void setQuesSort(Integer quesSort) { + this.quesSort = quesSort; + } + + public String getQuesName() { + return quesName; + } + + public void setQuesName(String quesName) { + this.quesName = quesName == null ? null : quesName.trim(); + } + + public String getGenderApply() { + return genderApply; + } + + public void setGenderApply(String genderApply) { + this.genderApply = genderApply == null ? null : genderApply.trim(); + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag == null ? null : delFlag.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", quesId=").append(quesId); + sb.append(", scaleCode=").append(scaleCode); + sb.append(", quesCode=").append(quesCode); + sb.append(", quesSort=").append(quesSort); + sb.append(", quesName=").append(quesName); + sb.append(", genderApply=").append(genderApply); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionExample.java new file mode 100644 index 00000000..d1320080 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionExample.java @@ -0,0 +1,931 @@ +package com.acupuncture.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzQmsScaleQuestionExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzQmsScaleQuestionExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andQuesIdIsNull() { + addCriterion("ques_id is null"); + return (Criteria) this; + } + + public Criteria andQuesIdIsNotNull() { + addCriterion("ques_id is not null"); + return (Criteria) this; + } + + public Criteria andQuesIdEqualTo(Long value) { + addCriterion("ques_id =", value, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdNotEqualTo(Long value) { + addCriterion("ques_id <>", value, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdGreaterThan(Long value) { + addCriterion("ques_id >", value, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdGreaterThanOrEqualTo(Long value) { + addCriterion("ques_id >=", value, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdLessThan(Long value) { + addCriterion("ques_id <", value, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdLessThanOrEqualTo(Long value) { + addCriterion("ques_id <=", value, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdIn(List values) { + addCriterion("ques_id in", values, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdNotIn(List values) { + addCriterion("ques_id not in", values, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdBetween(Long value1, Long value2) { + addCriterion("ques_id between", value1, value2, "quesId"); + return (Criteria) this; + } + + public Criteria andQuesIdNotBetween(Long value1, Long value2) { + addCriterion("ques_id not between", value1, value2, "quesId"); + return (Criteria) this; + } + + public Criteria andScaleCodeIsNull() { + addCriterion("scale_code is null"); + return (Criteria) this; + } + + public Criteria andScaleCodeIsNotNull() { + addCriterion("scale_code is not null"); + return (Criteria) this; + } + + public Criteria andScaleCodeEqualTo(String value) { + addCriterion("scale_code =", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotEqualTo(String value) { + addCriterion("scale_code <>", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeGreaterThan(String value) { + addCriterion("scale_code >", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeGreaterThanOrEqualTo(String value) { + addCriterion("scale_code >=", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLessThan(String value) { + addCriterion("scale_code <", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLessThanOrEqualTo(String value) { + addCriterion("scale_code <=", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeLike(String value) { + addCriterion("scale_code like", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotLike(String value) { + addCriterion("scale_code not like", value, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeIn(List values) { + addCriterion("scale_code in", values, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotIn(List values) { + addCriterion("scale_code not in", values, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeBetween(String value1, String value2) { + addCriterion("scale_code between", value1, value2, "scaleCode"); + return (Criteria) this; + } + + public Criteria andScaleCodeNotBetween(String value1, String value2) { + addCriterion("scale_code not between", value1, value2, "scaleCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeIsNull() { + addCriterion("ques_code is null"); + return (Criteria) this; + } + + public Criteria andQuesCodeIsNotNull() { + addCriterion("ques_code is not null"); + return (Criteria) this; + } + + public Criteria andQuesCodeEqualTo(String value) { + addCriterion("ques_code =", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotEqualTo(String value) { + addCriterion("ques_code <>", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeGreaterThan(String value) { + addCriterion("ques_code >", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeGreaterThanOrEqualTo(String value) { + addCriterion("ques_code >=", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLessThan(String value) { + addCriterion("ques_code <", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLessThanOrEqualTo(String value) { + addCriterion("ques_code <=", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLike(String value) { + addCriterion("ques_code like", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotLike(String value) { + addCriterion("ques_code not like", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeIn(List values) { + addCriterion("ques_code in", values, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotIn(List values) { + addCriterion("ques_code not in", values, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeBetween(String value1, String value2) { + addCriterion("ques_code between", value1, value2, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotBetween(String value1, String value2) { + addCriterion("ques_code not between", value1, value2, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesSortIsNull() { + addCriterion("ques_sort is null"); + return (Criteria) this; + } + + public Criteria andQuesSortIsNotNull() { + addCriterion("ques_sort is not null"); + return (Criteria) this; + } + + public Criteria andQuesSortEqualTo(Integer value) { + addCriterion("ques_sort =", value, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortNotEqualTo(Integer value) { + addCriterion("ques_sort <>", value, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortGreaterThan(Integer value) { + addCriterion("ques_sort >", value, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortGreaterThanOrEqualTo(Integer value) { + addCriterion("ques_sort >=", value, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortLessThan(Integer value) { + addCriterion("ques_sort <", value, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortLessThanOrEqualTo(Integer value) { + addCriterion("ques_sort <=", value, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortIn(List values) { + addCriterion("ques_sort in", values, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortNotIn(List values) { + addCriterion("ques_sort not in", values, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortBetween(Integer value1, Integer value2) { + addCriterion("ques_sort between", value1, value2, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesSortNotBetween(Integer value1, Integer value2) { + addCriterion("ques_sort not between", value1, value2, "quesSort"); + return (Criteria) this; + } + + public Criteria andQuesNameIsNull() { + addCriterion("ques_name is null"); + return (Criteria) this; + } + + public Criteria andQuesNameIsNotNull() { + addCriterion("ques_name is not null"); + return (Criteria) this; + } + + public Criteria andQuesNameEqualTo(String value) { + addCriterion("ques_name =", value, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameNotEqualTo(String value) { + addCriterion("ques_name <>", value, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameGreaterThan(String value) { + addCriterion("ques_name >", value, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameGreaterThanOrEqualTo(String value) { + addCriterion("ques_name >=", value, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameLessThan(String value) { + addCriterion("ques_name <", value, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameLessThanOrEqualTo(String value) { + addCriterion("ques_name <=", value, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameLike(String value) { + addCriterion("ques_name like", value, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameNotLike(String value) { + addCriterion("ques_name not like", value, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameIn(List values) { + addCriterion("ques_name in", values, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameNotIn(List values) { + addCriterion("ques_name not in", values, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameBetween(String value1, String value2) { + addCriterion("ques_name between", value1, value2, "quesName"); + return (Criteria) this; + } + + public Criteria andQuesNameNotBetween(String value1, String value2) { + addCriterion("ques_name not between", value1, value2, "quesName"); + return (Criteria) this; + } + + public Criteria andGenderApplyIsNull() { + addCriterion("gender_apply is null"); + return (Criteria) this; + } + + public Criteria andGenderApplyIsNotNull() { + addCriterion("gender_apply is not null"); + return (Criteria) this; + } + + public Criteria andGenderApplyEqualTo(String value) { + addCriterion("gender_apply =", value, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyNotEqualTo(String value) { + addCriterion("gender_apply <>", value, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyGreaterThan(String value) { + addCriterion("gender_apply >", value, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyGreaterThanOrEqualTo(String value) { + addCriterion("gender_apply >=", value, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyLessThan(String value) { + addCriterion("gender_apply <", value, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyLessThanOrEqualTo(String value) { + addCriterion("gender_apply <=", value, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyLike(String value) { + addCriterion("gender_apply like", value, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyNotLike(String value) { + addCriterion("gender_apply not like", value, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyIn(List values) { + addCriterion("gender_apply in", values, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyNotIn(List values) { + addCriterion("gender_apply not in", values, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyBetween(String value1, String value2) { + addCriterion("gender_apply between", value1, value2, "genderApply"); + return (Criteria) this; + } + + public Criteria andGenderApplyNotBetween(String value1, String value2) { + addCriterion("gender_apply not between", value1, value2, "genderApply"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(String value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(String value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(String value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(String value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(String value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(String value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLike(String value) { + addCriterion("del_flag like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotLike(String value) { + addCriterion("del_flag not like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(String value1, String value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(String value1, String value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionOption.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionOption.java new file mode 100644 index 00000000..af227773 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionOption.java @@ -0,0 +1,140 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class ZytzQmsScaleQuestionOption implements Serializable { + private Long optionId; + + private String quesCode; + + private String optionCode; + + private String optionName; + + private BigDecimal optionScore; + + private String optionSort; + + private String delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getOptionId() { + return optionId; + } + + public void setOptionId(Long optionId) { + this.optionId = optionId; + } + + public String getQuesCode() { + return quesCode; + } + + public void setQuesCode(String quesCode) { + this.quesCode = quesCode == null ? null : quesCode.trim(); + } + + public String getOptionCode() { + return optionCode; + } + + public void setOptionCode(String optionCode) { + this.optionCode = optionCode == null ? null : optionCode.trim(); + } + + public String getOptionName() { + return optionName; + } + + public void setOptionName(String optionName) { + this.optionName = optionName == null ? null : optionName.trim(); + } + + public BigDecimal getOptionScore() { + return optionScore; + } + + public void setOptionScore(BigDecimal optionScore) { + this.optionScore = optionScore; + } + + public String getOptionSort() { + return optionSort; + } + + public void setOptionSort(String optionSort) { + this.optionSort = optionSort == null ? null : optionSort.trim(); + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag == null ? null : delFlag.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", optionId=").append(optionId); + sb.append(", quesCode=").append(quesCode); + sb.append(", optionCode=").append(optionCode); + sb.append(", optionName=").append(optionName); + sb.append(", optionScore=").append(optionScore); + sb.append(", optionSort=").append(optionSort); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionOptionExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionOptionExample.java new file mode 100644 index 00000000..5ac0b738 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzQmsScaleQuestionOptionExample.java @@ -0,0 +1,932 @@ +package com.acupuncture.system.domain.po; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzQmsScaleQuestionOptionExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzQmsScaleQuestionOptionExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andOptionIdIsNull() { + addCriterion("option_id is null"); + return (Criteria) this; + } + + public Criteria andOptionIdIsNotNull() { + addCriterion("option_id is not null"); + return (Criteria) this; + } + + public Criteria andOptionIdEqualTo(Long value) { + addCriterion("option_id =", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdNotEqualTo(Long value) { + addCriterion("option_id <>", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdGreaterThan(Long value) { + addCriterion("option_id >", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdGreaterThanOrEqualTo(Long value) { + addCriterion("option_id >=", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdLessThan(Long value) { + addCriterion("option_id <", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdLessThanOrEqualTo(Long value) { + addCriterion("option_id <=", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdIn(List values) { + addCriterion("option_id in", values, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdNotIn(List values) { + addCriterion("option_id not in", values, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdBetween(Long value1, Long value2) { + addCriterion("option_id between", value1, value2, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdNotBetween(Long value1, Long value2) { + addCriterion("option_id not between", value1, value2, "optionId"); + return (Criteria) this; + } + + public Criteria andQuesCodeIsNull() { + addCriterion("ques_code is null"); + return (Criteria) this; + } + + public Criteria andQuesCodeIsNotNull() { + addCriterion("ques_code is not null"); + return (Criteria) this; + } + + public Criteria andQuesCodeEqualTo(String value) { + addCriterion("ques_code =", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotEqualTo(String value) { + addCriterion("ques_code <>", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeGreaterThan(String value) { + addCriterion("ques_code >", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeGreaterThanOrEqualTo(String value) { + addCriterion("ques_code >=", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLessThan(String value) { + addCriterion("ques_code <", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLessThanOrEqualTo(String value) { + addCriterion("ques_code <=", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeLike(String value) { + addCriterion("ques_code like", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotLike(String value) { + addCriterion("ques_code not like", value, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeIn(List values) { + addCriterion("ques_code in", values, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotIn(List values) { + addCriterion("ques_code not in", values, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeBetween(String value1, String value2) { + addCriterion("ques_code between", value1, value2, "quesCode"); + return (Criteria) this; + } + + public Criteria andQuesCodeNotBetween(String value1, String value2) { + addCriterion("ques_code not between", value1, value2, "quesCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeIsNull() { + addCriterion("option_code is null"); + return (Criteria) this; + } + + public Criteria andOptionCodeIsNotNull() { + addCriterion("option_code is not null"); + return (Criteria) this; + } + + public Criteria andOptionCodeEqualTo(String value) { + addCriterion("option_code =", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeNotEqualTo(String value) { + addCriterion("option_code <>", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeGreaterThan(String value) { + addCriterion("option_code >", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeGreaterThanOrEqualTo(String value) { + addCriterion("option_code >=", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeLessThan(String value) { + addCriterion("option_code <", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeLessThanOrEqualTo(String value) { + addCriterion("option_code <=", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeLike(String value) { + addCriterion("option_code like", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeNotLike(String value) { + addCriterion("option_code not like", value, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeIn(List values) { + addCriterion("option_code in", values, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeNotIn(List values) { + addCriterion("option_code not in", values, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeBetween(String value1, String value2) { + addCriterion("option_code between", value1, value2, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionCodeNotBetween(String value1, String value2) { + addCriterion("option_code not between", value1, value2, "optionCode"); + return (Criteria) this; + } + + public Criteria andOptionNameIsNull() { + addCriterion("option_name is null"); + return (Criteria) this; + } + + public Criteria andOptionNameIsNotNull() { + addCriterion("option_name is not null"); + return (Criteria) this; + } + + public Criteria andOptionNameEqualTo(String value) { + addCriterion("option_name =", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotEqualTo(String value) { + addCriterion("option_name <>", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameGreaterThan(String value) { + addCriterion("option_name >", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameGreaterThanOrEqualTo(String value) { + addCriterion("option_name >=", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLessThan(String value) { + addCriterion("option_name <", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLessThanOrEqualTo(String value) { + addCriterion("option_name <=", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLike(String value) { + addCriterion("option_name like", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotLike(String value) { + addCriterion("option_name not like", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameIn(List values) { + addCriterion("option_name in", values, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotIn(List values) { + addCriterion("option_name not in", values, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameBetween(String value1, String value2) { + addCriterion("option_name between", value1, value2, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotBetween(String value1, String value2) { + addCriterion("option_name not between", value1, value2, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionScoreIsNull() { + addCriterion("option_score is null"); + return (Criteria) this; + } + + public Criteria andOptionScoreIsNotNull() { + addCriterion("option_score is not null"); + return (Criteria) this; + } + + public Criteria andOptionScoreEqualTo(BigDecimal value) { + addCriterion("option_score =", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreNotEqualTo(BigDecimal value) { + addCriterion("option_score <>", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreGreaterThan(BigDecimal value) { + addCriterion("option_score >", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("option_score >=", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreLessThan(BigDecimal value) { + addCriterion("option_score <", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("option_score <=", value, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreIn(List values) { + addCriterion("option_score in", values, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreNotIn(List values) { + addCriterion("option_score not in", values, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("option_score between", value1, value2, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("option_score not between", value1, value2, "optionScore"); + return (Criteria) this; + } + + public Criteria andOptionSortIsNull() { + addCriterion("option_sort is null"); + return (Criteria) this; + } + + public Criteria andOptionSortIsNotNull() { + addCriterion("option_sort is not null"); + return (Criteria) this; + } + + public Criteria andOptionSortEqualTo(String value) { + addCriterion("option_sort =", value, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortNotEqualTo(String value) { + addCriterion("option_sort <>", value, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortGreaterThan(String value) { + addCriterion("option_sort >", value, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortGreaterThanOrEqualTo(String value) { + addCriterion("option_sort >=", value, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortLessThan(String value) { + addCriterion("option_sort <", value, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortLessThanOrEqualTo(String value) { + addCriterion("option_sort <=", value, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortLike(String value) { + addCriterion("option_sort like", value, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortNotLike(String value) { + addCriterion("option_sort not like", value, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortIn(List values) { + addCriterion("option_sort in", values, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortNotIn(List values) { + addCriterion("option_sort not in", values, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortBetween(String value1, String value2) { + addCriterion("option_sort between", value1, value2, "optionSort"); + return (Criteria) this; + } + + public Criteria andOptionSortNotBetween(String value1, String value2) { + addCriterion("option_sort not between", value1, value2, "optionSort"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(String value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(String value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(String value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(String value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(String value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(String value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLike(String value) { + addCriterion("del_flag like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotLike(String value) { + addCriterion("del_flag not like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(String value1, String value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(String value1, String value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReport.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReport.java new file mode 100644 index 00000000..df84b449 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReport.java @@ -0,0 +1,293 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.util.Date; + +public class ZytzRmsReport implements Serializable { + private Long reportId; + + private Long deptId; + + private Long patientId; + + private String patientName; + + private String patientAge; + + private String patientGender; + + private String patientHeight; + + private String patientWeight; + + private String patientWaistline; + + private Long evaId; + + private String evaScaleCode; + + private Date evaTime; + + private String evaUsername; + + private String evaNickname; + + private String blh; + + private String delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private String patientNamePinyin; + + private String patientNamePy; + + private String patientBirthday; + + private String patientIdcard; + + private String patientPhone; + + private static final long serialVersionUID = 1L; + + public Long getReportId() { + return reportId; + } + + public void setReportId(Long reportId) { + this.reportId = reportId; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Long getPatientId() { + return patientId; + } + + public void setPatientId(Long patientId) { + this.patientId = patientId; + } + + public String getPatientName() { + return patientName; + } + + public void setPatientName(String patientName) { + this.patientName = patientName == null ? null : patientName.trim(); + } + + public String getPatientAge() { + return patientAge; + } + + public void setPatientAge(String patientAge) { + this.patientAge = patientAge == null ? null : patientAge.trim(); + } + + public String getPatientGender() { + return patientGender; + } + + public void setPatientGender(String patientGender) { + this.patientGender = patientGender == null ? null : patientGender.trim(); + } + + public String getPatientHeight() { + return patientHeight; + } + + public void setPatientHeight(String patientHeight) { + this.patientHeight = patientHeight == null ? null : patientHeight.trim(); + } + + public String getPatientWeight() { + return patientWeight; + } + + public void setPatientWeight(String patientWeight) { + this.patientWeight = patientWeight == null ? null : patientWeight.trim(); + } + + public String getPatientWaistline() { + return patientWaistline; + } + + public void setPatientWaistline(String patientWaistline) { + this.patientWaistline = patientWaistline == null ? null : patientWaistline.trim(); + } + + public Long getEvaId() { + return evaId; + } + + public void setEvaId(Long evaId) { + this.evaId = evaId; + } + + public String getEvaScaleCode() { + return evaScaleCode; + } + + public void setEvaScaleCode(String evaScaleCode) { + this.evaScaleCode = evaScaleCode == null ? null : evaScaleCode.trim(); + } + + public Date getEvaTime() { + return evaTime; + } + + public void setEvaTime(Date evaTime) { + this.evaTime = evaTime; + } + + public String getEvaUsername() { + return evaUsername; + } + + public void setEvaUsername(String evaUsername) { + this.evaUsername = evaUsername == null ? null : evaUsername.trim(); + } + + public String getEvaNickname() { + return evaNickname; + } + + public void setEvaNickname(String evaNickname) { + this.evaNickname = evaNickname == null ? null : evaNickname.trim(); + } + + public String getBlh() { + return blh; + } + + public void setBlh(String blh) { + this.blh = blh == null ? null : blh.trim(); + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag == null ? null : delFlag.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getPatientNamePinyin() { + return patientNamePinyin; + } + + public void setPatientNamePinyin(String patientNamePinyin) { + this.patientNamePinyin = patientNamePinyin == null ? null : patientNamePinyin.trim(); + } + + public String getPatientNamePy() { + return patientNamePy; + } + + public void setPatientNamePy(String patientNamePy) { + this.patientNamePy = patientNamePy == null ? null : patientNamePy.trim(); + } + + public String getPatientBirthday() { + return patientBirthday; + } + + public void setPatientBirthday(String patientBirthday) { + this.patientBirthday = patientBirthday == null ? null : patientBirthday.trim(); + } + + public String getPatientIdcard() { + return patientIdcard; + } + + public void setPatientIdcard(String patientIdcard) { + this.patientIdcard = patientIdcard == null ? null : patientIdcard.trim(); + } + + public String getPatientPhone() { + return patientPhone; + } + + public void setPatientPhone(String patientPhone) { + this.patientPhone = patientPhone == null ? null : patientPhone.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", reportId=").append(reportId); + sb.append(", deptId=").append(deptId); + sb.append(", patientId=").append(patientId); + sb.append(", patientName=").append(patientName); + sb.append(", patientAge=").append(patientAge); + sb.append(", patientGender=").append(patientGender); + sb.append(", patientHeight=").append(patientHeight); + sb.append(", patientWeight=").append(patientWeight); + sb.append(", patientWaistline=").append(patientWaistline); + sb.append(", evaId=").append(evaId); + sb.append(", evaScaleCode=").append(evaScaleCode); + sb.append(", evaTime=").append(evaTime); + sb.append(", evaUsername=").append(evaUsername); + sb.append(", evaNickname=").append(evaNickname); + sb.append(", blh=").append(blh); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append(", patientNamePinyin=").append(patientNamePinyin); + sb.append(", patientNamePy=").append(patientNamePy); + sb.append(", patientBirthday=").append(patientBirthday); + sb.append(", patientIdcard=").append(patientIdcard); + sb.append(", patientPhone=").append(patientPhone); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportExample.java new file mode 100644 index 00000000..81cf8475 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportExample.java @@ -0,0 +1,1881 @@ +package com.acupuncture.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzRmsReportExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzRmsReportExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andReportIdIsNull() { + addCriterion("report_id is null"); + return (Criteria) this; + } + + public Criteria andReportIdIsNotNull() { + addCriterion("report_id is not null"); + return (Criteria) this; + } + + public Criteria andReportIdEqualTo(Long value) { + addCriterion("report_id =", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotEqualTo(Long value) { + addCriterion("report_id <>", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdGreaterThan(Long value) { + addCriterion("report_id >", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdGreaterThanOrEqualTo(Long value) { + addCriterion("report_id >=", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdLessThan(Long value) { + addCriterion("report_id <", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdLessThanOrEqualTo(Long value) { + addCriterion("report_id <=", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdIn(List values) { + addCriterion("report_id in", values, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotIn(List values) { + addCriterion("report_id not in", values, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdBetween(Long value1, Long value2) { + addCriterion("report_id between", value1, value2, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotBetween(Long value1, Long value2) { + addCriterion("report_id not between", value1, value2, "reportId"); + return (Criteria) this; + } + + public Criteria andDeptIdIsNull() { + addCriterion("dept_id is null"); + return (Criteria) this; + } + + public Criteria andDeptIdIsNotNull() { + addCriterion("dept_id is not null"); + return (Criteria) this; + } + + public Criteria andDeptIdEqualTo(Long value) { + addCriterion("dept_id =", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotEqualTo(Long value) { + addCriterion("dept_id <>", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdGreaterThan(Long value) { + addCriterion("dept_id >", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdGreaterThanOrEqualTo(Long value) { + addCriterion("dept_id >=", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdLessThan(Long value) { + addCriterion("dept_id <", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdLessThanOrEqualTo(Long value) { + addCriterion("dept_id <=", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdIn(List values) { + addCriterion("dept_id in", values, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotIn(List values) { + addCriterion("dept_id not in", values, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdBetween(Long value1, Long value2) { + addCriterion("dept_id between", value1, value2, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotBetween(Long value1, Long value2) { + addCriterion("dept_id not between", value1, value2, "deptId"); + return (Criteria) this; + } + + public Criteria andPatientIdIsNull() { + addCriterion("patient_id is null"); + return (Criteria) this; + } + + public Criteria andPatientIdIsNotNull() { + addCriterion("patient_id is not null"); + return (Criteria) this; + } + + public Criteria andPatientIdEqualTo(Long value) { + addCriterion("patient_id =", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotEqualTo(Long value) { + addCriterion("patient_id <>", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdGreaterThan(Long value) { + addCriterion("patient_id >", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdGreaterThanOrEqualTo(Long value) { + addCriterion("patient_id >=", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdLessThan(Long value) { + addCriterion("patient_id <", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdLessThanOrEqualTo(Long value) { + addCriterion("patient_id <=", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdIn(List values) { + addCriterion("patient_id in", values, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotIn(List values) { + addCriterion("patient_id not in", values, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdBetween(Long value1, Long value2) { + addCriterion("patient_id between", value1, value2, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotBetween(Long value1, Long value2) { + addCriterion("patient_id not between", value1, value2, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientNameIsNull() { + addCriterion("patient_name is null"); + return (Criteria) this; + } + + public Criteria andPatientNameIsNotNull() { + addCriterion("patient_name is not null"); + return (Criteria) this; + } + + public Criteria andPatientNameEqualTo(String value) { + addCriterion("patient_name =", value, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameNotEqualTo(String value) { + addCriterion("patient_name <>", value, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameGreaterThan(String value) { + addCriterion("patient_name >", value, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameGreaterThanOrEqualTo(String value) { + addCriterion("patient_name >=", value, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameLessThan(String value) { + addCriterion("patient_name <", value, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameLessThanOrEqualTo(String value) { + addCriterion("patient_name <=", value, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameLike(String value) { + addCriterion("patient_name like", value, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameNotLike(String value) { + addCriterion("patient_name not like", value, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameIn(List values) { + addCriterion("patient_name in", values, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameNotIn(List values) { + addCriterion("patient_name not in", values, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameBetween(String value1, String value2) { + addCriterion("patient_name between", value1, value2, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientNameNotBetween(String value1, String value2) { + addCriterion("patient_name not between", value1, value2, "patientName"); + return (Criteria) this; + } + + public Criteria andPatientAgeIsNull() { + addCriterion("patient_age is null"); + return (Criteria) this; + } + + public Criteria andPatientAgeIsNotNull() { + addCriterion("patient_age is not null"); + return (Criteria) this; + } + + public Criteria andPatientAgeEqualTo(String value) { + addCriterion("patient_age =", value, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeNotEqualTo(String value) { + addCriterion("patient_age <>", value, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeGreaterThan(String value) { + addCriterion("patient_age >", value, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeGreaterThanOrEqualTo(String value) { + addCriterion("patient_age >=", value, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeLessThan(String value) { + addCriterion("patient_age <", value, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeLessThanOrEqualTo(String value) { + addCriterion("patient_age <=", value, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeLike(String value) { + addCriterion("patient_age like", value, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeNotLike(String value) { + addCriterion("patient_age not like", value, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeIn(List values) { + addCriterion("patient_age in", values, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeNotIn(List values) { + addCriterion("patient_age not in", values, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeBetween(String value1, String value2) { + addCriterion("patient_age between", value1, value2, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientAgeNotBetween(String value1, String value2) { + addCriterion("patient_age not between", value1, value2, "patientAge"); + return (Criteria) this; + } + + public Criteria andPatientGenderIsNull() { + addCriterion("patient_gender is null"); + return (Criteria) this; + } + + public Criteria andPatientGenderIsNotNull() { + addCriterion("patient_gender is not null"); + return (Criteria) this; + } + + public Criteria andPatientGenderEqualTo(String value) { + addCriterion("patient_gender =", value, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderNotEqualTo(String value) { + addCriterion("patient_gender <>", value, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderGreaterThan(String value) { + addCriterion("patient_gender >", value, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderGreaterThanOrEqualTo(String value) { + addCriterion("patient_gender >=", value, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderLessThan(String value) { + addCriterion("patient_gender <", value, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderLessThanOrEqualTo(String value) { + addCriterion("patient_gender <=", value, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderLike(String value) { + addCriterion("patient_gender like", value, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderNotLike(String value) { + addCriterion("patient_gender not like", value, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderIn(List values) { + addCriterion("patient_gender in", values, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderNotIn(List values) { + addCriterion("patient_gender not in", values, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderBetween(String value1, String value2) { + addCriterion("patient_gender between", value1, value2, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientGenderNotBetween(String value1, String value2) { + addCriterion("patient_gender not between", value1, value2, "patientGender"); + return (Criteria) this; + } + + public Criteria andPatientHeightIsNull() { + addCriterion("patient_height is null"); + return (Criteria) this; + } + + public Criteria andPatientHeightIsNotNull() { + addCriterion("patient_height is not null"); + return (Criteria) this; + } + + public Criteria andPatientHeightEqualTo(String value) { + addCriterion("patient_height =", value, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightNotEqualTo(String value) { + addCriterion("patient_height <>", value, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightGreaterThan(String value) { + addCriterion("patient_height >", value, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightGreaterThanOrEqualTo(String value) { + addCriterion("patient_height >=", value, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightLessThan(String value) { + addCriterion("patient_height <", value, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightLessThanOrEqualTo(String value) { + addCriterion("patient_height <=", value, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightLike(String value) { + addCriterion("patient_height like", value, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightNotLike(String value) { + addCriterion("patient_height not like", value, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightIn(List values) { + addCriterion("patient_height in", values, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightNotIn(List values) { + addCriterion("patient_height not in", values, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightBetween(String value1, String value2) { + addCriterion("patient_height between", value1, value2, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientHeightNotBetween(String value1, String value2) { + addCriterion("patient_height not between", value1, value2, "patientHeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightIsNull() { + addCriterion("patient_weight is null"); + return (Criteria) this; + } + + public Criteria andPatientWeightIsNotNull() { + addCriterion("patient_weight is not null"); + return (Criteria) this; + } + + public Criteria andPatientWeightEqualTo(String value) { + addCriterion("patient_weight =", value, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightNotEqualTo(String value) { + addCriterion("patient_weight <>", value, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightGreaterThan(String value) { + addCriterion("patient_weight >", value, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightGreaterThanOrEqualTo(String value) { + addCriterion("patient_weight >=", value, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightLessThan(String value) { + addCriterion("patient_weight <", value, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightLessThanOrEqualTo(String value) { + addCriterion("patient_weight <=", value, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightLike(String value) { + addCriterion("patient_weight like", value, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightNotLike(String value) { + addCriterion("patient_weight not like", value, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightIn(List values) { + addCriterion("patient_weight in", values, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightNotIn(List values) { + addCriterion("patient_weight not in", values, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightBetween(String value1, String value2) { + addCriterion("patient_weight between", value1, value2, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWeightNotBetween(String value1, String value2) { + addCriterion("patient_weight not between", value1, value2, "patientWeight"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineIsNull() { + addCriterion("patient_waistline is null"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineIsNotNull() { + addCriterion("patient_waistline is not null"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineEqualTo(String value) { + addCriterion("patient_waistline =", value, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineNotEqualTo(String value) { + addCriterion("patient_waistline <>", value, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineGreaterThan(String value) { + addCriterion("patient_waistline >", value, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineGreaterThanOrEqualTo(String value) { + addCriterion("patient_waistline >=", value, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineLessThan(String value) { + addCriterion("patient_waistline <", value, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineLessThanOrEqualTo(String value) { + addCriterion("patient_waistline <=", value, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineLike(String value) { + addCriterion("patient_waistline like", value, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineNotLike(String value) { + addCriterion("patient_waistline not like", value, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineIn(List values) { + addCriterion("patient_waistline in", values, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineNotIn(List values) { + addCriterion("patient_waistline not in", values, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineBetween(String value1, String value2) { + addCriterion("patient_waistline between", value1, value2, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andPatientWaistlineNotBetween(String value1, String value2) { + addCriterion("patient_waistline not between", value1, value2, "patientWaistline"); + return (Criteria) this; + } + + public Criteria andEvaIdIsNull() { + addCriterion("eva_id is null"); + return (Criteria) this; + } + + public Criteria andEvaIdIsNotNull() { + addCriterion("eva_id is not null"); + return (Criteria) this; + } + + public Criteria andEvaIdEqualTo(Long value) { + addCriterion("eva_id =", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdNotEqualTo(Long value) { + addCriterion("eva_id <>", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdGreaterThan(Long value) { + addCriterion("eva_id >", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdGreaterThanOrEqualTo(Long value) { + addCriterion("eva_id >=", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdLessThan(Long value) { + addCriterion("eva_id <", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdLessThanOrEqualTo(Long value) { + addCriterion("eva_id <=", value, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdIn(List values) { + addCriterion("eva_id in", values, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdNotIn(List values) { + addCriterion("eva_id not in", values, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdBetween(Long value1, Long value2) { + addCriterion("eva_id between", value1, value2, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaIdNotBetween(Long value1, Long value2) { + addCriterion("eva_id not between", value1, value2, "evaId"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeIsNull() { + addCriterion("eva_scale_code is null"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeIsNotNull() { + addCriterion("eva_scale_code is not null"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeEqualTo(String value) { + addCriterion("eva_scale_code =", value, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeNotEqualTo(String value) { + addCriterion("eva_scale_code <>", value, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeGreaterThan(String value) { + addCriterion("eva_scale_code >", value, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeGreaterThanOrEqualTo(String value) { + addCriterion("eva_scale_code >=", value, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeLessThan(String value) { + addCriterion("eva_scale_code <", value, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeLessThanOrEqualTo(String value) { + addCriterion("eva_scale_code <=", value, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeLike(String value) { + addCriterion("eva_scale_code like", value, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeNotLike(String value) { + addCriterion("eva_scale_code not like", value, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeIn(List values) { + addCriterion("eva_scale_code in", values, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeNotIn(List values) { + addCriterion("eva_scale_code not in", values, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeBetween(String value1, String value2) { + addCriterion("eva_scale_code between", value1, value2, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaScaleCodeNotBetween(String value1, String value2) { + addCriterion("eva_scale_code not between", value1, value2, "evaScaleCode"); + return (Criteria) this; + } + + public Criteria andEvaTimeIsNull() { + addCriterion("eva_time is null"); + return (Criteria) this; + } + + public Criteria andEvaTimeIsNotNull() { + addCriterion("eva_time is not null"); + return (Criteria) this; + } + + public Criteria andEvaTimeEqualTo(Date value) { + addCriterion("eva_time =", value, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeNotEqualTo(Date value) { + addCriterion("eva_time <>", value, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeGreaterThan(Date value) { + addCriterion("eva_time >", value, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeGreaterThanOrEqualTo(Date value) { + addCriterion("eva_time >=", value, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeLessThan(Date value) { + addCriterion("eva_time <", value, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeLessThanOrEqualTo(Date value) { + addCriterion("eva_time <=", value, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeIn(List values) { + addCriterion("eva_time in", values, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeNotIn(List values) { + addCriterion("eva_time not in", values, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeBetween(Date value1, Date value2) { + addCriterion("eva_time between", value1, value2, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaTimeNotBetween(Date value1, Date value2) { + addCriterion("eva_time not between", value1, value2, "evaTime"); + return (Criteria) this; + } + + public Criteria andEvaUsernameIsNull() { + addCriterion("eva_username is null"); + return (Criteria) this; + } + + public Criteria andEvaUsernameIsNotNull() { + addCriterion("eva_username is not null"); + return (Criteria) this; + } + + public Criteria andEvaUsernameEqualTo(String value) { + addCriterion("eva_username =", value, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameNotEqualTo(String value) { + addCriterion("eva_username <>", value, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameGreaterThan(String value) { + addCriterion("eva_username >", value, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameGreaterThanOrEqualTo(String value) { + addCriterion("eva_username >=", value, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameLessThan(String value) { + addCriterion("eva_username <", value, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameLessThanOrEqualTo(String value) { + addCriterion("eva_username <=", value, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameLike(String value) { + addCriterion("eva_username like", value, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameNotLike(String value) { + addCriterion("eva_username not like", value, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameIn(List values) { + addCriterion("eva_username in", values, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameNotIn(List values) { + addCriterion("eva_username not in", values, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameBetween(String value1, String value2) { + addCriterion("eva_username between", value1, value2, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaUsernameNotBetween(String value1, String value2) { + addCriterion("eva_username not between", value1, value2, "evaUsername"); + return (Criteria) this; + } + + public Criteria andEvaNicknameIsNull() { + addCriterion("eva_nickname is null"); + return (Criteria) this; + } + + public Criteria andEvaNicknameIsNotNull() { + addCriterion("eva_nickname is not null"); + return (Criteria) this; + } + + public Criteria andEvaNicknameEqualTo(String value) { + addCriterion("eva_nickname =", value, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameNotEqualTo(String value) { + addCriterion("eva_nickname <>", value, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameGreaterThan(String value) { + addCriterion("eva_nickname >", value, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameGreaterThanOrEqualTo(String value) { + addCriterion("eva_nickname >=", value, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameLessThan(String value) { + addCriterion("eva_nickname <", value, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameLessThanOrEqualTo(String value) { + addCriterion("eva_nickname <=", value, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameLike(String value) { + addCriterion("eva_nickname like", value, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameNotLike(String value) { + addCriterion("eva_nickname not like", value, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameIn(List values) { + addCriterion("eva_nickname in", values, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameNotIn(List values) { + addCriterion("eva_nickname not in", values, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameBetween(String value1, String value2) { + addCriterion("eva_nickname between", value1, value2, "evaNickname"); + return (Criteria) this; + } + + public Criteria andEvaNicknameNotBetween(String value1, String value2) { + addCriterion("eva_nickname not between", value1, value2, "evaNickname"); + return (Criteria) this; + } + + public Criteria andBlhIsNull() { + addCriterion("blh is null"); + return (Criteria) this; + } + + public Criteria andBlhIsNotNull() { + addCriterion("blh is not null"); + return (Criteria) this; + } + + public Criteria andBlhEqualTo(String value) { + addCriterion("blh =", value, "blh"); + return (Criteria) this; + } + + public Criteria andBlhNotEqualTo(String value) { + addCriterion("blh <>", value, "blh"); + return (Criteria) this; + } + + public Criteria andBlhGreaterThan(String value) { + addCriterion("blh >", value, "blh"); + return (Criteria) this; + } + + public Criteria andBlhGreaterThanOrEqualTo(String value) { + addCriterion("blh >=", value, "blh"); + return (Criteria) this; + } + + public Criteria andBlhLessThan(String value) { + addCriterion("blh <", value, "blh"); + return (Criteria) this; + } + + public Criteria andBlhLessThanOrEqualTo(String value) { + addCriterion("blh <=", value, "blh"); + return (Criteria) this; + } + + public Criteria andBlhLike(String value) { + addCriterion("blh like", value, "blh"); + return (Criteria) this; + } + + public Criteria andBlhNotLike(String value) { + addCriterion("blh not like", value, "blh"); + return (Criteria) this; + } + + public Criteria andBlhIn(List values) { + addCriterion("blh in", values, "blh"); + return (Criteria) this; + } + + public Criteria andBlhNotIn(List values) { + addCriterion("blh not in", values, "blh"); + return (Criteria) this; + } + + public Criteria andBlhBetween(String value1, String value2) { + addCriterion("blh between", value1, value2, "blh"); + return (Criteria) this; + } + + public Criteria andBlhNotBetween(String value1, String value2) { + addCriterion("blh not between", value1, value2, "blh"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(String value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(String value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(String value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(String value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(String value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(String value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLike(String value) { + addCriterion("del_flag like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotLike(String value) { + addCriterion("del_flag not like", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(String value1, String value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(String value1, String value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinIsNull() { + addCriterion("patient_name_pinyin is null"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinIsNotNull() { + addCriterion("patient_name_pinyin is not null"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinEqualTo(String value) { + addCriterion("patient_name_pinyin =", value, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinNotEqualTo(String value) { + addCriterion("patient_name_pinyin <>", value, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinGreaterThan(String value) { + addCriterion("patient_name_pinyin >", value, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinGreaterThanOrEqualTo(String value) { + addCriterion("patient_name_pinyin >=", value, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinLessThan(String value) { + addCriterion("patient_name_pinyin <", value, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinLessThanOrEqualTo(String value) { + addCriterion("patient_name_pinyin <=", value, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinLike(String value) { + addCriterion("patient_name_pinyin like", value, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinNotLike(String value) { + addCriterion("patient_name_pinyin not like", value, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinIn(List values) { + addCriterion("patient_name_pinyin in", values, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinNotIn(List values) { + addCriterion("patient_name_pinyin not in", values, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinBetween(String value1, String value2) { + addCriterion("patient_name_pinyin between", value1, value2, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePinyinNotBetween(String value1, String value2) { + addCriterion("patient_name_pinyin not between", value1, value2, "patientNamePinyin"); + return (Criteria) this; + } + + public Criteria andPatientNamePyIsNull() { + addCriterion("patient_name_py is null"); + return (Criteria) this; + } + + public Criteria andPatientNamePyIsNotNull() { + addCriterion("patient_name_py is not null"); + return (Criteria) this; + } + + public Criteria andPatientNamePyEqualTo(String value) { + addCriterion("patient_name_py =", value, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyNotEqualTo(String value) { + addCriterion("patient_name_py <>", value, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyGreaterThan(String value) { + addCriterion("patient_name_py >", value, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyGreaterThanOrEqualTo(String value) { + addCriterion("patient_name_py >=", value, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyLessThan(String value) { + addCriterion("patient_name_py <", value, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyLessThanOrEqualTo(String value) { + addCriterion("patient_name_py <=", value, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyLike(String value) { + addCriterion("patient_name_py like", value, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyNotLike(String value) { + addCriterion("patient_name_py not like", value, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyIn(List values) { + addCriterion("patient_name_py in", values, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyNotIn(List values) { + addCriterion("patient_name_py not in", values, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyBetween(String value1, String value2) { + addCriterion("patient_name_py between", value1, value2, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientNamePyNotBetween(String value1, String value2) { + addCriterion("patient_name_py not between", value1, value2, "patientNamePy"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayIsNull() { + addCriterion("patient_birthday is null"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayIsNotNull() { + addCriterion("patient_birthday is not null"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayEqualTo(String value) { + addCriterion("patient_birthday =", value, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayNotEqualTo(String value) { + addCriterion("patient_birthday <>", value, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayGreaterThan(String value) { + addCriterion("patient_birthday >", value, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayGreaterThanOrEqualTo(String value) { + addCriterion("patient_birthday >=", value, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayLessThan(String value) { + addCriterion("patient_birthday <", value, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayLessThanOrEqualTo(String value) { + addCriterion("patient_birthday <=", value, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayLike(String value) { + addCriterion("patient_birthday like", value, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayNotLike(String value) { + addCriterion("patient_birthday not like", value, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayIn(List values) { + addCriterion("patient_birthday in", values, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayNotIn(List values) { + addCriterion("patient_birthday not in", values, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayBetween(String value1, String value2) { + addCriterion("patient_birthday between", value1, value2, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientBirthdayNotBetween(String value1, String value2) { + addCriterion("patient_birthday not between", value1, value2, "patientBirthday"); + return (Criteria) this; + } + + public Criteria andPatientIdcardIsNull() { + addCriterion("patient_idcard is null"); + return (Criteria) this; + } + + public Criteria andPatientIdcardIsNotNull() { + addCriterion("patient_idcard is not null"); + return (Criteria) this; + } + + public Criteria andPatientIdcardEqualTo(String value) { + addCriterion("patient_idcard =", value, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardNotEqualTo(String value) { + addCriterion("patient_idcard <>", value, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardGreaterThan(String value) { + addCriterion("patient_idcard >", value, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardGreaterThanOrEqualTo(String value) { + addCriterion("patient_idcard >=", value, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardLessThan(String value) { + addCriterion("patient_idcard <", value, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardLessThanOrEqualTo(String value) { + addCriterion("patient_idcard <=", value, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardLike(String value) { + addCriterion("patient_idcard like", value, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardNotLike(String value) { + addCriterion("patient_idcard not like", value, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardIn(List values) { + addCriterion("patient_idcard in", values, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardNotIn(List values) { + addCriterion("patient_idcard not in", values, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardBetween(String value1, String value2) { + addCriterion("patient_idcard between", value1, value2, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientIdcardNotBetween(String value1, String value2) { + addCriterion("patient_idcard not between", value1, value2, "patientIdcard"); + return (Criteria) this; + } + + public Criteria andPatientPhoneIsNull() { + addCriterion("patient_phone is null"); + return (Criteria) this; + } + + public Criteria andPatientPhoneIsNotNull() { + addCriterion("patient_phone is not null"); + return (Criteria) this; + } + + public Criteria andPatientPhoneEqualTo(String value) { + addCriterion("patient_phone =", value, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneNotEqualTo(String value) { + addCriterion("patient_phone <>", value, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneGreaterThan(String value) { + addCriterion("patient_phone >", value, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneGreaterThanOrEqualTo(String value) { + addCriterion("patient_phone >=", value, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneLessThan(String value) { + addCriterion("patient_phone <", value, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneLessThanOrEqualTo(String value) { + addCriterion("patient_phone <=", value, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneLike(String value) { + addCriterion("patient_phone like", value, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneNotLike(String value) { + addCriterion("patient_phone not like", value, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneIn(List values) { + addCriterion("patient_phone in", values, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneNotIn(List values) { + addCriterion("patient_phone not in", values, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneBetween(String value1, String value2) { + addCriterion("patient_phone between", value1, value2, "patientPhone"); + return (Criteria) this; + } + + public Criteria andPatientPhoneNotBetween(String value1, String value2) { + addCriterion("patient_phone not between", value1, value2, "patientPhone"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportResult.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportResult.java new file mode 100644 index 00000000..827f5644 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportResult.java @@ -0,0 +1,140 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class ZytzRmsReportResult implements Serializable { + private Long resultId; + + private Long reportId; + + private String constiCode; + + private String constiName; + + private String constiLevel; + + private BigDecimal constiScore; + + private Integer mainFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getResultId() { + return resultId; + } + + public void setResultId(Long resultId) { + this.resultId = resultId; + } + + public Long getReportId() { + return reportId; + } + + public void setReportId(Long reportId) { + this.reportId = reportId; + } + + public String getConstiCode() { + return constiCode; + } + + public void setConstiCode(String constiCode) { + this.constiCode = constiCode == null ? null : constiCode.trim(); + } + + public String getConstiName() { + return constiName; + } + + public void setConstiName(String constiName) { + this.constiName = constiName == null ? null : constiName.trim(); + } + + public String getConstiLevel() { + return constiLevel; + } + + public void setConstiLevel(String constiLevel) { + this.constiLevel = constiLevel == null ? null : constiLevel.trim(); + } + + public BigDecimal getConstiScore() { + return constiScore; + } + + public void setConstiScore(BigDecimal constiScore) { + this.constiScore = constiScore; + } + + public Integer getMainFlag() { + return mainFlag; + } + + public void setMainFlag(Integer mainFlag) { + this.mainFlag = mainFlag; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", resultId=").append(resultId); + sb.append(", reportId=").append(reportId); + sb.append(", constiCode=").append(constiCode); + sb.append(", constiName=").append(constiName); + sb.append(", constiLevel=").append(constiLevel); + sb.append(", constiScore=").append(constiScore); + sb.append(", mainFlag=").append(mainFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportResultExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportResultExample.java new file mode 100644 index 00000000..35e1dd7b --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportResultExample.java @@ -0,0 +1,912 @@ +package com.acupuncture.system.domain.po; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzRmsReportResultExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzRmsReportResultExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andResultIdIsNull() { + addCriterion("result_id is null"); + return (Criteria) this; + } + + public Criteria andResultIdIsNotNull() { + addCriterion("result_id is not null"); + return (Criteria) this; + } + + public Criteria andResultIdEqualTo(Long value) { + addCriterion("result_id =", value, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdNotEqualTo(Long value) { + addCriterion("result_id <>", value, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdGreaterThan(Long value) { + addCriterion("result_id >", value, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdGreaterThanOrEqualTo(Long value) { + addCriterion("result_id >=", value, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdLessThan(Long value) { + addCriterion("result_id <", value, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdLessThanOrEqualTo(Long value) { + addCriterion("result_id <=", value, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdIn(List values) { + addCriterion("result_id in", values, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdNotIn(List values) { + addCriterion("result_id not in", values, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdBetween(Long value1, Long value2) { + addCriterion("result_id between", value1, value2, "resultId"); + return (Criteria) this; + } + + public Criteria andResultIdNotBetween(Long value1, Long value2) { + addCriterion("result_id not between", value1, value2, "resultId"); + return (Criteria) this; + } + + public Criteria andReportIdIsNull() { + addCriterion("report_id is null"); + return (Criteria) this; + } + + public Criteria andReportIdIsNotNull() { + addCriterion("report_id is not null"); + return (Criteria) this; + } + + public Criteria andReportIdEqualTo(Long value) { + addCriterion("report_id =", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotEqualTo(Long value) { + addCriterion("report_id <>", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdGreaterThan(Long value) { + addCriterion("report_id >", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdGreaterThanOrEqualTo(Long value) { + addCriterion("report_id >=", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdLessThan(Long value) { + addCriterion("report_id <", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdLessThanOrEqualTo(Long value) { + addCriterion("report_id <=", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdIn(List values) { + addCriterion("report_id in", values, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotIn(List values) { + addCriterion("report_id not in", values, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdBetween(Long value1, Long value2) { + addCriterion("report_id between", value1, value2, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotBetween(Long value1, Long value2) { + addCriterion("report_id not between", value1, value2, "reportId"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNull() { + addCriterion("consti_code is null"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNotNull() { + addCriterion("consti_code is not null"); + return (Criteria) this; + } + + public Criteria andConstiCodeEqualTo(String value) { + addCriterion("consti_code =", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotEqualTo(String value) { + addCriterion("consti_code <>", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThan(String value) { + addCriterion("consti_code >", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThanOrEqualTo(String value) { + addCriterion("consti_code >=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThan(String value) { + addCriterion("consti_code <", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThanOrEqualTo(String value) { + addCriterion("consti_code <=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLike(String value) { + addCriterion("consti_code like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotLike(String value) { + addCriterion("consti_code not like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeIn(List values) { + addCriterion("consti_code in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotIn(List values) { + addCriterion("consti_code not in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeBetween(String value1, String value2) { + addCriterion("consti_code between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotBetween(String value1, String value2) { + addCriterion("consti_code not between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiNameIsNull() { + addCriterion("consti_name is null"); + return (Criteria) this; + } + + public Criteria andConstiNameIsNotNull() { + addCriterion("consti_name is not null"); + return (Criteria) this; + } + + public Criteria andConstiNameEqualTo(String value) { + addCriterion("consti_name =", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotEqualTo(String value) { + addCriterion("consti_name <>", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameGreaterThan(String value) { + addCriterion("consti_name >", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameGreaterThanOrEqualTo(String value) { + addCriterion("consti_name >=", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLessThan(String value) { + addCriterion("consti_name <", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLessThanOrEqualTo(String value) { + addCriterion("consti_name <=", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLike(String value) { + addCriterion("consti_name like", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotLike(String value) { + addCriterion("consti_name not like", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameIn(List values) { + addCriterion("consti_name in", values, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotIn(List values) { + addCriterion("consti_name not in", values, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameBetween(String value1, String value2) { + addCriterion("consti_name between", value1, value2, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotBetween(String value1, String value2) { + addCriterion("consti_name not between", value1, value2, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiLevelIsNull() { + addCriterion("consti_level is null"); + return (Criteria) this; + } + + public Criteria andConstiLevelIsNotNull() { + addCriterion("consti_level is not null"); + return (Criteria) this; + } + + public Criteria andConstiLevelEqualTo(String value) { + addCriterion("consti_level =", value, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelNotEqualTo(String value) { + addCriterion("consti_level <>", value, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelGreaterThan(String value) { + addCriterion("consti_level >", value, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelGreaterThanOrEqualTo(String value) { + addCriterion("consti_level >=", value, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelLessThan(String value) { + addCriterion("consti_level <", value, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelLessThanOrEqualTo(String value) { + addCriterion("consti_level <=", value, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelLike(String value) { + addCriterion("consti_level like", value, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelNotLike(String value) { + addCriterion("consti_level not like", value, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelIn(List values) { + addCriterion("consti_level in", values, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelNotIn(List values) { + addCriterion("consti_level not in", values, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelBetween(String value1, String value2) { + addCriterion("consti_level between", value1, value2, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiLevelNotBetween(String value1, String value2) { + addCriterion("consti_level not between", value1, value2, "constiLevel"); + return (Criteria) this; + } + + public Criteria andConstiScoreIsNull() { + addCriterion("consti_score is null"); + return (Criteria) this; + } + + public Criteria andConstiScoreIsNotNull() { + addCriterion("consti_score is not null"); + return (Criteria) this; + } + + public Criteria andConstiScoreEqualTo(BigDecimal value) { + addCriterion("consti_score =", value, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreNotEqualTo(BigDecimal value) { + addCriterion("consti_score <>", value, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreGreaterThan(BigDecimal value) { + addCriterion("consti_score >", value, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("consti_score >=", value, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreLessThan(BigDecimal value) { + addCriterion("consti_score <", value, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("consti_score <=", value, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreIn(List values) { + addCriterion("consti_score in", values, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreNotIn(List values) { + addCriterion("consti_score not in", values, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("consti_score between", value1, value2, "constiScore"); + return (Criteria) this; + } + + public Criteria andConstiScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("consti_score not between", value1, value2, "constiScore"); + return (Criteria) this; + } + + public Criteria andMainFlagIsNull() { + addCriterion("main_flag is null"); + return (Criteria) this; + } + + public Criteria andMainFlagIsNotNull() { + addCriterion("main_flag is not null"); + return (Criteria) this; + } + + public Criteria andMainFlagEqualTo(Integer value) { + addCriterion("main_flag =", value, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagNotEqualTo(Integer value) { + addCriterion("main_flag <>", value, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagGreaterThan(Integer value) { + addCriterion("main_flag >", value, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagGreaterThanOrEqualTo(Integer value) { + addCriterion("main_flag >=", value, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagLessThan(Integer value) { + addCriterion("main_flag <", value, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagLessThanOrEqualTo(Integer value) { + addCriterion("main_flag <=", value, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagIn(List values) { + addCriterion("main_flag in", values, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagNotIn(List values) { + addCriterion("main_flag not in", values, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagBetween(Integer value1, Integer value2) { + addCriterion("main_flag between", value1, value2, "mainFlag"); + return (Criteria) this; + } + + public Criteria andMainFlagNotBetween(Integer value1, Integer value2) { + addCriterion("main_flag not between", value1, value2, "mainFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportYsjy.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportYsjy.java new file mode 100644 index 00000000..e4f79db2 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportYsjy.java @@ -0,0 +1,117 @@ +package com.acupuncture.system.domain.po; + +import java.io.Serializable; +import java.util.Date; + +public class ZytzRmsReportYsjy implements Serializable { + private Long ysjyId; + + private Long reportId; + + private String constiCode; + + private String constiName; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private String constiYsjy; + + private static final long serialVersionUID = 1L; + + public Long getYsjyId() { + return ysjyId; + } + + public void setYsjyId(Long ysjyId) { + this.ysjyId = ysjyId; + } + + public Long getReportId() { + return reportId; + } + + public void setReportId(Long reportId) { + this.reportId = reportId; + } + + public String getConstiCode() { + return constiCode; + } + + public void setConstiCode(String constiCode) { + this.constiCode = constiCode == null ? null : constiCode.trim(); + } + + public String getConstiName() { + return constiName; + } + + public void setConstiName(String constiName) { + this.constiName = constiName == null ? null : constiName.trim(); + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getConstiYsjy() { + return constiYsjy; + } + + public void setConstiYsjy(String constiYsjy) { + this.constiYsjy = constiYsjy == null ? null : constiYsjy.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", ysjyId=").append(ysjyId); + sb.append(", reportId=").append(reportId); + sb.append(", constiCode=").append(constiCode); + sb.append(", constiName=").append(constiName); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append(", constiYsjy=").append(constiYsjy); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportYsjyExample.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportYsjyExample.java new file mode 100644 index 00000000..dae1a064 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/po/ZytzRmsReportYsjyExample.java @@ -0,0 +1,721 @@ +package com.acupuncture.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ZytzRmsReportYsjyExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ZytzRmsReportYsjyExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andYsjyIdIsNull() { + addCriterion("ysjy_id is null"); + return (Criteria) this; + } + + public Criteria andYsjyIdIsNotNull() { + addCriterion("ysjy_id is not null"); + return (Criteria) this; + } + + public Criteria andYsjyIdEqualTo(Long value) { + addCriterion("ysjy_id =", value, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdNotEqualTo(Long value) { + addCriterion("ysjy_id <>", value, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdGreaterThan(Long value) { + addCriterion("ysjy_id >", value, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdGreaterThanOrEqualTo(Long value) { + addCriterion("ysjy_id >=", value, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdLessThan(Long value) { + addCriterion("ysjy_id <", value, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdLessThanOrEqualTo(Long value) { + addCriterion("ysjy_id <=", value, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdIn(List values) { + addCriterion("ysjy_id in", values, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdNotIn(List values) { + addCriterion("ysjy_id not in", values, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdBetween(Long value1, Long value2) { + addCriterion("ysjy_id between", value1, value2, "ysjyId"); + return (Criteria) this; + } + + public Criteria andYsjyIdNotBetween(Long value1, Long value2) { + addCriterion("ysjy_id not between", value1, value2, "ysjyId"); + return (Criteria) this; + } + + public Criteria andReportIdIsNull() { + addCriterion("report_id is null"); + return (Criteria) this; + } + + public Criteria andReportIdIsNotNull() { + addCriterion("report_id is not null"); + return (Criteria) this; + } + + public Criteria andReportIdEqualTo(Long value) { + addCriterion("report_id =", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotEqualTo(Long value) { + addCriterion("report_id <>", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdGreaterThan(Long value) { + addCriterion("report_id >", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdGreaterThanOrEqualTo(Long value) { + addCriterion("report_id >=", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdLessThan(Long value) { + addCriterion("report_id <", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdLessThanOrEqualTo(Long value) { + addCriterion("report_id <=", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdIn(List values) { + addCriterion("report_id in", values, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotIn(List values) { + addCriterion("report_id not in", values, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdBetween(Long value1, Long value2) { + addCriterion("report_id between", value1, value2, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotBetween(Long value1, Long value2) { + addCriterion("report_id not between", value1, value2, "reportId"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNull() { + addCriterion("consti_code is null"); + return (Criteria) this; + } + + public Criteria andConstiCodeIsNotNull() { + addCriterion("consti_code is not null"); + return (Criteria) this; + } + + public Criteria andConstiCodeEqualTo(String value) { + addCriterion("consti_code =", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotEqualTo(String value) { + addCriterion("consti_code <>", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThan(String value) { + addCriterion("consti_code >", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeGreaterThanOrEqualTo(String value) { + addCriterion("consti_code >=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThan(String value) { + addCriterion("consti_code <", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLessThanOrEqualTo(String value) { + addCriterion("consti_code <=", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeLike(String value) { + addCriterion("consti_code like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotLike(String value) { + addCriterion("consti_code not like", value, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeIn(List values) { + addCriterion("consti_code in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotIn(List values) { + addCriterion("consti_code not in", values, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeBetween(String value1, String value2) { + addCriterion("consti_code between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiCodeNotBetween(String value1, String value2) { + addCriterion("consti_code not between", value1, value2, "constiCode"); + return (Criteria) this; + } + + public Criteria andConstiNameIsNull() { + addCriterion("consti_name is null"); + return (Criteria) this; + } + + public Criteria andConstiNameIsNotNull() { + addCriterion("consti_name is not null"); + return (Criteria) this; + } + + public Criteria andConstiNameEqualTo(String value) { + addCriterion("consti_name =", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotEqualTo(String value) { + addCriterion("consti_name <>", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameGreaterThan(String value) { + addCriterion("consti_name >", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameGreaterThanOrEqualTo(String value) { + addCriterion("consti_name >=", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLessThan(String value) { + addCriterion("consti_name <", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLessThanOrEqualTo(String value) { + addCriterion("consti_name <=", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameLike(String value) { + addCriterion("consti_name like", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotLike(String value) { + addCriterion("consti_name not like", value, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameIn(List values) { + addCriterion("consti_name in", values, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotIn(List values) { + addCriterion("consti_name not in", values, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameBetween(String value1, String value2) { + addCriterion("consti_name between", value1, value2, "constiName"); + return (Criteria) this; + } + + public Criteria andConstiNameNotBetween(String value1, String value2) { + addCriterion("consti_name not between", value1, value2, "constiName"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminStatisticsVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminStatisticsVo.java index 0709dd24..40dfcb59 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminStatisticsVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminStatisticsVo.java @@ -352,6 +352,14 @@ public class AdminStatisticsVo { } } + @Data + @ApiModel("") + public static class ZlfyResultVo { + private Long id; + private String answer; + + } + @Data @ApiModel("随访分布") public static class SffbVo { diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminTenantUserVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminTenantUserVo.java index 51dc94f1..2f226788 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminTenantUserVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/AdminTenantUserVo.java @@ -38,6 +38,8 @@ public class AdminTenantUserVo { private Date createTime; private String tenantName; + + private Byte slaverAdmin; } } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java index afe90674..ed890aed 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java @@ -22,8 +22,10 @@ public class DmsLoginUserVo { } @Data public static class DmsUserVo { - private Integer id; + private Long id; private Long tenantId; + private String tenantName; + private String tenantPhone; private String userName; private String password; @@ -33,6 +35,7 @@ public class DmsLoginUserVo { private String email; private String phonenumber; + private Byte slaverAdmin; private String sex; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/ExternalVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/ExternalVo.java index 67116276..b0b38011 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/ExternalVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/ExternalVo.java @@ -13,15 +13,15 @@ public class ExternalVo { @Data public static class Result{ - private String message; + private String message = "bcaUser"; private String gid; private String memberid; - private String testId; +// private String testId; - private String testDate; +// private String testDate; private String name; @@ -31,8 +31,18 @@ public class ExternalVo { private String birthYear; - private String weight; +// private String weight; private String phone; + + public String getSex() { + if ("0".equals(sex)) { + return "1"; + } + if ("1".equals(sex)) { + return "2"; + } + return sex; + } } @Data diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupVo.java index d0205ebe..e8ccfd7b 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupVo.java @@ -123,6 +123,7 @@ public class FmsFollowupVo { private Date updateTime; private String remark; private String queueName; + private Long queueId; private String tenantName; @ApiModelProperty("随访窗口期") private Integer followWindowAdys; @@ -132,6 +133,9 @@ public class FmsFollowupVo { public Integer getStatus() { + if (status == null) { + return 0; + } if (status == 2){ return status; } @@ -143,6 +147,9 @@ public class FmsFollowupVo { return 4; } if (startTime != null) { + if (remindTime == null) { + return status; + } //判断是否临近随访时间 开始时间 + 临近提醒时间 < 当前时间 Calendar instance = Calendar.getInstance(); instance.setTime(startTime); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java index 7a80fa59..c0109265 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java @@ -42,6 +42,8 @@ public class PmsPatientVo { @ApiModelProperty("现病史，存储格式：[\"高血压\",\"脑血管病\"]") private String currentIllnessHistory; private String currentIllnessHistoryQt; + private String weight; + private String height; @ApiModelProperty("建档组织（当前登录账号医院ID）") private Long tenantId; @ApiModelProperty("创建者") @@ -52,6 +54,9 @@ public class PmsPatientVo { private String remark; private String tenantName; + + @ApiModelProperty("身高体重机器ID") + private String weightMachineId; } } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java index 342fdc49..b204ae74 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java @@ -56,6 +56,7 @@ public class PmsTreatmentVo { private String tenantName; private String zyzdQt; + private Long memberId; @Data public static class QueueVo{ diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/ZytzVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/ZytzVo.java new file mode 100644 index 00000000..b22ea448 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/ZytzVo.java @@ -0,0 +1,423 @@ +package com.acupuncture.system.domain.vo; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdcardUtil; +import cn.hutool.core.util.StrUtil; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * @Author zzc + * @Package com.acupuncture.system.domain.dto + * @Date 2025/2/11 15:05 + * @description: + */ +public class ZytzVo { + @Data + public static class PatientQuery { + private Long patientId; + private String name; + private Integer gender; + private String birthday; + private String idcard; + private String phone; + private String height; + private String weight; + private String waistline; + private List sickness; + + public Integer getAge() { + Integer age = null; + try { + if (StrUtil.isNotBlank(idcard) && IdcardUtil.isValidCard(idcard)) { + age = IdcardUtil.getAgeByIdCard(idcard); + } else if (StrUtil.isNotBlank(birthday)) { + age = DateUtil.ageOfNow(DateUtil.parse(birthday)); + } + } catch (Exception ignored) { + } + return age; + } + } + + @Data + public static class PatientSaveOrUpdate { + private Long patientId; + private String name; + private Integer gender; + private String birthday; + private String idcard; + private String phone; + private String height; + private String weight; + private String waistline; + private List sickness; + + public Integer getAge() { + Integer age = null; + try { + if (StrUtil.isNotBlank(idcard) && IdcardUtil.isValidCard(idcard)) { + age = IdcardUtil.getAgeByIdCard(idcard); + } else if (StrUtil.isNotBlank(birthday)) { + age = DateUtil.ageOfNow(DateUtil.parse(birthday)); + } + } catch (Exception ignored) { + } + return age; + } + } + + @Data + public static class EvaSave { + private Long evaId; + private Long patientId; + private String scaleCode; + private String scaleName; + private Integer evaStatus; + } + + @Data + public static class EvaQuestionList { + private Long evaId; + private Long patientId; + private String scaleCode; + private String scaleName; + private Integer evaStatus; + private List questions; + + @Data + public static class Question { + private String quesCode; + private String quesName; + private String quesSort; + private List