jiangjiazhi / regional-platform

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 29 additions and 0 deletions

...	...	@@ -100,6 +100,17 @@
100	100	//1 未同步 2已经同步
101	101	private Integer isSync;
102	102
	103	+ // 宫颈癌筛查:1 宫颈+B超检查:2
	104	+ private Integer checkPackage;
	105	+
	106	+ public Integer getCheckPackage() {
	107	+ return checkPackage;
	108	+ }
	109	+
	110	+ public void setCheckPackage(Integer checkPackage) {
	111	+ this.checkPackage = checkPackage;
	112	+ }
	113	+
103	114	public Integer getIsSync() {
104	115	return isSync;
105	116	}

...	...	@@ -33,6 +33,19 @@
33	33	*/
34	34	private String hasAcceptTreatment;
35	35
	36	+ /**
	37	+ * 宫颈癌筛查:1 宫颈+B超检查:2
	38	+ */
	39	+ private Integer checkPackage;
	40	+
	41	+ public Integer getCheckPackage() {
	42	+ return checkPackage;
	43	+ }
	44	+
	45	+ public void setCheckPackage(Integer checkPackage) {
	46	+ this.checkPackage = checkPackage;
	47	+ }
	48	+
36	49	public String getIdCardNo() {
37	50	return idCardNo;
38	51	}

...	...	@@ -162,6 +162,10 @@
162	162	if (StringUtils.isNotEmpty(idCardNo)) {
163	163	query.addCriteria(Criteria.where("idCardNo").is(idCardNo));
164	164	}
	165	+ Integer checkPackage = param.getCheckPackage();
	166	+ if (null!=checkPackage) {
	167	+ query.addCriteria(Criteria.where("checkPackage").is(checkPackage));
	168	+ }
165	169
166	170	/20201021 wtt 陵城需求 start /
167	171	String fklcjczd = param.getFklcjczd();//妇科检查临床诊断异常项
...	...	@@ -757,6 +761,7 @@
757	761	result.setNationStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getNationId(), basicConfigService));
758	762	result.setLevelTypeStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getLevelTypeId(), basicConfigService));
759	763	}
	764	+ result.setCheckPackage(model.getCheckPackage());
760	765	list.add(result);
761	766	}
762	767	return list;