jiangjiazhi / regional-platform

Commit 9d81ef6ecbddfae99816433b3a0be29b0bd56bd9

Authored by litao@lymsh.com over 7 years ago

Exists in master and in 6 other branches

加字段

Showing 5 changed files with 44 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -184,7 +184,8 @@
184	184	@RequestMapping(method = RequestMethod.GET, value = "/antex")
185	185	@ResponseBody
186	186	@TokenRequired
187		- public BaseResponse findOneAntById(@Valid AntExQueryRequest antExQueryRequest) {
	187	+ public BaseResponse findOneAntById(@Valid AntExQueryRequest antExQueryRequest, HttpServletRequest request) {
	188	+ antExQueryRequest.setUserId(getUserId(request));
188	189	return antenatalExaminationFacade.findOneAntExById(antExQueryRequest);
189	190	}
190	191

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.platform.biz.SequenceConstant;
3	4	import com.lyms.platform.biz.service.*;
4	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	6	import com.lyms.platform.common.enums.*;
6	7	import com.lyms.platform.common.result.BaseObjectResponse;
7	8	import com.lyms.platform.common.result.BaseResponse;
	9	+import com.lyms.platform.common.result.PageResult;
8	10	import com.lyms.platform.common.utils.*;
9	11	import com.lyms.platform.operate.web.request.*;
10	12	import com.lyms.platform.operate.web.result.*;
...	...	@@ -26,6 +28,9 @@
26	28	import org.slf4j.LoggerFactory;
27	29	import org.springframework.beans.factory.annotation.Autowired;
28	30	import org.springframework.data.domain.Sort;
	31	+import org.springframework.data.mongodb.core.MongoTemplate;
	32	+import org.springframework.data.mongodb.core.query.Criteria;
	33	+import org.springframework.data.mongodb.core.query.Query;
29	34	import org.springframework.stereotype.Component;
30	35	import org.springframework.util.StopWatch;
31	36
...	...	@@ -81,6 +86,8 @@
81	86	private DischargeAbstractMotherService dischargeAbstractMotherService;
82	87	@Autowired
83	88	private MongoUtil mongoUtil;
	89	+ @Autowired
	90	+ private MongoTemplate mongoTemplate;
84	91
85	92	/**
86	93	* 处理区域隐藏建档
...	...	@@ -2069,6 +2076,8 @@
2069	2076	*/
2070	2077	public BaseResponse findOneAntExById(AntExQueryRequest antExQueryRequest) {
2071	2078	Object object = null;
	2079	+ Integer userId = antExQueryRequest.getUserId();
	2080	+ List<PlantformConfigModel> configModele = mongoTemplate.find(Query.query(Criteria.where("yn").ne("0").and("userId").is(userId).and("type").is(SequenceConstant.CUSTOM_TYPE)).with(new Sort(Sort.Direction.DESC,"createDate")), PlantformConfigModel.class);
2072	2081	//复诊
2073	2082	if ("1".equals(antExQueryRequest.getType())) {
2074	2083	AntenatalExaminationModel examinationModel = antenatalExaminationService.findOneById(antExQueryRequest.getId());
...	...	@@ -2113,7 +2122,6 @@
2113	2122	antenatalExaminationResult.setCheckDoctor(map1);
2114	2123	}
2115	2124
2116		-
2117	2125	antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
2118	2126	Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
2119	2127	Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
...	...	@@ -2128,6 +2136,7 @@
2128	2136	antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
2129	2137	antenatalExaminationResult.setQuicken(examinationModel.getQuicken());
2130	2138	antenatalExaminationResult.setQuickenRemark(examinationModel.getQuickenRemark());
	2139	+ antenatalExaminationResult.setmHighRiskReason(configModele);
2131	2140
2132	2141	antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
2133	2142	antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
...	...	@@ -2192,6 +2201,7 @@
2192	2201	antexChuResult.setTreatmentOpinion2Types(antExChuModel.getTreatmentOpinion2Types());
2193	2202	antexChuResult.setQuicken(antExChuModel.getQuicken());
2194	2203	antexChuResult.setQuickenRemark(antExChuModel.getQuickenRemark());
	2204	+ antexChuResult.setmHighRiskReason(configModele);
2195	2205
2196	2206	object = antexChuResult;
2197	2207	}

...	...	@@ -17,6 +17,9 @@
17	17	@FormParam
18	18	@NotEmpty(message = "id不能为空.")
19	19	private String id;
	20	+
	21	+ private Integer userId;
	22	+
20	23	//1是复诊 0 是初诊
21	24	@FormParam
22	25	@Pattern(regexp = "^[0\|1]$",message = "type 只能为0或者1")
...	...	@@ -36,6 +39,14 @@
36	39
37	40	public void setType(String type) {
38	41	this.type = type;
	42	+ }
	43	+
	44	+ public Integer getUserId() {
	45	+ return userId;
	46	+ }
	47	+
	48	+ public void setUserId(Integer userId) {
	49	+ this.userId = userId;
39	50	}
40	51	}

...	...	@@ -15,6 +15,8 @@
15	15	*/
16	16	public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
17	17
	18	+ private List mHighRiskReason;
	19	+
18	20	/** 处理意见 */
19	21	private Map<String, List<Map<String, Object>>> treatmentOpinion2;
20	22	private List<String> treatmentOpinion2Types;
...	...	@@ -22,6 +24,14 @@
22	24	private String quicken;
23	25	/** 胎动备注 */
24	26	private String quickenRemark;
	27	+
	28	+ public List getmHighRiskReason() {
	29	+ return mHighRiskReason;
	30	+ }
	31	+
	32	+ public void setmHighRiskReason(List mHighRiskReason) {
	33	+ this.mHighRiskReason = mHighRiskReason;
	34	+ }
25	35
26	36	public String getQuicken() {
27	37	return quicken;

...	...	@@ -15,6 +15,16 @@
15	15	*/
16	16	public class AntexChuResult {
17	17
	18	+ private List mHighRiskReason;
	19	+
	20	+ public List getmHighRiskReason() {
	21	+ return mHighRiskReason;
	22	+ }
	23	+
	24	+ public void setmHighRiskReason(List mHighRiskReason) {
	25	+ this.mHighRiskReason = mHighRiskReason;
	26	+ }
	27	+
18	28	/** 处理意见 */
19	29	private Map<String, List<Map<String, Object>>> treatmentOpinion2;
20	30	private List<String> treatmentOpinion2Types;