jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 23 additions and 0 deletions

...	...	@@ -152,6 +152,7 @@
152	152	//1 未同步 2已经同步
153	153	private Integer isSync;
154	154
	155	+ private Integer type;
155	156
156	157
157	158	@Override
...	...	@@ -164,6 +165,9 @@
164	165	if (checkup != null) {
165	166	condition = condition.and("checkup", checkup, MongoOper.IS);
166	167	}
	168	+ if (type != null) {
	169	+ condition = condition.and("type", type, MongoOper.IS);
	170	+ }
167	171
168	172	if (checkupExist != null) {
169	173	condition = condition.and("checkup", checkupExist, MongoOper.EXISTS);
...	...	@@ -370,6 +374,14 @@
370	374
371	375	//0 或者空不是 1是
372	376	private Integer hasHj;
	377	+
	378	+ public Integer getType() {
	379	+ return type;
	380	+ }
	381	+
	382	+ public void setType(Integer type) {
	383	+ this.type = type;
	384	+ }
373	385
374	386	public Integer getIsSync() {
375	387	return isSync;

...	...	@@ -894,6 +894,7 @@
894	894	query.setCertificateTypeId(queryRequest.getCertificateTypeId());
895	895	query.setUsername(queryRequest.getUsername());
896	896	query.setPhone(queryRequest.getPhone());
	897	+ query.setType(queryRequest.getType());
897	898
898	899	List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
899	900	if (CollectionUtils.isNotEmpty(modelList)) {

...	...	@@ -59,6 +59,16 @@
59	59	//隆化-妇女健康管理-妇女管理（区分男女模块1：男）
60	60	private Integer sex;
61	61
	62	+ private Integer type;
	63	+
	64	+ public Integer getType() {
	65	+ return type;
	66	+ }
	67	+
	68	+ public void setType(Integer type) {
	69	+ this.type = type;
	70	+ }
	71	+
62	72	public Integer getSex() {
63	73	return sex;
64	74	}