diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpAppointmentEvaController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpAppointmentEvaController.java new file mode 100644 index 0000000000000000000000000000000000000000..5aaea4b0ab6277c9a074286d565d244c3690972f --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpAppointmentEvaController.java @@ -0,0 +1,89 @@ +package cn.sh.stc.sict.theme.hpgp.controller.mobile; + + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.sh.stc.sict.cloud.common.core.constant.Constant; +import cn.sh.stc.sict.cloud.common.core.util.NumberUtil; +import cn.sh.stc.sict.cloud.common.core.util.R; +import cn.sh.stc.sict.cloud.common.security.util.SecurityUtils; +import cn.sh.stc.sict.cloud.upms.dto.CurrentUser; +import cn.sh.stc.sict.theme.hpgp.model.HpAppointmentEva; +import cn.sh.stc.sict.theme.hpgp.service.HpAppointmentEvaService; +import cn.sh.stc.sict.theme.hphy.model.HpAppointment; +import cn.sh.stc.sict.theme.hphy.service.HpAppointmentService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; + +@Slf4j +@RestController +@AllArgsConstructor +@Api(tags = "[C]预约评价") +@RequestMapping("/hp/app/eva") +public class HpAppointmentEvaController { + /** + * 1. 已评价 page + * 2. 待评价 page + * 3. 评价 + */ + private final HpAppointmentService hpAppointmentService; + private final HpAppointmentEvaService hpAppointmentEvaService; + + @ApiOperation("已评价 分页") + @GetMapping("/eaved/page") + public R hasEavedPage(Page page, @RequestParam("patientId") Long patientId) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(HpAppointmentEva::getPatientId, patientId); + return new R(hpAppointmentEvaService.page(page, wrapper)); + } + + @ApiOperation("待评价 分页") + @GetMapping("/todo/eav/page") + public R toBeEavPage(Page page, @RequestParam("patientId") Long patientId) { + page = hpAppointmentEvaService.toBeEavPage(page, patientId); + return new R(page); + } + + @ApiOperation("评价") + @PostMapping("/eva") + @Transactional(rollbackFor = Exception.class) + public R eav(@RequestBody HpAppointmentEva eva) { + if(NumberUtil.isNullOrZero(eva.getAppId())){ + return new R().error("appId 不可为空！"); + } + if(NumberUtil.isNullOrZero(eva.getPatientId())){ + return new R().error("patientId 不可为空！"); + } + HpAppointment app = hpAppointmentService.getById(eva.getId()); + if(ObjectUtil.isNull(app)){ + return new R().error("未找到预约记录！"); + } + if(!Constant.BYTE_NO.equals(app.getEvaStatus())){ + return new R().error("该预约记录已评价！"); + } + CurrentUser current = SecurityUtils.getCurrentUser(); + eva.setUserId(current.getId()); + eva.setHospCode(app.getHosOrgCode()); + eva.setHospName(app.getHosOrgName()); + eva.setDeptCode(app.getDeptCode()); + eva.setDeptName(app.getDeptName()); + eva.setDoctorCode(app.getDoctorId()); + eva.setDoctorName(app.getDoctorName()); + eva.setCreateTime(DateUtil.date()); + hpAppointmentEvaService.save(eva); + HpAppointment update = new HpAppointment(); + update.setId(eva.getAppId()); + update.setEvaStatus(Constant.BYTE_YES); + hpAppointmentService.updateById(update); + return new R(); + } +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpLabExperienceController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpLabExperienceController.java new file mode 100644 index 0000000000000000000000000000000000000000..2cb9164dfd0cc437fc4a8321b7f535cbfb72c2fa --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpLabExperienceController.java @@ -0,0 +1,41 @@ +package cn.sh.stc.sict.theme.hpgp.controller.mobile; + + +import cn.sh.stc.sict.cloud.common.core.util.R; +import cn.sh.stc.sict.theme.hpgp.model.HpgpLabExperience; +import cn.sh.stc.sict.theme.hpgp.service.HpgpLabExperienceService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.io.Serializable; +import java.util.List; + +/** + * 医院科室-检验-词云(HpgpLabExperience)表控制层 + * + * @author makejava + * @since 2022-06-23 11:38:14 + */ +@Slf4j +@RestController +@AllArgsConstructor +@Api(tags = "[C]医院科室-检验-词云") +@RequestMapping("/hpgp/lab/experience") +public class HpgpLabExperienceController { + /** + * 服务对象 + */ + private final HpgpLabExperienceService hpgpLabExperienceService; + + @ApiOperation("分页") + @GetMapping("/page") + public R selectAll(Page page, HpgpLabExperience hpgpLabExperience) { + return new R().success(this.hpgpLabExperienceService.page(page, new QueryWrapper<>(hpgpLabExperience))); + } + +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpLumbarAnswerController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpLumbarAnswerController.java new file mode 100644 index 0000000000000000000000000000000000000000..13421e2c52508341c628ca4f08a29e22824b3337 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpLumbarAnswerController.java @@ -0,0 +1,43 @@ +package cn.sh.stc.sict.theme.hpgp.controller.mobile; + + +import cn.sh.stc.sict.cloud.common.core.util.R; +import cn.sh.stc.sict.cloud.common.security.util.SecurityUtils; +import cn.sh.stc.sict.cloud.upms.dto.CurrentUser; +import cn.sh.stc.sict.theme.hpgp.model.HpgpLumbarAnswer; +import cn.sh.stc.sict.theme.hpgp.service.HpgpLumbarAnswerService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.io.Serializable; +import java.util.List; + +@Slf4j +@RestController +@AllArgsConstructor +@Api(tags = "[C]腰椎问卷") +@RequestMapping("/hpgp/lumbar") +public class HpgpLumbarAnswerController { + + private final HpgpLumbarAnswerService hpgpLumbarAnswerService; + + @ApiOperation("分页") + @GetMapping("/page") + public R selectAll(Page page, HpgpLumbarAnswer hpgpLumbarAnswer) { + return new R().success(this.hpgpLumbarAnswerService.page(page, new QueryWrapper<>(hpgpLumbarAnswer))); + } + + @ApiOperation("新增") + @PostMapping + public R insert(@RequestBody HpgpLumbarAnswer lumbar) { + CurrentUser current = SecurityUtils.getCurrentUser(); + lumbar.setUserId(current.getId()); + return new R().success(this.hpgpLumbarAnswerService.save(lumbar)); + } + +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpAppointmentEvaMapper.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpAppointmentEvaMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ed5c7453f1f0c2435e8783578e40e2220cb9e023 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpAppointmentEvaMapper.java @@ -0,0 +1,18 @@ +package cn.sh.stc.sict.theme.hpgp.dao; + +import cn.sh.stc.sict.theme.hpgp.model.HpAppointmentEva; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +/** + * 预约评价(HpAppointmentEva)表数据库访问层 + * + * @author makejava + * @since 2022-06-23 10:46:03 + */ +public interface HpAppointmentEvaMapper extends BaseMapper { + + Page toBeEavPage(Page page, + @Param("patientId") Long patientId); +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpLabExperienceMapper.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpLabExperienceMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..b5e5a4397ed9fa3ef6374570299409915a104b9e --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpLabExperienceMapper.java @@ -0,0 +1,14 @@ +package cn.sh.stc.sict.theme.hpgp.dao; + +import cn.sh.stc.sict.theme.hpgp.model.HpgpLabExperience; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 医院科室-检验-词云(HpgpLabExperience)表数据库访问层 + * + * @author makejava + * @since 2022-06-23 11:38:13 + */ +public interface HpgpLabExperienceMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpLumbarAnswerMapper.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpLumbarAnswerMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..685048103fda4037e3cc47e6b66a44e64c175701 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpgpLumbarAnswerMapper.java @@ -0,0 +1,14 @@ +package cn.sh.stc.sict.theme.hpgp.dao; + +import cn.sh.stc.sict.theme.hpgp.model.HpgpLumbarAnswer; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 腰椎问卷(HpgpLumbarAnswer)表数据库访问层 + * + * @author makejava + * @since 2022-06-23 10:43:15 + */ +public interface HpgpLumbarAnswerMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpAppointmentEva.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpAppointmentEva.java new file mode 100644 index 0000000000000000000000000000000000000000..cf852665c8ab69a156fb83dbebc63763ad584282 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpAppointmentEva.java @@ -0,0 +1,63 @@ +package cn.sh.stc.sict.theme.hpgp.model; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +/** + * 预约评价(HpAppointmentEva)表实体类 + * + * @author makejava + * @since 2022-06-23 10:46:03 + */ +@Data +@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) +public class HpAppointmentEva extends Model { + private Long id; + private Long userId; + private Long patientId; + private Long appId; + private String hospCode; + private String hospName; + private String deptCode; + private String deptName; + private String doctorCode; + private String doctorName; + /** + * 综合评价 + **/ + @ApiModelProperty(value = "综合评价") + private String comprehensiveEva; + /** + * 疗效评价 + **/ + @ApiModelProperty(value = "疗效评价") + private String efficacyEva; + /** + * 态度评价 + **/ + @ApiModelProperty(value = "态度评价") + private String attitudeEva; + private Date appTime; + @TableField(fill = FieldFill.INSERT) + private Date createTime; + @TableField(fill = FieldFill.UPDATE) + private Date updateTime; + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDepartmentRank.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDepartmentRank.java index 66f13797241acf248e7b8ec50a4f7a05a48eed4a..73f075570ba9f528ab413589ab10a23287786295 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDepartmentRank.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDepartmentRank.java @@ -35,5 +35,5 @@ public class HpgpDepartmentRank extends Model { @ApiModelProperty(hidden = false, value = "科室排名") private Integer rankScore; - + private String tag; } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLabExperience.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLabExperience.java new file mode 100644 index 0000000000000000000000000000000000000000..4376e86042b139bb02dee5d48845bff7bb73aea1 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLabExperience.java @@ -0,0 +1,35 @@ +package cn.sh.stc.sict.theme.hpgp.model; + +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 医院科室-检验-词云(HpgpLabExperience)表实体类 + * + * @author makejava + * @since 2022-06-23 11:38:13 + */ +@Data +@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) +public class HpgpLabExperience extends Model { + private Integer id; + private String hospCode; + private String hospName; + private String deptCode; + private String deptName; + private String itemName; + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLumbarAnswer.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLumbarAnswer.java new file mode 100644 index 0000000000000000000000000000000000000000..ba06a0b2b2a557bfc23688ca4f8fa9b82e9252bf --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLumbarAnswer.java @@ -0,0 +1,42 @@ +package cn.sh.stc.sict.theme.hpgp.model; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +/** + * 腰椎问卷(HpgpLumbarAnswer)表实体类 + * + * @author makejava + * @since 2022-06-23 10:43:10 + */ +@Data +@SuppressWarnings("serial") +@EqualsAndHashCode(callSuper = true) +public class HpgpLumbarAnswer extends Model { + private Long id; + private Long userId; + private Long patientId; + private String answerJson; + private Integer age; + private String score; + @TableField(fill = FieldFill.INSERT) + private Date createTime; + @TableField(fill = FieldFill.UPDATE) + private Date updateTime; + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpAppointmentEvaService.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpAppointmentEvaService.java new file mode 100644 index 0000000000000000000000000000000000000000..c48294d6c3de0ea20b87d501b94aaff295120021 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpAppointmentEvaService.java @@ -0,0 +1,16 @@ +package cn.sh.stc.sict.theme.hpgp.service; + +import cn.sh.stc.sict.theme.hpgp.model.HpAppointmentEva; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 预约评价(HpAppointmentEva)表服务接口 + * + * @author makejava + * @since 2022-06-23 10:46:03 + */ +public interface HpAppointmentEvaService extends IService { + + Page toBeEavPage(Page page, Long patientId); +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpLabExperienceService.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpLabExperienceService.java new file mode 100644 index 0000000000000000000000000000000000000000..a350913bf45bb2b24beb63713dcd2b7708378da5 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpLabExperienceService.java @@ -0,0 +1,14 @@ +package cn.sh.stc.sict.theme.hpgp.service; + +import cn.sh.stc.sict.theme.hpgp.model.HpgpLabExperience; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 医院科室-检验-词云(HpgpLabExperience)表服务接口 + * + * @author makejava + * @since 2022-06-23 11:38:13 + */ +public interface HpgpLabExperienceService extends IService { + +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpLumbarAnswerService.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpLumbarAnswerService.java new file mode 100644 index 0000000000000000000000000000000000000000..4e7f61ed196a54090da1f86bc8e43b5e6efab528 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpLumbarAnswerService.java @@ -0,0 +1,14 @@ +package cn.sh.stc.sict.theme.hpgp.service; + +import cn.sh.stc.sict.theme.hpgp.model.HpgpLumbarAnswer; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 腰椎问卷(HpgpLumbarAnswer)表服务接口 + * + * @author makejava + * @since 2022-06-23 10:43:15 + */ +public interface HpgpLumbarAnswerService extends IService { + +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpAppointmentEvaServiceImpl.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpAppointmentEvaServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..dee29843d73540895205920ac3eb39172a6c0f2f --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpAppointmentEvaServiceImpl.java @@ -0,0 +1,27 @@ +package cn.sh.stc.sict.theme.hpgp.service.impl; + +import cn.sh.stc.sict.theme.hpgp.dao.HpAppointmentEvaMapper; +import cn.sh.stc.sict.theme.hpgp.model.HpAppointmentEva; +import cn.sh.stc.sict.theme.hpgp.service.HpAppointmentEvaService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * 预约评价(HpAppointmentEva)表服务实现类 + * + * @author makejava + * @since 2022-06-23 10:46:03 + */ +@AllArgsConstructor +@Service("hpAppointmentEvaService") +public class HpAppointmentEvaServiceImpl extends ServiceImpl implements HpAppointmentEvaService { + + private final HpAppointmentEvaMapper hpAppointmentEvaMapper; + + @Override + public Page toBeEavPage(Page page, Long patientId) { + return hpAppointmentEvaMapper.toBeEavPage(page, patientId); + } +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpBusyIdlePredictionServiceImpl.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpBusyIdlePredictionServiceImpl.java index d300115f45267ff6267f7726657e3f5c87c3d878..6ab7b4559c807fe9c754a37a1b529f0c6ed85147 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpBusyIdlePredictionServiceImpl.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpBusyIdlePredictionServiceImpl.java @@ -1,6 +1,8 @@ package cn.sh.stc.sict.theme.hpgp.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.sh.stc.sict.theme.hpgp.dao.HpgpBusyIdlePredictionMapper; import cn.sh.stc.sict.theme.hpgp.dao.HpgpDepartmentRankMapper; import cn.sh.stc.sict.theme.hpgp.model.HpgpBusyIdlePrediction; @@ -38,12 +40,14 @@ public class HpgpBusyIdlePredictionServiceImpl extends ServiceImpl hospitalCodes = deptRank.stream().map(HpgpDepartmentRank::getHospitalCode).collect(Collectors.toSet()); Set deptCodes = deptRank.stream().map(HpgpDepartmentRank::getDeptCode).collect(Collectors.toSet()); + DateTime today = DateUtil.date(); + DateTime nextDay = DateUtil.offsetDay(DateUtil.date(), 7); return this.list( new LambdaQueryWrapper() .in(HpgpBusyIdlePrediction::getHospitalCode, hospitalCodes) .in(HpgpBusyIdlePrediction::getDeptCode, deptCodes) - .gt(HpgpBusyIdlePrediction::getPredictionDate, "") - .le(HpgpBusyIdlePrediction::getPredictionDate, "") + .gt(HpgpBusyIdlePrediction::getPredictionDate, today) + .le(HpgpBusyIdlePrediction::getPredictionDate, nextDay) ); } } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpLabExperienceServiceImpl.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpLabExperienceServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..da0a99e5eb643b5271fecee431ccc30ba27cc76e --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpLabExperienceServiceImpl.java @@ -0,0 +1,18 @@ +package cn.sh.stc.sict.theme.hpgp.service.impl; + +import cn.sh.stc.sict.theme.hpgp.dao.HpgpLabExperienceMapper; +import cn.sh.stc.sict.theme.hpgp.model.HpgpLabExperience; +import cn.sh.stc.sict.theme.hpgp.service.HpgpLabExperienceService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 医院科室-检验-词云(HpgpLabExperience)表服务实现类 + * + * @author makejava + * @since 2022-06-23 11:38:13 + */ +@Service("hpgpLabExperienceService") +public class HpgpLabExperienceServiceImpl extends ServiceImpl implements HpgpLabExperienceService { + +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpLumbarAnswerServiceImpl.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpLumbarAnswerServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..56041df996dac842cc677481b70f984b42110378 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpLumbarAnswerServiceImpl.java @@ -0,0 +1,18 @@ +package cn.sh.stc.sict.theme.hpgp.service.impl; + +import cn.sh.stc.sict.theme.hpgp.dao.HpgpLumbarAnswerMapper; +import cn.sh.stc.sict.theme.hpgp.model.HpgpLumbarAnswer; +import cn.sh.stc.sict.theme.hpgp.service.HpgpLumbarAnswerService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 腰椎问卷(HpgpLumbarAnswer)表服务实现类 + * + * @author makejava + * @since 2022-06-23 10:43:15 + */ +@Service("hpgpLumbarAnswerService") +public class HpgpLumbarAnswerServiceImpl extends ServiceImpl implements HpgpLumbarAnswerService { + +} \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java index 95a13089ad8abc9a96cc75870420ece99847e8cb..6a02618afc6a5b0e9a7b0b5fa18f9ec2dd32d429 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java @@ -126,6 +126,7 @@ public class AppointmentController { app.setPatientName(patient.getName()); app.setResourceName(docInfo.getResourceName()); app.setStatus(Constant.STRING_NO); + app.setEvaStatus(Constant.BYTE_NO); hpAppointmentService.save(app); return new R().success(result); } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpAppointment.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpAppointment.java index 34147070fe76b59a0498d6639ba8dff5ddf8f315..3842c8d353ed3ccea1aebe3acdc74c8af99d0c27 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpAppointment.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpAppointment.java @@ -140,6 +140,7 @@ public class HpAppointment extends Model { private String orderNumType; private String doctorId; + private String doctorName; private String orderId; private String visitNo; private String numSourceDetailId; @@ -147,9 +148,8 @@ public class HpAppointment extends Model { private String room; private String hosNumSourceId; - /** - * - */ + private Byte evaStatus; + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(hidden = true, value = "") private Date createTime; diff --git a/smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml b/smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml index 7cc253e7f6da49ad3c35ce60dc3bccaafba4a8ec..0ac9f31659a48b81d17696a2f24a6397eabd5b43 100644 --- a/smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml +++ b/smart-health-modules/theme-schema/src/main/resources/bootstrap-dev.yml @@ -16,3 +16,7 @@ spring: namespace: be9383c3-e535-4e9c-81ab-a8c6b7ecdc82 file-extension: yml shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +logging: + level: + cn.sh.stc.sict.theme.hpgp.dao: DEBUG diff --git a/smart-health-modules/theme-schema/src/main/resources/mapper/HpAppointmentEvaMapper.xml b/smart-health-modules/theme-schema/src/main/resources/mapper/HpAppointmentEvaMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..7b51a235f817ca14d98f626f5edd4ca349b0a590 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/resources/mapper/HpAppointmentEvaMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/resources/mapper/HpgpLabExperienceMapper.xml b/smart-health-modules/theme-schema/src/main/resources/mapper/HpgpLabExperienceMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..1413fd1eed67827f4d18d500f85a9718bc752294 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/resources/mapper/HpgpLabExperienceMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/smart-health-modules/theme-schema/src/main/resources/mapper/HpgpLumbarAnswerMapper.xml b/smart-health-modules/theme-schema/src/main/resources/mapper/HpgpLumbarAnswerMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..12508d06a7dbe6142709a6abe0a253127764ad16 --- /dev/null +++ b/smart-health-modules/theme-schema/src/main/resources/mapper/HpgpLumbarAnswerMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file