jiangjiazhi / regional-platform | GitLab

Commit 874a97802547e9d6ccd660e76efa82b32bb51780

Authored by jiangjiazhi over 8 years ago

1 parent ac5743d922

Exists in master and in 8 other branches

修改新电子病历

Showing 2 changed files with 11 additions and 2 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import com.lyms.platform.biz.dal.ISieveApplyOrderDao;
4	4	import com.lyms.platform.biz.dal.ISieveDao;
	5	+import com.lyms.platform.common.dao.operator.MongoQuery;
5	6	import com.lyms.platform.common.enums.YnEnums;
6	7	import com.lyms.platform.common.utils.DateUtil;
7	8	import com.lyms.platform.pojo.SieveApplyOrderModel;
...	...	@@ -55,7 +56,9 @@
55	56	sieveModel.setYn(YnEnums.YES.getId());
56	57	iSieveDao.addChanQianSieve(sieveModel);
57	58	}
58		-
	59	+ public void update(MongoQuery mongoQuery, SieveResultModel sieveResultModel) {
	60	+ iSieveDao.update(mongoQuery,sieveResultModel);
	61	+ }
59	62	public List<SieveModel> queryList(SieveQuery sieveQuery) {
60	63	return iSieveDao.queryList(sieveQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
61	64	}

...	...	@@ -55,7 +55,13 @@
55	55	*/
56	56	public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest,Integer userId) {
57	57	SieveResultModel sieveResultModel =sieveAddRequest.convertToDataModel();
58		- sieveService.addSieve(sieveResultModel);
	58	+ if(StringUtils.isNotEmpty(sieveAddRequest.getId())){
	59	+ SieveResultQuery sieveResultQuery=new SieveResultQuery();
	60	+ sieveResultQuery.setId(sieveAddRequest.getId());
	61	+ sieveService.update(sieveResultQuery.convertToQuery(),sieveResultModel);
	62	+ }else{
	63	+ sieveService.addSieve(sieveResultModel);
	64	+ }
59	65
60	66	SieveQuery sieveQuery=new SieveQuery();
61	67	sieveQuery.setParentId(sieveAddRequest.getParentId());