changpengfei / talkonline

Commit 2b0271b06dfe8a62927f0d211fac3391e3c33685

Authored by shiyang over 3 years ago

Exists in master

PC-注册的患者列表（没有病例的患者）,

修改his医院患者身份证号码

Showing 9 changed files with 484 additions and 1 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/RegisterPatientInfo.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/RegisterPatientInfoMapper.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/RegisterPatientInfoService.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/RegisterPatientInfoServiceImpl.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeData.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushIllnessTypeTask.java
talkonlineweb/src/main/resources/mapper/RegisterPatientInfoMapper.xml

...	...	@@ -89,7 +89,26 @@
89	89	return baseResponse;
90	90	}
91	91
92		-
	92	+ /**
	93	+ * 修改his医院患者身份证号码
	94	+ * @param hisInfo
	95	+ * @return
	96	+ */
	97	+ @PostMapping("updataHisIdCard")
	98	+ @TokenRequired
	99	+ public BaseResponse updataHisIdCard( @RequestBody LymsHisInfo hisInfo){
	100	+ BaseResponse baseResponse=new BaseResponse();
	101	+ try {
	102	+ final boolean result = lymsHisInfoService.updateById(hisInfo);
	103	+ if(!result){
	104	+ baseResponse.setErrorcode(1);
	105	+ baseResponse.setErrormsg("保存异常！");
	106	+ }
	107	+ } catch (Exception e) {
	108	+ e.printStackTrace();
	109	+ }
	110	+ return baseResponse;
	111	+ }
93	112
94	113
95	114

...	...	@@ -81,6 +81,9 @@
81	81	@Autowired
82	82	private LymsPatientAttentionService lymsPatientAttentionService;
83	83
	84	+ @Autowired
	85	+ private RegisterPatientInfoService registerPatientInfoService;
	86	+
84	87	/**
85	88	* 获取患者列表
86	89	*
...	...	@@ -1101,6 +1104,41 @@
1101	1104	if(!result){
1102	1105	baseResponse.setErrorcode(1);
1103	1106	baseResponse.setErrormsg("保存异常！");
	1107	+ }
	1108	+ return baseResponse;
	1109	+ }
	1110	+
	1111	+ /**
	1112	+ * PC-注册的患者列表（没有病例的患者）
	1113	+ *
	1114	+ * @param registerPatientInfo
	1115	+ * @param current
	1116	+ * @param size
	1117	+ * @return
	1118	+ */
	1119	+ @GetMapping("getRegisterPatientInfo")
	1120	+ @TokenRequired
	1121	+ public BaseResponse getRegisterPatientInfo(RegisterPatientInfo registerPatientInfo, int current, int size) {
	1122	+ BaseResponse baseResponse = new BaseResponse();
	1123	+ try {
	1124	+ QueryWrapper<RegisterPatientInfo> query=new QueryWrapper();
	1125	+ if(StringUtil.isNotEmpty(registerPatientInfo.getSynthesisQuery())){
	1126	+ query.and(wrapper -> wrapper .like("pname", registerPatientInfo.getSynthesisQuery())
	1127	+ .or().eq("enrolment_phone", registerPatientInfo.getSynthesisQuery())
	1128	+ .or().eq("idno", registerPatientInfo.getSynthesisQuery()));
	1129	+ }
	1130	+ if(StringUtil.isNotEmpty(registerPatientInfo.getStartCreatedtime())){
	1131	+ query.ge("createdtime", registerPatientInfo.getStartCreatedtime());
	1132	+ }
	1133	+ if(StringUtil.isNotEmpty(registerPatientInfo.getEndCreatedtime())){
	1134	+ query.le("createdtime", registerPatientInfo.getEndCreatedtime());
	1135	+ }
	1136	+ query.orderByDesc("createdtime");
	1137	+ Page<RegisterPatientInfo> page= new Page<>(current,size);
	1138	+ Page<RegisterPatientInfo> registerPatientInfoPage = registerPatientInfoService.page(page,query);
	1139	+ baseResponse.setObject(registerPatientInfoPage);
	1140	+ } catch (Exception e) {
	1141	+ e.printStackTrace();
1104	1142	}
1105	1143	return baseResponse;
1106	1144	}

	1	+package com.lyms.talkonlineweb.domain;
	2	+
	3	+import com.baomidou.mybatisplus.annotation.IdType;
	4	+import com.baomidou.mybatisplus.annotation.TableField;
	5	+import com.baomidou.mybatisplus.annotation.TableId;
	6	+import com.baomidou.mybatisplus.annotation.TableName;
	7	+import java.io.Serializable;
	8	+import java.util.Date;
	9	+import lombok.Data;
	10	+
	11	+/**
	12	+ *
	13	+ * @TableName register_patient_info
	14	+ */
	15	+@TableName(value ="register_patient_info")
	16	+@Data
	17	+public class RegisterPatientInfo implements Serializable {
	18	+ /**
	19	+ *
	20	+ */
	21	+ @TableField(value = "id")
	22	+ private Integer id;
	23	+
	24	+ /**
	25	+ *
	26	+ */
	27	+ @TableField(value = "pname")
	28	+ private String pname;
	29	+
	30	+ /**
	31	+ *
	32	+ */
	33	+ @TableField(value = "idno")
	34	+ private String idno;
	35	+
	36	+ /**
	37	+ *
	38	+ */
	39	+ @TableField(value = "ppasswd")
	40	+ private String ppasswd;
	41	+
	42	+ /**
	43	+ *
	44	+ */
	45	+ @TableField(value = "sex")
	46	+ private Integer sex;
	47	+
	48	+ /**
	49	+ *
	50	+ */
	51	+ @TableField(value = "birth")
	52	+ private String birth;
	53	+
	54	+ /**
	55	+ *
	56	+ */
	57	+ @TableField(value = "headimg")
	58	+ private String headimg;
	59	+
	60	+ /**
	61	+ *
	62	+ */
	63	+ @TableField(value = "ccnt")
	64	+ private Integer ccnt;
	65	+
	66	+ /**
	67	+ *
	68	+ */
	69	+ @TableField(value = "islogin")
	70	+ private Byte islogin;
	71	+
	72	+ /**
	73	+ *
	74	+ */
	75	+ @TableField(value = "openid")
	76	+ private String openid;
	77	+
	78	+ /**
	79	+ *
	80	+ */
	81	+ @TableField(value = "gzopenid")
	82	+ private String gzopenid;
	83	+
	84	+ /**
	85	+ *
	86	+ */
	87	+ @TableField(value = "hxid")
	88	+ private String hxid;
	89	+
	90	+ /**
	91	+ *
	92	+ */
	93	+ @TableField(value = "createdby")
	94	+ private Integer createdby;
	95	+
	96	+ /**
	97	+ *
	98	+ */
	99	+ @TableField(value = "createdtime")
	100	+ private Date createdtime;
	101	+
	102	+ /**
	103	+ *
	104	+ */
	105	+ @TableField(value = "updatedby")
	106	+ private String updatedby;
	107	+
	108	+ /**
	109	+ *
	110	+ */
	111	+ @TableField(value = "updatedtime")
	112	+ private Date updatedtime;
	113	+
	114	+ /**
	115	+ *
	116	+ */
	117	+ @TableField(value = "enrolment_phone")
	118	+ private String enrolmentPhone;
	119	+
	120	+ /**
	121	+ * 综合查询（姓名/电话/身份证）
	122	+ */
	123	+ @TableField(exist = false)
	124	+ private String synthesisQuery;
	125	+
	126	+ /**
	127	+ * 筛选开始时间
	128	+ */
	129	+ @TableField(exist = false)
	130	+ private String startCreatedtime;
	131	+ /**
	132	+ * 筛选结束时间
	133	+ */
	134	+ @TableField(exist = false)
	135	+ private String endCreatedtime;
	136	+
	137	+ @TableField(exist = false)
	138	+ private static final long serialVersionUID = 1L;
	139	+
	140	+ @Override
	141	+ public boolean equals(Object that) {
	142	+ if (this == that) {
	143	+ return true;
	144	+ }
	145	+ if (that == null) {
	146	+ return false;
	147	+ }
	148	+ if (getClass() != that.getClass()) {
	149	+ return false;
	150	+ }
	151	+ RegisterPatientInfo other = (RegisterPatientInfo) that;
	152	+ return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
	153	+ && (this.getPname() == null ? other.getPname() == null : this.getPname().equals(other.getPname()))
	154	+ && (this.getIdno() == null ? other.getIdno() == null : this.getIdno().equals(other.getIdno()))
	155	+ && (this.getPpasswd() == null ? other.getPpasswd() == null : this.getPpasswd().equals(other.getPpasswd()))
	156	+ && (this.getSex() == null ? other.getSex() == null : this.getSex().equals(other.getSex()))
	157	+ && (this.getBirth() == null ? other.getBirth() == null : this.getBirth().equals(other.getBirth()))
	158	+ && (this.getHeadimg() == null ? other.getHeadimg() == null : this.getHeadimg().equals(other.getHeadimg()))
	159	+ && (this.getCcnt() == null ? other.getCcnt() == null : this.getCcnt().equals(other.getCcnt()))
	160	+ && (this.getIslogin() == null ? other.getIslogin() == null : this.getIslogin().equals(other.getIslogin()))
	161	+ && (this.getOpenid() == null ? other.getOpenid() == null : this.getOpenid().equals(other.getOpenid()))
	162	+ && (this.getGzopenid() == null ? other.getGzopenid() == null : this.getGzopenid().equals(other.getGzopenid()))
	163	+ && (this.getHxid() == null ? other.getHxid() == null : this.getHxid().equals(other.getHxid()))
	164	+ && (this.getCreatedby() == null ? other.getCreatedby() == null : this.getCreatedby().equals(other.getCreatedby()))
	165	+ && (this.getCreatedtime() == null ? other.getCreatedtime() == null : this.getCreatedtime().equals(other.getCreatedtime()))
	166	+ && (this.getUpdatedby() == null ? other.getUpdatedby() == null : this.getUpdatedby().equals(other.getUpdatedby()))
	167	+ && (this.getUpdatedtime() == null ? other.getUpdatedtime() == null : this.getUpdatedtime().equals(other.getUpdatedtime()))
	168	+ && (this.getEnrolmentPhone() == null ? other.getEnrolmentPhone() == null : this.getEnrolmentPhone().equals(other.getEnrolmentPhone()));
	169	+ }
	170	+
	171	+ @Override
	172	+ public int hashCode() {
	173	+ final int prime = 31;
	174	+ int result = 1;
	175	+ result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
	176	+ result = prime * result + ((getPname() == null) ? 0 : getPname().hashCode());
	177	+ result = prime * result + ((getIdno() == null) ? 0 : getIdno().hashCode());
	178	+ result = prime * result + ((getPpasswd() == null) ? 0 : getPpasswd().hashCode());
	179	+ result = prime * result + ((getSex() == null) ? 0 : getSex().hashCode());
	180	+ result = prime * result + ((getBirth() == null) ? 0 : getBirth().hashCode());
	181	+ result = prime * result + ((getHeadimg() == null) ? 0 : getHeadimg().hashCode());
	182	+ result = prime * result + ((getCcnt() == null) ? 0 : getCcnt().hashCode());
	183	+ result = prime * result + ((getIslogin() == null) ? 0 : getIslogin().hashCode());
	184	+ result = prime * result + ((getOpenid() == null) ? 0 : getOpenid().hashCode());
	185	+ result = prime * result + ((getGzopenid() == null) ? 0 : getGzopenid().hashCode());
	186	+ result = prime * result + ((getHxid() == null) ? 0 : getHxid().hashCode());
	187	+ result = prime * result + ((getCreatedby() == null) ? 0 : getCreatedby().hashCode());
	188	+ result = prime * result + ((getCreatedtime() == null) ? 0 : getCreatedtime().hashCode());
	189	+ result = prime * result + ((getUpdatedby() == null) ? 0 : getUpdatedby().hashCode());
	190	+ result = prime * result + ((getUpdatedtime() == null) ? 0 : getUpdatedtime().hashCode());
	191	+ result = prime * result + ((getEnrolmentPhone() == null) ? 0 : getEnrolmentPhone().hashCode());
	192	+ return result;
	193	+ }
	194	+
	195	+ @Override
	196	+ public String toString() {
	197	+ StringBuilder sb = new StringBuilder();
	198	+ sb.append(getClass().getSimpleName());
	199	+ sb.append(" [");
	200	+ sb.append("Hash = ").append(hashCode());
	201	+ sb.append(", id=").append(id);
	202	+ sb.append(", pname=").append(pname);
	203	+ sb.append(", idno=").append(idno);
	204	+ sb.append(", ppasswd=").append(ppasswd);
	205	+ sb.append(", sex=").append(sex);
	206	+ sb.append(", birth=").append(birth);
	207	+ sb.append(", headimg=").append(headimg);
	208	+ sb.append(", ccnt=").append(ccnt);
	209	+ sb.append(", islogin=").append(islogin);
	210	+ sb.append(", openid=").append(openid);
	211	+ sb.append(", gzopenid=").append(gzopenid);
	212	+ sb.append(", hxid=").append(hxid);
	213	+ sb.append(", createdby=").append(createdby);
	214	+ sb.append(", createdtime=").append(createdtime);
	215	+ sb.append(", updatedby=").append(updatedby);
	216	+ sb.append(", updatedtime=").append(updatedtime);
	217	+ sb.append(", enrolmentPhone=").append(enrolmentPhone);
	218	+ sb.append(", serialVersionUID=").append(serialVersionUID);
	219	+ sb.append("]");
	220	+ return sb.toString();
	221	+ }
	222	+}

	1	+package com.lyms.talkonlineweb.mapper;
	2	+
	3	+import com.lyms.talkonlineweb.domain.RegisterPatientInfo;
	4	+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
	5	+
	6	+/**
	7	+ * @Entity com.lyms.talkonlineweb.domain.RegisterPatientInfo
	8	+ */
	9	+public interface RegisterPatientInfoMapper extends BaseMapper<RegisterPatientInfo> {
	10	+
	11	+}

	1	+package com.lyms.talkonlineweb.service;
	2	+
	3	+import com.lyms.talkonlineweb.domain.RegisterPatientInfo;
	4	+import com.baomidou.mybatisplus.extension.service.IService;
	5	+
	6	+/**
	7	+ *
	8	+ */
	9	+public interface RegisterPatientInfoService extends IService<RegisterPatientInfo> {
	10	+
	11	+}

	1	+package com.lyms.talkonlineweb.service.impl;
	2	+
	3	+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
	4	+import com.lyms.talkonlineweb.domain.RegisterPatientInfo;
	5	+import com.lyms.talkonlineweb.service.RegisterPatientInfoService;
	6	+import com.lyms.talkonlineweb.mapper.RegisterPatientInfoMapper;
	7	+import org.springframework.stereotype.Service;
	8	+
	9	+/**
	10	+ *
	11	+ */
	12	+@Service
	13	+public class RegisterPatientInfoServiceImpl extends ServiceImpl<RegisterPatientInfoMapper, RegisterPatientInfo>
	14	+ implements RegisterPatientInfoService{
	15	+
	16	+}

	1	+package com.lyms.talkonlineweb.task;
	2	+
	3	+import com.lyms.talkonlineweb.service.*;
	4	+import lombok.extern.log4j.Log4j2;
	5	+import org.springframework.beans.factory.annotation.Autowired;
	6	+import org.springframework.stereotype.Component;
	7	+import org.springframework.transaction.annotation.Transactional;
	8	+import org.springframework.scheduling.annotation.Scheduled;
	9	+
	10	+/**
	11	+ * 疾病分类推送数据整理（1普通疾病，2慢性病）
	12	+ * 慢性病：确诊后第一个月推送一次，间隔3个月进行第二次推送
	13	+ * 普通疾病：确诊15天后推送
	14	+ */
	15	+
	16	+@Component
	17	+@Log4j2
	18	+public class PushIllnessTypeData {
	19	+
	20	+ @Autowired
	21	+ private LymsArticleService lymsArticleService;
	22	+ @Autowired
	23	+ private PatientInfoService patientInfoService;
	24	+ @Autowired
	25	+ private LymsPushedartService lymsPushedartService;//推送的历史记录
	26	+ @Autowired
	27	+ private PushArticleService pushArticleService;//推送文章新逻辑shiy改
	28	+ @Autowired
	29	+ LymsPushMessagesService lymsPushMessagesService;
	30	+ @Autowired
	31	+ private LymsDictService lymsDictService;
	32	+ @Autowired
	33	+ public PushArticleTask pushArticleTask;
	34	+ @Autowired
	35	+ public LymsPushAttentionRecordService lymsPushAttentionRecordService;
	36	+ @Autowired
	37	+ private LymsPatientAttentionService lymsPatientAttentionService;
	38	+ @Autowired
	39	+ private LymsPatientService lymsPatientService;//患者
	40	+
	41	+
	42	+
	43	+ /**
	44	+ * 每天00:00点执行-要推送的公众号信息数据整理
	45	+ */
	46	+// @Scheduled(cron = "0 0 0 * * ?")
	47	+ @Transactional(rollbackFor = Exception.class)
	48	+ public void PushIllnessTypeData(){
	49	+
	50	+
	51	+ }
	52	+
	53	+}

	1	+package com.lyms.talkonlineweb.task;
	2	+
	3	+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
	4	+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
	5	+import com.lyms.talkonlineweb.domain.*;
	6	+import com.lyms.talkonlineweb.service.*;
	7	+import com.lyms.talkonlineweb.util.DateUtil;
	8	+import lombok.extern.log4j.Log4j2;
	9	+import org.springframework.beans.BeanUtils;
	10	+import org.springframework.beans.BeansException;
	11	+import org.springframework.beans.factory.annotation.Autowired;
	12	+import org.springframework.stereotype.Component;
	13	+import org.springframework.transaction.annotation.Transactional;
	14	+import org.springframework.scheduling.annotation.Scheduled;
	15	+
	16	+import java.util.Date;
	17	+import java.util.HashMap;
	18	+import java.util.List;
	19	+import java.util.Map;
	20	+
	21	+import static com.lyms.talkonlineweb.util.DateUtil.YYYY_MM_DD;
	22	+
	23	+/**
	24	+ * 疾病分类推送（1普通疾病，2慢性病）
	25	+ * 慢性病：确诊后第一个月推送一次，间隔3个月进行第二次推送
	26	+ * 普通疾病：确诊15天后推送
	27	+ */
	28	+
	29	+@Component
	30	+@Log4j2
	31	+public class PushIllnessTypeTask {
	32	+
	33	+ @Autowired
	34	+ private LymsArticleService lymsArticleService;
	35	+ @Autowired
	36	+ private PatientInfoService patientInfoService;
	37	+ @Autowired
	38	+ private LymsPushedartService lymsPushedartService;//推送的历史记录
	39	+ @Autowired
	40	+ private PushArticleService pushArticleService;//推送文章新逻辑shiy改
	41	+ @Autowired
	42	+ LymsPushMessagesService lymsPushMessagesService;
	43	+ @Autowired
	44	+ private LymsDictService lymsDictService;
	45	+ @Autowired
	46	+ public PushArticleTask pushArticleTask;
	47	+ @Autowired
	48	+ public LymsPushAttentionRecordService lymsPushAttentionRecordService;
	49	+ @Autowired
	50	+ private LymsPatientAttentionService lymsPatientAttentionService;
	51	+ @Autowired
	52	+ private LymsPatientService lymsPatientService;//患者
	53	+
	54	+
	55	+
	56	+ /**
	57	+ * 每天下18:30点执行-要推送的公众号信息
	58	+ */
	59	+// @Scheduled(cron = "0 30 18 * * ?")
	60	+ @Transactional(rollbackFor = Exception.class)
	61	+ public void PushIllnessTypeTask(){
	62	+
	63	+
	64	+ }
	65	+
	66	+}

	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper
	3	+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
	4	+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	5	+<mapper namespace="com.lyms.talkonlineweb.mapper.RegisterPatientInfoMapper">
	6	+
	7	+ <resultMap id="BaseResultMap" type="com.lyms.talkonlineweb.domain.RegisterPatientInfo">
	8	+ <result property="id" column="id" jdbcType="INTEGER"/>
	9	+ <result property="pname" column="pname" jdbcType="VARCHAR"/>
	10	+ <result property="idno" column="idno" jdbcType="VARCHAR"/>
	11	+ <result property="ppasswd" column="ppasswd" jdbcType="VARCHAR"/>
	12	+ <result property="sex" column="sex" jdbcType="INTEGER"/>
	13	+ <result property="birth" column="birth" jdbcType="VARCHAR"/>
	14	+ <result property="headimg" column="headimg" jdbcType="VARCHAR"/>
	15	+ <result property="ccnt" column="ccnt" jdbcType="INTEGER"/>
	16	+ <result property="islogin" column="islogin" jdbcType="TINYINT"/>
	17	+ <result property="openid" column="openid" jdbcType="VARCHAR"/>
	18	+ <result property="gzopenid" column="gzopenid" jdbcType="VARCHAR"/>
	19	+ <result property="hxid" column="hxid" jdbcType="VARCHAR"/>
	20	+ <result property="createdby" column="createdby" jdbcType="INTEGER"/>
	21	+ <result property="createdtime" column="createdtime" jdbcType="TIMESTAMP"/>
	22	+ <result property="updatedby" column="updatedby" jdbcType="VARCHAR"/>
	23	+ <result property="updatedtime" column="updatedtime" jdbcType="TIMESTAMP"/>
	24	+ <result property="enrolmentPhone" column="enrolment_phone" jdbcType="VARCHAR"/>
	25	+ </resultMap>
	26	+
	27	+ <sql id="Base_Column_List">
	28	+ id,pname,idno,
	29	+ ppasswd,sex,birth,
	30	+ headimg,ccnt,islogin,
	31	+ openid,gzopenid,hxid,
	32	+ createdby,createdtime,updatedby,
	33	+ updatedtime,enrolment_phone
	34	+ </sql>
	35	+</mapper>