jiangjiazhi / regional-platform

Authored by liquanyu almost 4 years ago

1 parent f802206033

Exists in master and in 6 other branches

Showing 6 changed files with 48 additions and 4 deletions

...	...	@@ -375,6 +375,11 @@
375	375	//孕次
376	376	private Integer yunSize;
377	377
	378	+ //是否抽血 1不抽血
	379	+ private Integer checkBlood;
	380	+
	381	+
	382	+
378	383	public static long getSerialVersionUID() {
379	384	return serialVersionUID;
380	385	}

...	...	@@ -65,7 +65,8 @@
65	65	private Long numCode;
66	66	//1 未同步 2已经同步
67	67	private Integer isSync;
68		-
	68	+ //配偶证件号
	69	+ private String spouseCertificateNum;
69	70	@Override
70	71	public MongoQuery convertToQuery() {
71	72	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -93,6 +94,9 @@
93	94	if(CollectionUtils.isNotEmpty(parentIds)){
94	95	condition = condition.and("parentId", parentIds, MongoOper.IN);
95	96	}
	97	+ if(StringUtils.isNotEmpty(spouseCertificateNum)){
	98	+ condition = condition.and("spouseCertificateNum", spouseCertificateNum, MongoOper.IN);
	99	+ }
96	100	if (created!=null) {
97	101	condition = condition.and("created", created, MongoOper.IS);
98	102	}
...	...	@@ -152,6 +156,14 @@
152	156	condition = condition.andCondition(new MongoCondition(c1));
153	157	}
154	158	return condition.toMongoQuery();
	159	+ }
	160	+
	161	+ public String getSpouseCertificateNum() {
	162	+ return spouseCertificateNum;
	163	+ }
	164	+
	165	+ public void setSpouseCertificateNum(String spouseCertificateNum) {
	166	+ this.spouseCertificateNum = spouseCertificateNum;
155	167	}
156	168
157	169	public Integer getIsSync() {

...	...	@@ -191,7 +191,7 @@
191	191
192	192	String spouseCode = "";
193	193	//当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息
194		- if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) \|\| (result != null && StringUtils.isNotEmpty(result.getSpouseCertificateNum()))) {
	194	+ if (result != null && StringUtils.isNotEmpty(result.getSpouseCertificateNum())) {
195	195	ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
196	196	archiveQuery.setYn(YnEnums.YES.getId());
197	197	archiveQuery.setHospitalId(requestParam.getHospitalId());
198	198
...	...	@@ -208,8 +208,20 @@
208	208
209	209	}
210	210	}
	211	+ else
	212	+ {
	213	+ PremaritalCheckupQuery query = new PremaritalCheckupQuery();
	214	+ query.setYn(YnEnums.YES.getId());
	215	+ query.setSpouseCertificateNum(archiveModel.getCertificateNum());
	216	+ List<PremaritalCheckup> checkupList = premaritalCheckupService.queryPremaritalCheckup(query);
	217	+ if (CollectionUtils.isNotEmpty(checkupList)) {
	218	+ PremaritalCheckup model = checkupList.get(0);
	219	+ checkupResult.setSpouseName(model.getSpouseName());
	220	+ checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId());
	221	+ checkupResult.setSpouseCertificateNum(model.getCertificateNum());
	222	+ }
	223	+ }
211	224	archiveMap.put("spouseCode", spouseCode);
212		-
213	225	}
214	226
215	227	resultMap.put("archiveResult", archiveMap);

...	...	@@ -65,6 +65,16 @@
65	65	//0 或者空孕检 1婚孕检
66	66	private Integer hyj;
67	67
	68	+ //是否抽血 1不抽血
	69	+ private Integer checkBlood;
	70	+
	71	+ public Integer getCheckBlood() {
	72	+ return checkBlood;
	73	+ }
	74	+
	75	+ public void setCheckBlood(Integer checkBlood) {
	76	+ this.checkBlood = checkBlood;
	77	+ }
68	78
69	79	public Integer getHyj() {
70	80	return hyj;

...	...	@@ -87,6 +87,7 @@
87	87
88	88	private String doctorStr;
89	89
	90	+
90	91	public String getHusbandAccountAddressStr() {
91	92	return husbandAccountAddressStr;
92	93	}

...	...	@@ -288,6 +288,11 @@
288	288	query.addCriteria(Criteria.where("createUser").is(createUser));
289	289	}
290	290
	291	+ Integer checkBlood = param.getCheckBlood();
	292	+ if (checkBlood != null) {
	293	+ query.addCriteria(Criteria.where("checkBlood").is(checkBlood));
	294	+ }
	295	+
291	296	Integer sendCountry = param.getSendCountry();
292	297	if (sendCountry != null) {
293	298	query.addCriteria(Criteria.where("sendCountry").is(sendCountry));
...	...	@@ -476,7 +481,6 @@
476	481	setDoctorName(result.getHusbandPhysiqueCheck());
477	482	setDoctorName(result.getHusbandClinicalCheck());
478	483	setDoctorName(result.getHusbandOtherCheck());
479		-
480	484	setDoctorName(result.getResultAdvice());
481	485
482	486	return result;