jiangjiazhi / regional-platform

Commit 94d28e52a8ea6503e343489eec07b9c1f75d431c

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 13 additions and 10 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java

...	...	@@ -76,7 +76,7 @@
76	76
77	77	List<Map<String,String>> getBuildCount(Map param);
78	78
79		- List<Map<String,String>> getBulidCheckCount(Map param);
	79	+ List<Map<String,String>> getBulidCheckPersonCount(Map param);
80	80
81	81	List<Map<String,String>> getBulidCheckNumCount(Map param);
82	82	List<Map<String,String>> getCheckPersonCount(Map param);

...	...	@@ -73,7 +73,7 @@
73	73
74	74	List<Map<String,String>> getBuildCount(Map param);
75	75
76		- List<Map<String,String>> getBulidCheckCount(Map param);
	76	+ List<Map<String,String>> getBulidCheckPersonCount(Map param);
77	77
78	78	List<Map<String,String>> getBulidCheckNumCount(Map param);
79	79	List<Map<String,String>> getCheckPersonCount(Map param);

...	...	@@ -169,8 +169,8 @@
169	169	return masterMysqlAntexcMapper.getBuildCount(param);
170	170	}
171	171	@Override
172		- public List<Map<String, String>> getBulidCheckCount(Map param) {
173		- return masterMysqlAntexcMapper.getBulidCheckCount(param);
	172	+ public List<Map<String, String>> getBulidCheckPersonCount(Map param) {
	173	+ return masterMysqlAntexcMapper.getBulidCheckPersonCount(param);
174	174	}
175	175	@Override
176	176	public List<Map<String, String>> getBulidCheckNumCount(Map param) {

...	...	@@ -1311,8 +1311,8 @@
1311	1311	</select>
1312	1312
1313	1313
1314		- <select id="getBulidCheckCount" resultType="java.util.Map" parameterType="java.util.Map">
1315		- select count(tp.patientId) as checkPersonCount,tp.id as hospitalId,tp.name as hospitalName
	1314	+ <select id="getBulidCheckPersonCount" resultType="java.util.Map" parameterType="java.util.Map">
	1315	+ select count(tp.patientId) as bulidCheckPersonCount,tp.id as hospitalId,tp.name as hospitalName
1316	1316	from (select p.patientId,o.id,o.name from report_patients p
1317	1317	INNER JOIN organization o on p.hospitalId=o.id
1318	1318	where p.type=1 and p.enable is NULL

...	...	@@ -1540,7 +1540,7 @@
1540	1540	param.put("cityId",cityId);
1541	1541	param.put("areaId", areaId);
1542	1542	List<Map<String,String>> bulidsCount = mysqlAntexcService.getBuildCount(param);
1543		- List<Map<String,String>> bulidCheckCount = mysqlAntexcService.getBulidCheckCount(param);
	1543	+ List<Map<String,String>> bulidCheckPersonCounts = mysqlAntexcService.getBulidCheckPersonCount(param);
1544	1544	List<Map<String,String>> bulidCheckNumCounts = mysqlAntexcService.getBulidCheckNumCount(param);
1545	1545	List<Map<String,String>> checkPersonCounts = mysqlAntexcService.getCheckPersonCount(param);
1546	1546	List<Map<String,String>> matDeliverCounts = mysqlAntexcService.getMatDeliverCount(param);
1547	1547
1548	1548
1549	1549
...	...	@@ -1562,18 +1562,20 @@
1562	1562	map.put("cityName",cityName);
1563	1563	map.put("areaName",areaName);
1564	1564
	1565	+ //建档产检人数
1565	1566	String bulidCheckPersonCount ="0";
1566		- if (CollectionUtils.isNotEmpty(bulidCheckCount)) {
1567		- for (Map<String, String> checkData : bulidCheckCount) {
	1567	+ if (CollectionUtils.isNotEmpty(bulidCheckPersonCounts)) {
	1568	+ for (Map<String, String> checkData : bulidCheckPersonCounts) {
1568	1569	if (hospitalName.equals(checkData.get("hospitalName")))
1569	1570	{
1570		- bulidCheckPersonCount = String.valueOf(checkData.get("checkPersonCount"));
	1571	+ bulidCheckPersonCount = String.valueOf(checkData.get("bulidCheckPersonCount"));
1571	1572	break;
1572	1573	}
1573	1574	}
1574	1575	}
1575	1576	map.put("bulidCheckPersonCount",bulidCheckPersonCount);
1576	1577
	1578	+ //建档产检人次统计
1577	1579	String bulidCheckNumCount ="0";
1578	1580	if (CollectionUtils.isNotEmpty(bulidCheckNumCounts)) {
1579	1581	for (Map<String, String> checkData : bulidCheckNumCounts) {
...	...	@@ -1586,6 +1588,7 @@
1586	1588	}
1587	1589	map.put("bulidCheckNumCount",bulidCheckNumCount);
1588	1590
	1591	+ //产检时间的产检人数统计
1589	1592	String checkPersonCount ="0";
1590	1593	if (CollectionUtils.isNotEmpty(checkPersonCounts)) {
1591	1594	for (Map<String, String> checkData : checkPersonCounts) {