zhuqing
/
tongue
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改就诊记录日期查询及添加患者手机号唯一校验

Browse Source
master
chenfei 2 years ago
parent 97624a399a
commit 73fb025a5f
7 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.ruoyi.web.controller.api; package com.ruoyi.web.controller.api;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
@ -173,6 +174,9 @@ public class AppController extends BaseController
{ {
TPatient tPatient = new TPatient(); TPatient tPatient = new TPatient();
BeanUtils.copyProperties(appPatientReq, tPatient); BeanUtils.copyProperties(appPatientReq, tPatient);
if(UserConstants.NOT_UNIQUE.equals(tPatientService.checkPhoneUnique(tPatient.getPhone()))){
return AjaxResult.error("手机号已注册");
}
tPatientService.insertTPatient(tPatient); tPatientService.insertTPatient(tPatient);
Long identifier = 10000000L + tPatient.getId(); Long identifier = 10000000L + tPatient.getId();
tPatient.setIdentifier(String.valueOf(identifier)); tPatient.setIdentifier(String.valueOf(identifier));

12
ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java
Unescape Escape View File

@ -43,10 +43,10 @@ public class TRecordResultReq
@ApiModelProperty("待诊日期开始时间") @ApiModelProperty("待诊日期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime; private String startTime;
@ApiModelProperty("待诊日期结束时间") @ApiModelProperty("待诊日期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime; private String endTime;
public String getName() public String getName()
{ {
@ -149,22 +149,22 @@ public class TRecordResultReq
this.createTime = createTime; this.createTime = createTime;
} }
public Date getStartTime() public String getStartTime()
{ {
return startTime; return startTime;
} }
public void setStartTime(Date startTime) public void setStartTime(String startTime)
{ {
this.startTime = startTime; this.startTime = startTime;
} }
public Date getEndTime() public String getEndTime()
{ {
return endTime; return endTime;
} }
public void setEndTime(Date endTime) public void setEndTime(String endTime)
{ {
this.endTime = endTime; this.endTime = endTime;
} }

16
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TPatientMapper.java
Unescape Escape View File

@ -8,7 +8,7 @@ import tk.mybatis.mapper.common.Mapper;
/** /**
* 患者信息Mapper接口 * 患者信息Mapper接口
* *
* @author ruoyi * @author ruoyi
* @date 2022-08-03 * @date 2022-08-03
*/ */
@ -16,7 +16,7 @@ public interface TPatientMapper
{ {
/** /**
* 查询患者信息 * 查询患者信息
* *
* @param id 患者信息主键 * @param id 患者信息主键
* @return 患者信息 * @return 患者信息
*/ */
@ -24,7 +24,7 @@ public interface TPatientMapper
/** /**
* 查询患者信息列表 * 查询患者信息列表
* *
* @param tPatient 患者信息 * @param tPatient 患者信息
* @return 患者信息集合 * @return 患者信息集合
*/ */
@ -32,7 +32,7 @@ public interface TPatientMapper
/** /**
* 新增患者信息 * 新增患者信息
* *
* @param tPatient 患者信息 * @param tPatient 患者信息
* @return 结果 * @return 结果
*/ */
@ -40,7 +40,7 @@ public interface TPatientMapper
/** /**
* 修改患者信息 * 修改患者信息
* *
* @param tPatient 患者信息 * @param tPatient 患者信息
* @return 结果 * @return 结果
*/ */
@ -48,7 +48,7 @@ public interface TPatientMapper
/** /**
* 删除患者信息 * 删除患者信息
* *
* @param id 患者信息主键 * @param id 患者信息主键
* @return 结果 * @return 结果
*/ */
@ -56,7 +56,7 @@ public interface TPatientMapper
/** /**
* 批量删除患者信息 * 批量删除患者信息
* *
* @param ids 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
@ -65,4 +65,6 @@ public interface TPatientMapper
public TPatient queryTPatient(TPatient tPatient); public TPatient queryTPatient(TPatient tPatient);
List<PcTPatientQueryByPageResp> queryByPage(PcTPatintQueryByPageReq pcTPatintQueryByPageReq); List<PcTPatientQueryByPageResp> queryByPage(PcTPatintQueryByPageReq pcTPatintQueryByPageReq);
int checkPhoneUnique(String phone);
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ITPatientService.java
Unescape Escape View File

@ -62,4 +62,6 @@ public interface ITPatientService
public int deleteTPatientById(Long id); public int deleteTPatientById(Long id);
List<PcTPatientQueryByPageResp> queryByPage(PcTPatintQueryByPageReq pcTPatintQueryByPageReq); List<PcTPatientQueryByPageResp> queryByPage(PcTPatintQueryByPageReq pcTPatintQueryByPageReq);
String checkPhoneUnique(String phone);
} }

29
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPatientServiceImpl.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.req.PcTPatintQueryByPageReq; import com.ruoyi.system.domain.req.PcTPatintQueryByPageReq;
import com.ruoyi.system.domain.resp.PcTPatientQueryByPageResp; import com.ruoyi.system.domain.resp.PcTPatientQueryByPageResp;
@ -12,19 +14,19 @@ import com.ruoyi.system.service.ITPatientService;
/** /**
* 患者信息Service业务层处理 * 患者信息Service业务层处理
* *
* @author ruoyi * @author ruoyi
* @date 2022-08-03 * @date 2022-08-03
*/ */
@Service @Service
public class TPatientServiceImpl implements ITPatientService public class TPatientServiceImpl implements ITPatientService
{ {
@Autowired @Autowired
private TPatientMapper tPatientMapper; private TPatientMapper tPatientMapper;
/** /**
* 查询患者信息 * 查询患者信息
* *
* @param id 患者信息主键 * @param id 患者信息主键
* @return 患者信息 * @return 患者信息
*/ */
@ -36,7 +38,7 @@ public class TPatientServiceImpl implements ITPatientService
/** /**
* 查询患者信息列表 * 查询患者信息列表
* *
* @param tPatient 患者信息 * @param tPatient 患者信息
* @return 患者信息 * @return 患者信息
*/ */
@ -48,7 +50,7 @@ public class TPatientServiceImpl implements ITPatientService
/** /**
* 新增患者信息 * 新增患者信息
* *
* @param tPatient 患者信息 * @param tPatient 患者信息
* @return 结果 * @return 结果
*/ */
@ -61,7 +63,7 @@ public class TPatientServiceImpl implements ITPatientService
/** /**
* 修改患者信息 * 修改患者信息
* *
* @param tPatient 患者信息 * @param tPatient 患者信息
* @return 结果 * @return 结果
*/ */
@ -74,7 +76,7 @@ public class TPatientServiceImpl implements ITPatientService
/** /**
* 批量删除患者信息 * 批量删除患者信息
* *
* @param ids 需要删除的患者信息主键 * @param ids 需要删除的患者信息主键
* @return 结果 * @return 结果
*/ */
@ -86,7 +88,7 @@ public class TPatientServiceImpl implements ITPatientService
/** /**
* 删除患者信息信息 * 删除患者信息信息
* *
* @param id 患者信息主键 * @param id 患者信息主键
* @return 结果 * @return 结果
*/ */
@ -100,4 +102,15 @@ public class TPatientServiceImpl implements ITPatientService
public List<PcTPatientQueryByPageResp> queryByPage(PcTPatintQueryByPageReq pcTPatintQueryByPageReq) { public List<PcTPatientQueryByPageResp> queryByPage(PcTPatintQueryByPageReq pcTPatintQueryByPageReq) {
return tPatientMapper.queryByPage(pcTPatintQueryByPageReq); return tPatientMapper.queryByPage(pcTPatintQueryByPageReq);
} }
@Override
public String checkPhoneUnique(String phone)
{
int count = tPatientMapper.checkPhoneUnique(phone);
if (count > 0)
{
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
} }

16
ruoyi-system/src/main/resources/mapper/system/TPatientMapper.xml
Unescape Escape View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TPatientMapper"> <mapper namespace="com.ruoyi.system.mapper.TPatientMapper">
<resultMap type="TPatient" id="TPatientResult"> <resultMap type="TPatient" id="TPatientResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="openId" column="open_id" /> <result property="openId" column="open_id" />
@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTPatientList" parameterType="TPatient" resultMap="TPatientResult"> <select id="selectTPatientList" parameterType="TPatient" resultMap="TPatientResult">
<include refid="selectTPatientVo"/> <include refid="selectTPatientVo"/>
<where> <where>
<if test="openId != null and openId != ''"> and open_id = #{openId}</if> <if test="openId != null and openId != ''"> and open_id = #{openId}</if>
<if test="identifier != null and identifier != ''"> and identifier = #{identifier}</if> <if test="identifier != null and identifier != ''"> and identifier = #{identifier}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
@ -40,12 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="disease != null and disease != ''"> and disease = #{disease}</if> <if test="disease != null and disease != ''"> and disease = #{disease}</if>
</where> </where>
</select> </select>
<select id="selectTPatientById" parameterType="Long" resultMap="TPatientResult"> <select id="selectTPatientById" parameterType="Long" resultMap="TPatientResult">
<include refid="selectTPatientVo"/> <include refid="selectTPatientVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertTPatient" parameterType="TPatient" useGeneratedKeys="true" keyProperty="id"> <insert id="insertTPatient" parameterType="TPatient" useGeneratedKeys="true" keyProperty="id">
insert into t_patient insert into t_patient
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteTPatientByIds" parameterType="String"> <delete id="deleteTPatientByIds" parameterType="String">
delete from t_patient where id in delete from t_patient where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
@ -152,4 +152,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
order by a.create_time desc order by a.create_time desc
</select> </select>
</mapper>
<select id="checkPhoneUnique" parameterType="String" resultType="int">
select count(1) from t_patient where phone = #{phone} limit 1
</select>
</mapper>

7
ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
Unescape Escape View File

@ -202,10 +202,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null"> <if test="createTime != null">
and DATE_FORMAT(tp.create_time,'%Y-%m') = DATE_FORMAT(#{createTime},'%Y-%m') and DATE_FORMAT(tp.create_time,'%Y-%m') = DATE_FORMAT(#{createTime},'%Y-%m')
</if> </if>
<if test="startTime != null and endTime != null"> <if test="startTime != null and startTime != '' and endTime == null "> and tr.create_time &gt;= #{startTime}</if>
AND tr.create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s') <if test="startTime == null and endTime != '' and endTime != null "> and tr.create_time &lt;= #{endTime}</if>
</if> <if test="startTime != null and endTime != null "> and tr.create_time between #{startTime} and #{endTime}</if>
<if test="startTime != null and endTime != null"></if>
<if test="doctorOder !=null and firstVisitOder!=null" >order by tr.create_time ${doctorOder}, tp.create_time ${firstVisitOder}</if> <if test="doctorOder !=null and firstVisitOder!=null" >order by tr.create_time ${doctorOder}, tp.create_time ${firstVisitOder}</if>
</where> </where>
</select> </select>

Write Preview
Loading…
Cancel
Save