jiangjiazhi / regional-platform

Authored by liquanyu about 8 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 19 additions and 21 deletions

...	...	@@ -5,7 +5,7 @@
5	5	*
6	6	*/
7	7	public class LisReportItemModel {
8		- private Integer id;
	8	+// private Integer id;
9	9	// 检验报告ID
10	10	private String lisId;
11	11	// 项目代码
12	12
...	...	@@ -57,14 +57,7 @@
57	57	this.numberResult = numberResult;
58	58	}
59	59
60		- public Integer getId() {
61		- return id;
62		- }
63	60
64		- public void setId(Integer id) {
65		- this.id = id;
66		- }
67		-
68	61	public String getLisId() {
69	62	return lisId;
70	63	}
...	...	@@ -139,7 +132,7 @@
139	132
140	133	@Override
141	134	public String toString() {
142		- return "ListReportItemModel [id=" + id + ", lisId=" + lisId + ", code="
	135	+ return "ListReportItemModel [lisId=" + lisId + ", code="
143	136	+ code + ", name=" + name + ", result=" + result
144	137	+ ", resultFlag=" + resultFlag + ", ref=" + ref
145	138	+ ", resultType=" + resultType + ", unit=" + unit

...	...	@@ -102,13 +102,14 @@
102	102	MODIFIED AS modified,
103	103	CREATED AS created,
104	104	HOSPITAL_ID AS hospitalId,
105		- PHONE AS phone
	105	+ PHONE AS phone,
	106	+ ITEM_JSON AS itemJson
106	107	FROM LIS_REPORT_TBL
107	108	WHERE 1 = 1
108	109	<if test="lisId != null and lisId != ''">
109	110	AND LIS_ID = #{lisId}
110	111	</if>
111		- <if test="vcCardNo != null OR phone != null">
	112	+ <if test="vcCardNo != null \|\| phone != null">
112	113	AND (VCCARDNO = #{vcCardNo} OR PHONE = #{phone})
113	114	</if>
114	115	<if test="hospitalId != null and hospitalId != ''">
...	...	@@ -220,7 +221,11 @@
220	221	<sql id="LisCondition">
221	222	<where>
222	223	1 = 1
223		- <if test="vcCardNo != null or phone != null ">
	224	+ <if test="id != null">
	225	+ AND ID = #{id}
	226	+ </if>
	227	+
	228	+ <if test="vcCardNo != null \|\| phone != null ">
224	229	AND (VCCARDNO=#{vcCardNo} OR PHONE = #{phone})
225	230	</if>
226	231

...	...	@@ -1049,13 +1049,12 @@
1049	1049	}
1050	1050
1051	1051	if (null != pv) {
1052		- MongoCondition c = MongoCondition.newInstance();
1053		- MongoCondition con1 = MongoCondition.newInstance("phone", pc[0], MongoOper.IS);
1054		- MongoCondition con2 = MongoCondition.newInstance("vcCardNo", pc[1], MongoOper.IS);
1055		- if(c1!=null) {
1056		- c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
1057		- }else {
1058		- c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	1052	+ if (null != pv[0]) {
	1053	+ condition = condition.and("phone", pv[0], MongoOper.IS);
	1054	+ }
	1055	+
	1056	+ if (null != pv[1]) {
	1057	+ condition = condition.and("vcCardNo", pv[1], MongoOper.IS);
1059	1058	}
1060	1059	}
1061	1060

...	...	@@ -298,6 +298,7 @@
298	298	patientsQuery.setPid(patients.getPid());
299	299	patientsQuery.setVcCardNo(null);
300	300	patientsQuery.setHospitalId(null);
	301	+ patientsQuery.setPv(null);
301	302
302	303	//通过上面就诊号查询到的人的所有建档记录包括其他医院的建档记录
303	304	list= patientsService.queryPatient(patientsQuery);
...	...	@@ -348,7 +349,7 @@
348	349	check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lis.getPublishTime()));
349	350	check.setCheckDept(lis.getApplyDept());
350	351	check.setDoctor(lis.getApplyDoctor());
351		- check.setSex(check.getSex());
	352	+ check.setSex(lis.getSex());
352	353
353	354
354	355	List<CheckItemResponse> itemList = new ArrayList<>();
...	...	@@ -434,7 +435,7 @@
434	435	if (StringUtils.isNotEmpty(json))
435	436	{
436	437	List<LisReportItemModel> items = JsonUtil.toList(json, LisReportItemModel.class);
437		- lisReportModel.setItems(items.size() > 3 ? items.subList(0, 3) : items.subList(0,items.size()));
	438	+ lisReportModel.setItems(items.size() > 3 ? items.subList(0, 4) : items.subList(0,items.size()));
438	439	lisReportModel.setItemJson(null);
439	440	}
440	441	}