jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 16 additions and 2 deletions

...	...	@@ -602,7 +602,11 @@
602	602	condition = condition.and("pcerteTypeId", pcerteTypeId, MongoOper.IS);
603	603	}
604	604	if (StringUtils.isNotEmpty(screening)) {
605		- condition = condition.and("screening", screening, MongoOper.IS);
	605	+ if("1".equals(screening)){
	606	+ condition = condition.and("screening", "2", MongoOper.NE);
	607	+ }else if("2".equals(screening)){
	608	+ condition = condition.and("screening", screening, MongoOper.IS);
	609	+ }
606	610	}
607	611
608	612	if (isFace) {

...	...	@@ -1996,6 +1996,7 @@
1996	1996	doctorObj.put("name", StringUtils.isNotEmpty(p.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(p.getYyzyfmHospitalId()) : "");
1997	1997	result.setYyzyfmHospitalId(doctorObj);
1998	1998	}
	1999	+ result.setScreening(p.getScreening());
1999	2000	result.setFilePath(filePath);
2000	2001	/** 末次月经和纠正末次月经反起来返回 */
2001	2002	if (p.getFuckLastMens() != null) {

...	...	@@ -10,7 +10,8 @@
10	10	*/
11	11	public class PregnantInfoResult {
12	12	private Map<String, String> yyzyfmHospitalId;
13		-
	13	+ /20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
	14	+ private String screening;
14	15	// 纠正末次月经
15	16	private String fuckLastMens;
16	17	// 末次月经纠正依据
...	...	@@ -97,6 +98,14 @@
97	98
98	99	public void setPatientSerResults(List<PatientSerResult> patientSerResults) {
99	100	this.patientSerResults = patientSerResults;
	101	+ }
	102	+
	103	+ public String getScreening() {
	104	+ return screening;
	105	+ }
	106	+
	107	+ public void setScreening(String screening) {
	108	+ this.screening = screening;
100	109	}
101	110
102	111	public List<Map<String, String>> getSerInfos() {