renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitea.rk-health.com/renkang/xj-platform into develop

Browse Source
This commit is contained in:
DESKTOP-BLB5287\FP
2025-07-09 16:57:10 +08:00
parent 7c69912296 75d0775ca9
commit e19f3f57b9
21 changed files with 443 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDoctorMapper.xml
+3
View File
@@ -137,6 +137,9 @@
<if test="conDoctor.type != null and conDoctor.type != ''">
AND a.type = #{conDoctor.type}
</if>
<if test="conDoctor.doctorJob != null and conDoctor.doctorJob != ''">
AND a.doctor_job = #{conDoctor.doctorJob}
</if>
<if test="conDoctor.isAccept != null and conDoctor.isAccept != ''">
AND a.is_accept = #{conDoctor.isAccept}
</if>
health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionMapper.xml
+1 -1
View File
@@ -104,7 +104,7 @@
<if test="conSession.orgCodes != null and conSession.orgCodes != ''">
AND (
<foreach item="item" index="index" collection="conSession.orgCodes" separator=" OR ">
c.org_code LIKE CONCAT('%', #{item}, '%')
c.org_code LIKE CONCAT(#{item}, '%')
</foreach>
)
</if>
health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java
+4 -2
View File
@@ -3,6 +3,7 @@ package com.renkang.consultation.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HtmlUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -248,6 +249,9 @@ public class ConDoctorServiceImpl extends ServiceImpl<ConDoctorMapper, ConDoctor
if (StringUtils.hasLength(dto.getHospitalName())) {
conDoctor.setResourceId(dto.getHospitalName());
}
if (StrUtil.isNotEmpty(dto.getDoctorName())){
conDoctor.setDoctorName(HtmlUtil.unescape(dto.getDoctorName()));
}
IPage<ConDoctor> conDoctorIPage = conDoctorMapper.queryPageList(page, conDoctor);
List<ConDoctor> conDoctorList = conDoctorIPage.getRecords();
if (CollectionUtils.isEmpty(conDoctorList)) {
@@ -307,8 +311,6 @@ public class ConDoctorServiceImpl extends ServiceImpl<ConDoctorMapper, ConDoctor
// 创建一个ConDoctor对象，并从dto复制属性
ConDoctor conDoctor = new ConDoctor();
BeanUtils.copyProperties(dto, conDoctor);
conDoctor.setStartTime(null);
conDoctor.setEndTime(null);
boolean tfQh = GlobalUtils.isQh();