jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 12 additions and 2 deletions

...	...	@@ -116,6 +116,7 @@
116	116	private Date lastUpdateDate;
117	117	private String lastUpdateUserId;
118	118	private String lastUpdateHospitalId;
	119	+ //0-正常 1-删除
119	120	private Integer status;
120	121
121	122	public String getPid() {

...	...	@@ -464,6 +464,9 @@
464	464	DATEDIFF(#{nextEndTime},next_check_time) >=0
465	465	]]>
466	466	</if>
	467	+ <if test="status != null and status >= 0">
	468	+ and status = #{status,jdbcType=INTEGER}
	469	+ </if>
467	470	</where>
468	471	</select>
469	472
...	...	@@ -609,6 +612,9 @@
609	612	</if>
610	613	<if test="checkDoctorId!=null and checkDoctorId != ''">
611	614	and check_doctor_id = #{checkDoctorId}
	615	+ </if>
	616	+ <if test="status != null and status >= 0">
	617	+ and status = #{status,jdbcType=INTEGER}
612	618	</if>
613	619	<if test="pid!=null and pid != ''">
614	620	and pid = #{pid}

...	...	@@ -517,6 +517,7 @@
517	517	if (model.getDiagnDoctorId() != null) {
518	518	screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
519	519	}
	520	+ screenQuery.setStatus(0);
520	521	//查询全部数据
521	522	List<BabyPatientExtendEarScreen> earScreens = screenService.dubiousScreen(screenQuery);
522	523
...	...	@@ -937,6 +938,7 @@
937	938	screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
938	939	}
939	940	screenQuery.setCheckHospitalId(hospitalId);
	941	+ screenQuery.setStatus(0);
940	942
941	943	//根据儿童条件查询如果为空
942	944	if (CollectionUtils.isEmpty(babyIds) && (model.getMonthAgeStart() != null \|\| model.getMonthAgeEnd() != null \|\| StringUtils.isNotEmpty(model.getKeyWord()) \|\| model.getBirthStartTime() != null \|\| model.getBirthEndTime() != null)) {

...	...	@@ -1469,7 +1469,7 @@
1469	1469
1470	1470
1471	1471	/**
1472		- * 删除儿童听筛记录
	1472	+ * 删除儿童档案
1473	1473	*
1474	1474	* @param babyEarId 儿童听筛id
1475	1475	* @return
...	...	@@ -1671,7 +1671,7 @@
1671	1671
1672	1672
1673	1673	/**
1674		- * 刪除听筛
	1674	+ * 删除听筛
1675	1675	*
1676	1676	* @return
1677	1677	*/
...	...	@@ -1809,6 +1809,7 @@
1809	1809	//当前登录人医院Id
1810	1810	String hospitalId = autoMatchFacade.getHospitalId(userId);
1811	1811	screenQuery.setCheckHospitalId(hospitalId);
	1812	+ screenQuery.setStatus(0);
1812	1813
1813	1814	//如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
1814	1815	if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) \|\| earScreenListRequest.getBirthStartTime() != null \|\| earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡查询babyId