jiangjiazhi / regional-platform

Commit 4133227f941075f9dd6b485204f8f9f7ea1410cb

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

年报bug修改

Showing 2 changed files with 30 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java

...	...	@@ -47,6 +47,8 @@
47	47	* 预约联系结果（1-成功、2-失败）
48	48	*/
49	49	private Integer contactResult;
	50	+
	51	+ private List<Integer> contactResultList;
50	52	/**
51	53	* 预约访视类型（1-上门访视、2-电话访视）
52	54	*/
...	...	@@ -75,6 +77,7 @@
75	77	* 访视结果（1-成功、2-失败）
76	78	*/
77	79	private Integer visitResult;
	80	+
78	81	/**
79	82	* 访视失败理由（1-无人接听电话、2-上面无人答应、3-改为无人答应、4-其他）
80	83	*/
...	...	@@ -210,6 +213,14 @@
210	213	private Date updateDateStart;
211	214	private Date updateDateEnd;
212	215
	216	+ public List<Integer> getContactResultList() {
	217	+ return contactResultList;
	218	+ }
	219	+
	220	+ public void setContactResultList(List<Integer> contactResultList) {
	221	+ this.contactResultList = contactResultList;
	222	+ }
	223	+
213	224	public Date getUpdateDateStart() {
214	225	return updateDateStart;
215	226	}
...	...	@@ -265,6 +276,9 @@
265	276	}
266	277	if (null != hospitalIds && hospitalIds.size() > 0) {
267	278	condition = condition.and("hospitalId", hospitalIds, MongoOper.IN);
	279	+ }
	280	+ if (null != contactResultList && contactResultList.size() > 0) {
	281	+ condition = condition.and("contactResult", contactResultList, MongoOper.IN);
268	282	}
269	283
270	284	if (StringUtils.isNotBlank(deliverId)) {

...	...	@@ -98,7 +98,6 @@
98	98	Map<Object, List<String>> map = new LinkedHashMap<>();
99	99	for (String area : listArea) {
100	100	List<String> hospitalIds = this.getCurrentUserHospPermissions(userId, provinceId, cityId, area);
101		- System.out.println("==========>" + area);
102	101	map.put(area, hospitalIds);
103	102	}
104	103
...	...	@@ -338,6 +337,9 @@
338	337	List<String> hivList = new ArrayList<>();
339	338	hivList.add("yang");
340	339	hivList.add("yin");
	340	+ List<Integer> contactResult = new ArrayList<>();
	341	+ contactResult.add(1);
	342	+ contactResult.add(2);
341	343	Integer patientCountSum = 0;
342	344	Integer babyCountSum = 0;
343	345	for (Map.Entry<Object, List<String>> entry : hospitalIdMap.entrySet()) {
...	...	@@ -345,8 +347,7 @@
345	347	//机构名称
346	348	BasicConfig basicConfig = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(entry.getKey())), BasicConfig.class);
347	349	map.put("orgName", basicConfig.getName());
348		- System.out.println("==============>id" + basicConfig.getId());
349		-
	350	+ System.out.println(basicConfig.getId());
350	351	//活产数
351	352	BabyModelQuery babyModelQuery = new BabyModelQuery();
352	353	babyModelQuery.setDataStatus(false);
353	354
354	355
...	...	@@ -640,13 +641,22 @@
640	641	map.put("diacrisisYangPervent", this.division(diacrisisYangCount, diacrisisCount));
641	642
642	643	//产妇产后访视人数
643		- MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery();
	644	+ MatDeliverQuery matDeliverQueryFs = new MatDeliverQuery();
	645	+ matDeliverQueryFs.setFmHospitalList(entry.getValue());
	646	+ matDeliverQueryFs.setVisitStatus(2);
644	647	if (StringUtils.isNotEmpty(time)) {
	648	+ matDeliverQueryFs.setCreatedStart(DateUtil.getSNDate(time)[0]);
	649	+ matDeliverQueryFs.setEndStart(DateUtil.getSNDate(time)[1]);
	650	+ }
	651	+ int visitCount = matDeliverService.count(matDeliverQueryFs);
	652	+ /*MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery();
	653	+ if (StringUtils.isNotEmpty(time)) {
645	654	matDeliverFollowQuery.setCreatedTimeStart(DateUtil.getSNDate(time)[0]);
646	655	matDeliverFollowQuery.setCreatedTimeEnd(DateUtil.getSNDate(time)[1]);
647	656	}
648	657	matDeliverFollowQuery.setHospitalIds(entry.getValue());
649		- int visitCount = matDeliverFollowService.count(matDeliverFollowQuery);
	658	+ matDeliverFollowQuery.setContactResultList(contactResult);*/
	659	+ //int visitCount = matDeliverFollowService.count(matDeliverFollowQuery);
650	660	map.put("visitCount", String.valueOf(visitCount));
651	661	map.put("visitPervent", this.division(visitCount, chanCount));
652	662	//产妇系统管理人数
...	...	@@ -718,7 +728,7 @@
718	728	int chuXueCount = matDeliverService.count(matDeliverKillQuery1);
719	729
720	730	map.put("chuXueCount", String.valueOf(chuXueCount));
721		- map.put("chuXuePervent", this.division(chuXueCount, killCount));
	731	+ map.put("chuXuePervent", this.division(chuXueCount, chanCount));
722	732
723	733	//孕产妇死亡原因
724	734	//妊娠高血压疾病