changpengfei / talkonline | GitLab

Commit ca73988623340830cae9c9d3ace86b4228fd766c

Authored by shiyang over 3 years ago

1 parent 2742487db6

Exists in master

his患者对接，增加医院区分

Showing 3 changed files with 10 additions and 1 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java
talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml

...	...	@@ -85,6 +85,12 @@
85	85	@TableField(value = "doctor")
86	86	@NotNull(message = "doctor不能为空")
87	87	private String doctor;
	88	+ /**
	89	+ * 医生姓名
	90	+ */
	91	+ @TableField(value = "hospitalId")
	92	+ @NotNull(message = "hospitalId不能为空")
	93	+ private String hospitalId;
88	94
89	95	/**
90	96	* 上传问诊平台状态。0：未上传 1：已上传

...	...	@@ -84,6 +84,7 @@
84	84	QueryWrapper qurey = new QueryWrapper();
85	85	qurey.eq("idCard", hisInfoMap.getIdcard());
86	86	qurey.eq("diagnose", hisInfoMap.getDiagnose());
	87	+ qurey.eq("hospitalId", hisInfoMap.getHospitalId());
87	88	Calendar calendar = Calendar.getInstance();
88	89	calendar.setTime(new Date());
89	90	calendar.set(Calendar.HOUR_OF_DAY, 00);//时
...	...	@@ -156,6 +157,7 @@
156	157	QueryWrapper qurey = new QueryWrapper();
157	158	qurey.eq("idCard", hisInfoMap.getIdcard());
158	159	qurey.eq("diagnose", hisInfoMap.getDiagnose());
	160	+ qurey.eq("hospitalId", hisInfoMap.getHospitalId());
159	161	Calendar calendar = Calendar.getInstance();
160	162	calendar.setTime(new Date());
161	163	calendar.set(Calendar.HOUR_OF_DAY, 00);//时

...	...	@@ -13,6 +13,7 @@
13	13	<result property="phone" column="phone" jdbcType="VARCHAR"/>
14	14	<result property="idcard" column="idCard" jdbcType="VARCHAR"/>
15	15	<result property="dept" column="dept" jdbcType="VARCHAR"/>
	16	+ <result property="hospitalId" column="hospitalId" jdbcType="VARCHAR"/>
16	17	<result property="diagnose" column="diagnose" jdbcType="VARCHAR"/>
17	18	<result property="doctor" column="doctor" jdbcType="VARCHAR"/>
18	19	<result property="upType" column="up_type" jdbcType="INTEGER"/>
...	...	@@ -23,7 +24,7 @@
23	24	<sql id="Base_Column_List">
24	25	id,vcCardNo,name,
25	26	sex,birthday,phone,
26		- idCard,dept,diagnose,
	27	+ idCard,dept,hospitalId,diagnose,
27	28	doctor,up_type,up_time,
28	29	createdtime
29	30	</sql>