jiangjiazhi / regional-platform | GitLab

Commit 233455845461f2a044525674fb8825459059b47e

Authored by liquanyu about 4 years ago

1 parent abe3ab9116

Exists in master and in 6 other branches

update

Showing 2 changed files with 6 additions and 5 deletions

platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java

...	...	@@ -1267,14 +1267,15 @@
1267	1267	select count(p.patientId) as buildCount,o.id as hospitalId,o.name as hospitalName,o.province_id as provinceId,o.area_id as areaId,o.city_id as cityId from report_patients p
1268	1268	INNER JOIN organization o on p.hospitalId=o.id
1269	1269	where p.type=1 and p.enable is NULL
	1270	+
	1271	+ <if test="hospitalId != null and hospitalId != ''">
	1272	+ and p.hospitalId = #{hospitalId,jdbcType=VARCHAR}
	1273	+ </if>
1270	1274	<if test="startDate != null">
1271	1275	and p.bookbuildingDate >= #{startDate}
1272	1276	</if>
1273	1277	<if test="endDate != null">
1274	1278	and p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
1275		- </if>
1276		- <if test="hospitalId != null and hospitalId != ''">
1277		- and p.hospitalId = #{hospitalId,jdbcType=VARCHAR}
1278	1279	</if>
1279	1280	<if test="provinceId != null and provinceId != ''">
1280	1281	and o.province_id = #{provinceId,jdbcType=VARCHAR}

...	...	@@ -1600,13 +1600,13 @@
1600	1600	map.put("checkPersonCount",checkPersonCount);
1601	1601
1602	1602	int matDeliverCount = 0;
1603		- List<Map<String,String>> matDeliverCounts = mysqlAntexcService.getMatDeliverCount(param);
	1603	+ List<Map<String,String>> matDeliverCounts = mysqlAntexcService.getMatDeliverCount(param1);
1604	1604	if (CollectionUtils.isNotEmpty(matDeliverCounts)) {
1605	1605	matDeliverCount = Integer.valueOf(String.valueOf(matDeliverCounts.get(0).get("matDeliverCount")));
1606	1606	}
1607	1607	map.put("matDeliverCount",matDeliverCount);
1608	1608
1609		- List<Map<String,String>> liveCounts = mysqlAntexcService.getLiveCount(param);
	1609	+ List<Map<String,String>> liveCounts = mysqlAntexcService.getLiveCount(param1);
1610	1610	int liveCount = 0;
1611	1611	if (CollectionUtils.isNotEmpty(liveCounts)) {
1612	1612	liveCount = Integer.valueOf(String.valueOf(liveCounts.get(0).get("liveCount")));