jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 37 additions and 2 deletions

...	...	@@ -48,6 +48,8 @@
48	48	//标本号
49	49	private String number;
50	50
	51	+ private String redundancy;
	52	+
51	53	//采集医生
52	54	private String collectionDoctorId;
53	55
...	...	@@ -251,6 +253,14 @@
251	253	* 推送到华大系统的结果记录
252	254	*/
253	255	private boolean huaDaPushResult;
	256	+
	257	+ public String getRedundancy() {
	258	+ return redundancy;
	259	+ }
	260	+
	261	+ public void setRedundancy(String redundancy) {
	262	+ this.redundancy = redundancy;
	263	+ }
254	264
255	265	public String getNf() {
256	266	return nf;

...	...	@@ -22,6 +22,16 @@
22	22
23	23	private String number;
24	24
	25	+ private String redundancy;
	26	+
	27	+ public String getRedundancy() {
	28	+ return redundancy;
	29	+ }
	30	+
	31	+ public void setRedundancy(String redundancy) {
	32	+ this.redundancy = redundancy;
	33	+ }
	34	+
25	35	//产筛医院
26	36	private String sieveHospitalId;
27	37
...	...	@@ -93,6 +103,9 @@
93	103	}
94	104	if(null!=id){
95	105	condition= condition.and("id",id, MongoOper.IS);
	106	+ }
	107	+ if(null!=redundancy){
	108	+ condition= condition.and("redundancy",redundancy, MongoOper.IS);
96	109	}
97	110
98	111	return condition.toMongoQuery();

...	...	@@ -721,7 +721,9 @@
721	721	PatientBaseResult patientBaseResult = new PatientBaseResult();
722	722	if (null != pat) {
723	723
724		- SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
	724	+ /*
	725	+ 20200608 产筛修改 wtt ,去掉已申请过产筛限制，可以多次申请产筛
	726	+ SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
725	727	sieveApplyOrderQuery1.setParentId(pat.getId());
726	728	sieveApplyOrderQuery1.setHospitalId(hospitalId);
727	729	sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
...	...	@@ -729,7 +731,7 @@
729	731	List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
730	732	if (CollectionUtils.isNotEmpty(list)) {
731	733	return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛！");
732		- }
	734	+ }*/
733	735
734	736	patientBaseResult.convert(pat);
735	737	}

...	...	@@ -91,6 +91,7 @@
91	91	sieveApplyOrderQuery.setParentId(sieveModel.getParentId());
92	92	sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId());
93	93	sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
	94	+ sieveApplyOrderQuery.setRedundancy(sieveModel.getId());
94	95
95	96	//查询报告出具时间
96	97	SieveResultQuery sieveResultQuery = new SieveResultQuery();
...	...	@@ -103,6 +104,15 @@
103	104	sieveListResult.setExportTime(DateUtil.getyyyy_MM_dd(resultModel.getResultTime()));
104	105	}
105	106	List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
	107	+ if(CollectionUtils.isEmpty(applyOrderModels)){
	108	+ SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
	109	+ sieveApplyOrderQuery1.setSort("created descc");
	110	+ sieveApplyOrderQuery1.setParentId(sieveModel.getParentId());
	111	+ sieveApplyOrderQuery1.setHospitalId(sieveModel.getHospitalId());
	112	+ sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
	113	+ applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
	114	+ }
	115	+
106	116	//采血日期
107	117	Date collectionDate = null;
108	118	if (CollectionUtils.isNotEmpty(applyOrderModels)) {