jiangjiazhi / regional-platform

Commit a76abdca201f237fc17ac9fd1544926a78a72b41

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

出生医学证明

Showing 1 changed file with 15 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java

...	...	@@ -2718,7 +2718,10 @@
2718	2718	antexListResult.setIsSendTui(1);
2719	2719	}
2720	2720	AntExChuQuery antExChuQuery = new AntExChuQuery();
2721		- antExChuQuery.setPid(patients.getPid());
	2721	+
	2722	+ //http://jira.healthbaby.com.cn/browse/WEB-2733
	2723	+ //antExChuQuery.setPid(patients.getPid());
	2724	+ antExChuQuery.setParentId(patients.getId());
2722	2725	antExChuQuery.setYn(YnEnums.YES.getId());
2723	2726	Date max = null;
2724	2727	if (!sortList.isEmpty()) {
...	...	@@ -2735,7 +2738,12 @@
2735	2738	HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false);
2736	2739	AntExQuery antExQuery = new AntExQuery();
2737	2740	antExQuery.setYn(YnEnums.YES.getId());
2738		- antExQuery.setPid(patients.getPid());
	2741	+
	2742	+ //http://jira.healthbaby.com.cn/browse/WEB-2733
	2743	+ //antExQuery.setPid(patients.getPid());
	2744	+ antExQuery.setParentId(patients.getId());
	2745	+
	2746	+
2739	2747	antExQuery.setStart(max);
2740	2748	//查询复诊记录
2741	2749	List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
...	...	@@ -2749,7 +2757,11 @@
2749	2757	//获取最后一次检查的记录
2750	2758	AntExQuery antExQuery1 = new AntExQuery();
2751	2759	antExQuery1.setHospitalId(hospitalId);
2752		- antExQuery1.setPid(patients.getPid());
	2760	+
	2761	+ //http://jira.healthbaby.com.cn/browse/WEB-2733
	2762	+ //antExQuery1.setPid(patients.getPid());
	2763	+ antExQuery1.setParentId(patients.getId());
	2764	+
2753	2765	antExQuery1.setYn(YnEnums.YES.getId());
2754	2766	antExQuery1.setStart(max);
2755	2767	// System.out.println("复诊查询："+antExQuery1.convertToQuery().convertToMongoQuery());