jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 7 additions and 2 deletions

...	...	@@ -401,6 +401,8 @@
401	401	sieveService.updateOneChanQianDiaSieve(sieveModel);
402	402	operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查");
403	403	}
	404	+ }else{
	405	+ System.out.println("已经有产筛申请单了");
404	406	}
405	407	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
406	408	}

...	...	@@ -390,6 +390,7 @@
390	390	sieveQuery.setNeed(needPage);
391	391	String hospitalId = autoMatchFacade.getHospitalId(userId);
392	392	sieveQuery.setHospitalId(hospitalId);
	393	+ // System.out.println("产筛列表："+sieveQuery.convertToQuery().convertToMongoQuery());
393	394	//查询产筛list
394	395	List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
395	396	List<SieveListResult> data = new ArrayList<>();

...	...	@@ -1259,7 +1259,8 @@
1259	1259	getRisk(data.getHighrisk(), data.getOtherHighRisk(), map);
1260	1260	//完善筛查结果
1261	1261	getscreenResult(data.getScreenResult(), map);
1262		-
	1262	+ //结果补充
	1263	+ map.put("resultSupple", data.getResultSupple());
1263	1264	//产检基本信息
1264	1265	map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckTime()));
1265	1266	String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckTime());
...	...	@@ -1964,7 +1965,8 @@
1964	1965
1965	1966	//完善筛查结果
1966	1967	getscreenResult(data.getScreenResult(), map);
1967		-
	1968	+ //结果补充
	1969	+ map.put("resultSupple", data.getResultSupple());
1968	1970	//产检基本信息
1969	1971	map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate()));
1970	1972	map.put("currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate()));