jiangjiazhi / regional-platform

Authored by [wangbo] almost 6 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 20 additions and 4 deletions

...	...	@@ -19,5 +19,6 @@
19	19	List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query);
20	20
21	21
	22	+ int queryBabyDiagnosesListCount(BabyDiagnoseQuery query);
22	23	}

...	...	@@ -36,6 +36,9 @@
36	36
37	37	@Override
38	38	public List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query) {
	39	+ if (query.getNeed() != null) {
	40	+ query.mysqlBuild(babyDiagnoseMapper.queryBabyDiagnosesListCount(query));
	41	+ }
39	42	return babyDiagnoseMapper.queryBabyDiagnosesList(query);
40	43	}
41	44

...	...	@@ -57,7 +57,7 @@
57	57
58	58	<select id="queryBabyDiagnoses" parameterType="java.util.Map" resultType="com.lyms.platform.pojo.BabyDiagnoseModel">
59	59	SELECT
60		- id,blh,syxh,hzxm,py,wb,birth,
	60	+ id,blh,syxh,hzxm,birth,
61	61	birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,
62	62	curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,
63	63	cyzdmc,ksdm,bqdm,mblh,msyxh,isbuild
...	...	@@ -119,7 +119,7 @@
119	119	and blh = #{hospitalizationNo}
120	120	</if>
121	121	<if test="babyName != null and babyName!=''">
122		- and hzxm =#{babyName} or lxrdh=#{babyName}
	122	+ and hzxm =#{babyName} or lxrdh=#{babyName} OR lxdh=#{babyName}
123	123	</if>
124	124	<if test="finalDiagnosis != null and finalDiagnosis!= '' ">
125	125	and cyzddm like CONCAT(#{finalDiagnosis},'%')
...	...	@@ -143,5 +143,15 @@
143	143	<include refid="orderAndLimit"/>
144	144	</select>
145	145
	146	+
	147	+ <select id="queryBabyDiagnosesListCount" parameterType="com.lyms.platform.permission.model.BabyDiagnoseQuery"
	148	+ resultType="java.lang.Integer"
	149	+ >
	150	+ SELECT
	151	+ count(1)
	152	+ FROM lyms_baby_diagnose
	153	+ <include refid="babyDiagnosesCondition"/>
	154	+
	155	+ </select>
146	156	</mapper>

...	...	@@ -990,7 +990,7 @@
990	990	try {
991	991
992	992	if (StringUtils.isNotEmpty(lrrqStart) && StringUtils.isNotEmpty(lrrqEnd)) {
993		- sql = " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)";
	993	+ sql += " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)";
994	994	}
995	995
996	996	conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();

...	...	@@ -4050,6 +4050,9 @@
4050	4050
4051	4051	babyDiagnoseQuery.setLimit(limit);
4052	4052	babyDiagnoseQuery.setPage(page);
	4053	+ babyDiagnoseQuery.setNeed("true");
	4054	+ babyDiagnoseQuery.setSort(" cyrq desc ");
	4055	+
4053	4056	if (StringUtils.isNotEmpty(babyDiagnoseQuery.getStartDischargeDate()) && StringUtils.isNotEmpty(babyDiagnoseQuery.getEndDischargeDate())) {
4054	4057	babyDiagnoseQuery.setStartDischargeDate(babyDiagnoseQuery.getStartDischargeDate() + " 00:00:00");
4055	4058	babyDiagnoseQuery.setEndDischargeDate(babyDiagnoseQuery.getEndDischargeDate() + " 23:59:59");
...	...	@@ -4079,7 +4082,6 @@
4079	4082	}
4080	4083	}
4081	4084	}
4082		- babyDiagnoseQuery.setCount(babyDiagnoseModels.size());
4083	4085	BaseListResponse objectResponse = new BaseListResponse();
4084	4086	objectResponse.setPageInfo(babyDiagnoseQuery.getPageInfo());
4085	4087	objectResponse.setData(result);