jiangjiazhi / regional-platform

Commit e7db861fb1febe8c2eb89323d897cadf633b22cc

Authored by jiangjiazhi about 9 years ago

Exists in master and in 8 other branches

增加字段

Showing 10 changed files with 136 additions and 29 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
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/controller/MatDeliverController.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/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java

...	...	@@ -85,6 +85,15 @@
85	85	//附件
86	86	private String fujian;
87	87	private Date created;
	88	+ private String hospitalId;
	89	+
	90	+ public String getHospitalId() {
	91	+ return hospitalId;
	92	+ }
	93	+
	94	+ public void setHospitalId(String hospitalId) {
	95	+ this.hospitalId = hospitalId;
	96	+ }
88	97
89	98	public String getCervical() {
90	99	return cervical;

...	...	@@ -89,6 +89,16 @@
89	89	private Integer yn;
90	90	private Date created;
91	91
	92	+ private String hospitalId;
	93	+
	94	+ public String getHospitalId() {
	95	+ return hospitalId;
	96	+ }
	97	+
	98	+ public void setHospitalId(String hospitalId) {
	99	+ this.hospitalId = hospitalId;
	100	+ }
	101	+
92	102	public String getTypeYc() {
93	103	return typeYc;
94	104	}

...	...	@@ -97,6 +97,15 @@
97	97	private Integer yn;
98	98	private Date created;
99	99	private Date modified;
	100	+ private String hospitalId;
	101	+
	102	+ public String getHospitalId() {
	103	+ return hospitalId;
	104	+ }
	105	+
	106	+ public void setHospitalId(String hospitalId) {
	107	+ this.hospitalId = hospitalId;
	108	+ }
100	109
101	110	public Date getCreated() {
102	111	return created;

...	...	@@ -87,6 +87,15 @@
87	87	private Integer yn;
88	88	private Date created;
89	89	private Date modified;
	90	+ private String hospitalId;
	91	+
	92	+ public String getHospitalId() {
	93	+ return hospitalId;
	94	+ }
	95	+
	96	+ public void setHospitalId(String hospitalId) {
	97	+ this.hospitalId = hospitalId;
	98	+ }
90	99
91	100	public String getBasin() {
92	101	return basin;

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.annotation.TokenRequired;
3	4	import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.base.LoginContext;
4	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	7	import com.lyms.platform.common.result.BaseResponse;
6	8	import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
...	...	@@ -13,6 +15,7 @@
13	15	import org.springframework.web.bind.annotation.RequestMethod;
14	16	import org.springframework.web.bind.annotation.ResponseBody;
15	17
	18	+import javax.servlet.http.HttpServletRequest;
16	19	import javax.validation.Valid;
17	20
18	21	/**
...	...	@@ -49,8 +52,10 @@
49	52	*/
50	53	@RequestMapping(method = RequestMethod.POST, value = "/antexmanage")
51	54	@ResponseBody
52		- public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest) {
53		- return antenatalExaminationFacade.addOneAntEx(antExAddRequest);
	55	+ @TokenRequired
	56	+ public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) {
	57	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	58	+ return antenatalExaminationFacade.addOneAntEx(antExAddRequest,loginState.getId());
54	59	}
55	60
56	61	/**
...	...	@@ -61,8 +66,10 @@
61	66	*/
62	67	@RequestMapping(method = RequestMethod.POST, value = "/antex")
63	68	@ResponseBody
64		- public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest) {
65		- return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest);
	69	+ @TokenRequired
	70	+ public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest,HttpServletRequest request) {
	71	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	72	+ return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest,loginState.getId());
66	73	}
67	74
68	75

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.annotation.TokenRequired;
3	4	import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.base.LoginContext;
4	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	7	import com.lyms.platform.common.result.BaseResponse;
6	8	import com.lyms.platform.operate.web.facade.MatDeliverFacade;
...	...	@@ -11,6 +13,7 @@
11	13	import org.springframework.stereotype.Controller;
12	14	import org.springframework.web.bind.annotation.*;
13	15
	16	+import javax.servlet.http.HttpServletRequest;
14	17	import javax.validation.Valid;
15	18
16	19	/**
...	...	@@ -47,8 +50,10 @@
47	50	*/
48	51	@RequestMapping(value = "/matdel",method = RequestMethod.POST)
49	52	@ResponseBody
50		- public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest){
51		- return matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest);
	53	+ @TokenRequired
	54	+ public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest,HttpServletRequest request){
	55	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	56	+ return matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest,loginState.getId());
52	57	}
53	58	/**
54	59	* 删除一条删除记录

...	...	@@ -49,6 +49,8 @@
49	49	private MatDeliverService matDeliverService;
50	50	@Autowired
51	51	private PostReviewService postReviewService;
	52	+ @Autowired
	53	+ private AutoMatchFacade autoMatchFacade;
52	54
53	55	/**
54	56	* 增加一条产前检查
55	57
56	58
...	...	@@ -56,14 +58,19 @@
56	58	* @param antExAddRequest
57	59	* @return
58	60	*/
59		- public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest) {
	61	+ public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest,Integer userId) {
60	62	if (StringUtils.isNotEmpty(antExAddRequest.getId())) {
61	63	AntenatalExaminationModel antenatalExamination = antExAddRequest.convertToDataModel();
	64	+ antenatalExamination.setHospitalId(autoMatchFacade.matchOrgId(userId).get(0)+"");
62	65	antenatalExaminationService.updateOneAnt(antenatalExamination, antExAddRequest.getId());
63	66	updateApplyOrder(antenatalExamination, antExAddRequest.getParentId());
64	67	} else {
65	68	AntenatalExaminationModel model = antExAddRequest.convertToDataModel();
66	69	model.setYn(YnEnums.YES.getId());
	70	+ List list1 = autoMatchFacade.matchOrgId(userId);
	71	+ if(CollectionUtils.isNotEmpty(list1)){
	72	+ model.setHospitalId(list1.get(0)+"");
	73	+ }
67	74	antenatalExaminationService.addOneBabyAnt(model);
68	75	updateApplyOrder(model, antExAddRequest.getParentId());
69	76	}
70	77
...	...	@@ -93,11 +100,15 @@
93	100	* @param excAddRequest
94	101	* @return
95	102	*/
96		- public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest) {
	103	+ public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest,Integer userId) {
97	104	AntExChuModel antExChuModel = excAddRequest.convertToDataModel();
98	105	if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) {
99	106	antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId());
100	107	} else {
	108	+ List list1 = autoMatchFacade.matchOrgId(userId);
	109	+ if(CollectionUtils.isNotEmpty(list1)){
	110	+ antExChuModel.setHospitalId(list1.get(0)+"");
	111	+ }
101	112	antExChuModel.setYn(YnEnums.YES.getId());
102	113	antenatalExaminationService.addOneAntEx(antExChuModel);
103	114	}
...	...	@@ -128,7 +139,8 @@
128	139	matDeliverQuery.setYn(YnEnums.YES.getId());
129	140	matDeliverQuery.setParentId(patients.getId());
130	141	//建档记录
131		- data.add(new AntData(patients));
	142	+ Organization organization = organizationService.getOrganization(patients.getHospitalId());
	143	+ data.add(new AntData(patients, null != organization ? organization.getName() : ""));
132	144	//分娩记录
133	145	List<MaternalDeliverModel> modelList = matDeliverService.query(matDeliverQuery);
134	146	String dueDate = "";
...	...	@@ -148,7 +160,8 @@
148	160	List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
149	161	if (CollectionUtils.isNotEmpty(antExChuModels)) {
150	162	for (AntExChuModel an : antExChuModels) {
151		- data.add(new AntData(an));
	163	+ organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
	164	+ data.add(new AntData(an,null != organization ? organization.getName() : ""));
152	165	}
153	166	}
154	167	//复诊记录
155	168
...	...	@@ -160,12 +173,13 @@
160	173	List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
161	174	if (CollectionUtils.isNotEmpty(list1)) {
162	175	for (AntenatalExaminationModel an : list1) {
163		- data.add(new AntData(an));
	176	+ organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
	177	+ data.add(new AntData(an,null != organization ? organization.getName() : ""));
164	178	}
165	179	}
166	180	postReviewQuery = new PostReviewQuery();
167	181	postReviewQuery.setYn(YnEnums.YES.getId());
168		- if(list.size() - 1 > i){
	182	+ if (list.size() - 1 > i) {
169	183	postReviewQuery.setStart(date);
170	184	//下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
171	185	// postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/);
172	186
...	...	@@ -177,13 +191,15 @@
177	191	i++;
178	192	//分娩记录
179	193	if (CollectionUtils.isNotEmpty(modelList)) {
180		- data.add(new AntData(modelList.get(0), patients.getLastMenses()));
	194	+ organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId()));
	195	+ data.add(new AntData(modelList.get(0), patients.getLastMenses(),null != organization ? organization.getName() : ""));
181	196	}
182	197	//产后复查记录
183	198	List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
184	199	if (CollectionUtils.isNotEmpty(reviewModels)) {
185	200	for (PostReviewModel postReviewModel : reviewModels) {
186		- data.add(new AntData(postReviewModel));
	201	+ organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
	202	+ data.add(new AntData(postReviewModel,null != organization ? organization.getName() : ""));
187	203	}
188	204	}
189	205	listDate.add(data);
190	206
191	207
...	...	@@ -330,13 +346,13 @@
330	346	antenatalExaminationResult.setDiagnosis(queryRisk(list));
331	347	} catch (Exception e) {
332	348	}
333		- ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
	349	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
334	350	referralApplyOrderQuery.setParentId(examinationModel.getParentId());
335	351	antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
336		- SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
	352	+ SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
337	353	applyOrderQuery.setParentId(examinationModel.getParentId());
338	354	applyOrderQuery.setYn(YnEnums.YES.getId());
339		- antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
	355	+ antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
340	356	object = antenatalExaminationResult;
341	357	} else {
342	358	//查询初诊数据
343	359
344	360
...	...	@@ -360,13 +376,13 @@
360	376	antexChuResult.setHighrisk(queryRisk(list1));
361	377	} catch (Exception e) {
362	378	}
363		- ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
	379	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
364	380	referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
365	381	antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
366		- SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
	382	+ SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
367	383	applyOrderQuery.setParentId(antExChuModel.getParentId());
368	384	applyOrderQuery.setYn(YnEnums.YES.getId());
369		- antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
	385	+ antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
370	386	object = antexChuResult;
371	387	}
372	388

...	...	@@ -47,6 +47,8 @@
47	47	private AntenatalExaminationService antenatalExaminationService;
48	48	@Autowired
49	49	private BasicConfigService basicConfigService;
	50	+ @Autowired
	51	+ private AutoMatchFacade autoMatchFacade;
50	52
51	53
52	54	/**
...	...	@@ -55,7 +57,7 @@
55	57	* @param deliverAddRequest
56	58	* @return
57	59	*/
58		- public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest) {
	60	+ public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest,Integer userId) {
59	61	//增加
60	62	if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
61	63	MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
...	...	@@ -86,7 +88,10 @@
86	88	babyIds.add(babyService.addOneBaby(babyModel).getId());
87	89	}
88	90	}
89		-
	91	+ List list1 = autoMatchFacade.matchOrgId(userId);
	92	+ if(CollectionUtils.isNotEmpty(list1)){
	93	+ maternalDeliverModel.setHospitalId(list1.get(0)+"");
	94	+ }
90	95	maternalDeliverModel.setBaby(babyIds);
91	96	maternalDeliverModel.setYn(YnEnums.YES.getId());
92	97	matDeliverService.addMatDeliver(maternalDeliverModel);

...	...	@@ -39,10 +39,18 @@
39	39	private PatientsService patientsService;
40	40	@Autowired
41	41	private MatDeliverService matDeliverService;
	42	+ @Autowired
	43	+ private AutoMatchFacade autoMatchFacade;
42	44
43		- public BaseResponse addPostReview(PostReviewRequest postReviewRequest) {
	45	+ public BaseResponse addPostReview(PostReviewRequest postReviewRequest,Integer userId) {
44	46	if (StringUtils.isEmpty(postReviewRequest.getId())) {
45		- postReviewService.addPostReview(postReviewRequest.convertToDataModel());
	47	+ PostReviewModel postReviewModel = postReviewRequest.convertToDataModel();
	48	+ postReviewModel.setYn(YnEnums.YES.getId());
	49	+ List list1 = autoMatchFacade.matchOrgId(userId);
	50	+ if(CollectionUtils.isNotEmpty(list1)){
	51	+ postReviewModel.setHospitalId(list1.get(0)+"");
	52	+ }
	53	+ postReviewService.addPostReview(postReviewModel);
46	54	} else {
47	55	postReviewService.updatePostById(postReviewRequest.convertToDataModel(), postReviewRequest.getId());
48	56	}

...	...	@@ -13,6 +13,25 @@
13	13	//1 建档 2初诊 3 复诊 4 产后分娩 5 产后复查
14	14	private String type;
15	15
	16	+ private String hospitalName;
	17	+ private String hospitalId;
	18	+
	19	+ public String getHospitalId() {
	20	+ return hospitalId;
	21	+ }
	22	+
	23	+ public void setHospitalId(String hospitalId) {
	24	+ this.hospitalId = hospitalId;
	25	+ }
	26	+
	27	+ public String getHospitalName() {
	28	+ return hospitalName;
	29	+ }
	30	+
	31	+ public void setHospitalName(String hospitalName) {
	32	+ this.hospitalName = hospitalName;
	33	+ }
	34	+
16	35	public String getType() {
17	36	return type;
18	37	}
19	38
20	39
...	...	@@ -29,15 +48,17 @@
29	48	this.title = title;
30	49	}
31	50
32		- public AntData(AntenatalExaminationModel model) {
	51	+ public AntData(AntenatalExaminationModel model,String hospitalName) {
33	52	this.id = model.getId();
34	53	this.dueWeek = model.getCurrentDueDate();
35	54	this.checkTime = model.getCheckDate();
36	55	this.title="复诊";
37	56	this.type="3";
	57	+ this.hospitalName=hospitalName;
	58	+ this.hospitalId=model.getHospitalId();
38	59	}
39	60
40		- public AntData(AntExChuModel model) {
	61	+ public AntData(AntExChuModel model,String hospitalName) {
41	62	this.id = model.getId();
42	63	int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
43	64	String week = (days / 7) + "";
44	65
...	...	@@ -46,9 +67,11 @@
46	67	this.checkTime = model.getCheckTime();
47	68	this.title="初诊";
48	69	this.type="2";
	70	+ this.hospitalName=hospitalName;
	71	+ this.hospitalId=model.getHospitalId();
49	72	}
50	73
51		- public AntData(Patients model) {
	74	+ public AntData(Patients model,String hospitalName) {
52	75	this.id = model.getId();
53	76	int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
54	77	String week = (days / 7) + "";
55	78
...	...	@@ -57,9 +80,11 @@
57	80	this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated());
58	81	this.title="孕妇建档";
59	82	this.type="1";
	83	+ this.hospitalName=hospitalName;
	84	+ this.hospitalId=model.getHospitalId()+"";
60	85	}
61	86
62		- public AntData(MaternalDeliverModel model,Date lastMenses) {
	87	+ public AntData(MaternalDeliverModel model,Date lastMenses,String hospitalName) {
63	88	this.id = model.getId();
64	89	int days = DateUtil.daysBetween(lastMenses,model.getCreated());
65	90	String week = (days / 7) + "";
66	91
67	92
...	...	@@ -68,14 +93,18 @@
68	93	this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated());
69	94	this.title="孕妇分娩";
70	95	this.type="4";
	96	+ this.hospitalName=hospitalName;
	97	+ this.hospitalId=model.getHospitalId();
71	98	}
72	99
73		- public AntData(PostReviewModel postReviewModel) {
	100	+ public AntData(PostReviewModel postReviewModel,String hospitalName) {
74	101	this.id=postReviewModel.getId();
75	102	this.dueWeek=postReviewModel.getDay();
76	103	this.checkTime=postReviewModel.getCheckTime();
77	104	this.title="产后复查";
78	105	this.type="5";
	106	+ this.hospitalName=hospitalName;
	107	+ this.hospitalId=postReviewModel.getHospitalId();
79	108	}
80	109
81	110	public String getCheckTime() {