jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 36 additions and 7 deletions

...	...	@@ -276,6 +276,19 @@
276	276	//hit抗体检测
277	277	private String hivkt;
278	278
	279	+
	280	+ //是否补录 1 为补录空为不是补录
	281	+ private String supplement;
	282	+
	283	+
	284	+ public String getSupplement() {
	285	+ return supplement;
	286	+ }
	287	+
	288	+ public void setSupplement(String supplement) {
	289	+ this.supplement = supplement;
	290	+ }
	291	+
279	292	public String getBxbjs() {
280	293	return bxbjs;
281	294	}

...	...	@@ -315,14 +315,20 @@
315	315	model.setOperator(userId);
316	316	model.setYn(YnEnums.YES.getId());
317	317	model.setHospitalId(hospitalId);
318		- AntExQuery antExQuery = new AntExQuery();
319		- antExQuery.setYn(YnEnums.YES.getId());
320		- antExQuery.setParentId(antExAddRequest.getParentId());
321		- antExQuery.setStart(model.getCheckDate());
322		- List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
323		- if (CollectionUtils.isNotEmpty(list)) {
324		- return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊");
	318	+
	319	+ //补录就不验证是否同一天复诊
	320	+ if (!StringUtils.isNotEmpty(antExAddRequest.getSupplement()))
	321	+ {
	322	+ AntExQuery antExQuery = new AntExQuery();
	323	+ antExQuery.setYn(YnEnums.YES.getId());
	324	+ antExQuery.setParentId(antExAddRequest.getParentId());
	325	+ antExQuery.setStart(model.getCheckDate());
	326	+ List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
	327	+ if (CollectionUtils.isNotEmpty(list)) {
	328	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊");
	329	+ }
325	330	}
	331	+
326	332	Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId());
327	333	model.setPid(patients.getPid());
328	334

...	...	@@ -252,7 +252,16 @@
252	252	//hit抗体检测
253	253	private String hivkt;
254	254
	255	+ private String supplement;
255	256
	257	+ public String getSupplement() {
	258	+ return supplement;
	259	+ }
	260	+
	261	+ public void setSupplement(String supplement) {
	262	+ this.supplement = supplement;
	263	+ }
	264	+
256	265	public String getVcCardNo() {
257	266	return vcCardNo;
258	267	}
...	...	@@ -998,6 +1007,7 @@
998	1007	examinationModel.setXnsd(xnsd);
999	1008	examinationModel.setSyjg(syjg);
1000	1009	examinationModel.setHivkt(hivkt);
	1010	+ examinationModel.setSupplement(supplement);
1001	1011
1002	1012	return examinationModel;
1003	1013	}