fangcheng / regional-platform

Authored by jiangjiazhi over 9 years ago

Showing 2 changed files with 25 additions and 1 deletions

...	...	@@ -53,10 +53,12 @@
53	53	* @return
54	54	*/
55	55	public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest,Integer userId) {
	56	+ SieveResultModel sieveResultModel =sieveAddRequest.convertToDataModel();
	57	+ sieveService.addSieve(sieveResultModel);
56	58
57		- sieveService.addSieve(sieveAddRequest.convertToDataModel());
58	59	SieveQuery sieveQuery=new SieveQuery();
59	60	sieveQuery.setParentId(sieveAddRequest.getParentId());
	61	+ sieveQuery.setYn(YnEnums.YES.getId());
60	62	String hospitalId = autoMatchFacade.getHospitalId(userId);
61	63	sieveQuery.setHospitalId(hospitalId);
62	64	List<SieveModel> list = sieveService.queryList(sieveQuery);
...	...	@@ -64,6 +66,7 @@
64	66	sieveModel.setStatus(3);
65	67	sieveModel.setId(list.get(0).getId());
66	68	sieveModel.setHospitalId(hospitalId);
	69	+ sieveModel.setZtfx(sieveAddRequest.getMax());
67	70	sieveService.updateOneChanQianDiaSieve(sieveModel);
68	71	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
69	72	}

...	...	@@ -4,6 +4,10 @@
4	4	import com.lyms.platform.pojo.SieveModel;
5	5	import com.lyms.platform.pojo.SieveResultModel;
6	6
	7	+import java.util.ArrayList;
	8	+import java.util.Collections;
	9	+import java.util.List;
	10	+
7	11	/**
8	12	* 增加产筛结果
9	13	*
...	...	@@ -105,6 +109,23 @@
105	109	sieveModel.setCspj(cspj);
106	110	sieveModel.setPublishName(publishName);
107	111	return sieveModel;
	112	+ }
	113	+ public Integer getMax(){
	114	+ List<Integer> list =new ArrayList<>();
	115	+
	116	+ if(null!=tszhz){
	117	+ list.add(Integer.valueOf(tszhz));
	118	+ }
	119	+ if(null!=sjgjx){
	120	+ list.add(Integer.valueOf(sjgjx));
	121	+ }
	122	+ if(null!=sbst){
	123	+ list.add(Integer.valueOf(sbst));
	124	+ }
	125	+ if(null!=dzhpx){
	126	+ list.add(Integer.valueOf(dzhpx));
	127	+ }
	128	+ return Collections.max(list);
108	129	}
109	130	}