jiangjiazhi / regional-platform

Commit 03030d5ba5540697535ee51e05febb060e48c64d

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

听力诊断配置文件

Showing 6 changed files with 58 additions and 55 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarHearingDiagnoseService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
platform-operate-api/src/main/resources/rebel.xml

...	...	@@ -5,7 +5,6 @@
5	5	import com.lyms.platform.pojo.BabyModel;
6	6
7	7	import java.util.Date;
8		-import java.util.List;
9	8
10	9
11	10	public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery {
...	...	@@ -24,7 +23,7 @@
24	23	/**
25	24	* 儿童档案id
26	25	*/
27		- private List<String> babyIds;
	26	+ private String[] babyIds;
28	27	/**
29	28	* 创建医院ID
30	29	*/
31	30
...	...	@@ -842,11 +841,11 @@
842	841	this.oaeRight750 = oaeRight750;
843	842	}
844	843
845		- public List<String> getBabyIds() {
	844	+ public String[] getBabyIds() {
846	845	return babyIds;
847	846	}
848	847
849		- public void setBabyIds(List<String> babyIds) {
	848	+ public void setBabyIds(String[] babyIds) {
850	849	this.babyIds = babyIds;
851	850	}
852	851

...	...	@@ -10,7 +10,7 @@
10	10	public class BabyPatientExtendEarScreenQuery extends BaseQuery {
11	11	private String id;
12	12	//听诊儿童档案集合
13		- private List<String> babyIds;
	13	+ private String[] babyIds;
14	14
15	15	private String babyId;
16	16
17	17
...	...	@@ -174,11 +174,11 @@
174	174
175	175	}
176	176
177		- public List<String> getBabyIds() {
	177	+ public String[] getBabyIds() {
178	178	return babyIds;
179	179	}
180	180
181		- public void setBabyIds(List<String> babyIds) {
	181	+ public void setBabyIds(String[] babyIds) {
182	182	this.babyIds = babyIds;
183	183	}
184	184

...	...	@@ -21,7 +21,7 @@
21	21	public List<BabyPatientExtendEarHearingDiagnose> queryBabyPatientExtendEarHearingDiagnose(BabyPatientExtendEarHearingDiagnoseQuery query);
22	22
23	23	/**
24		- * 查询待诊断、已诊断、本院、外院等....
	24	+ * 鏌ヨ寰呰瘖鏂佸凡璇婃柇銆佹湰闄€佸闄㈢瓑....
25	25	* @param query
26	26	* @return
27	27	*/

...	...	@@ -65,6 +65,7 @@
65	65	*/
66	66	@RequestMapping(method = RequestMethod.GET, value = "/initFollowUp")
67	67	@ResponseBody
	68	+ @TokenRequired
68	69	public BaseResponse initFollowUp(String babyId) {
69	70	if (StringUtils.isNotEmpty(babyId)) {//传入儿童档案id
70	71	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
...	...	@@ -123,6 +124,7 @@
123	124	*/
124	125	@RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose")
125	126	@ResponseBody
	127	+ @TokenRequired
126	128	public BaseResponse initHearingDiagnose(String babyId, HttpServletRequest request) {
127	129	//获取当前登录用户ID
128	130	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
...	...	@@ -132,7 +134,7 @@
132	134	//当前登录人医院Id
133	135	String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
134	136
135		- if (StringUtils.isNotEmpty(babyId)) {//传入儿童档案id
	137	+ if (StringUtils.isEmpty(babyId)) {//传入儿童档案id
136	138	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
137	139	}
138	140
...	...	@@ -183,6 +185,7 @@
183	185	*/
184	186	@RequestMapping(method = RequestMethod.GET, value = "/initHighrChangeHosp")
185	187	@ResponseBody
	188	+ @TokenRequired
186	189	public BaseResponse initHighrChangeHosp(String babyId, HttpServletRequest request) {
187	190	//根据babyId和当前医院id
188	191	//获取当前登录用户ID

...	...	@@ -135,12 +135,53 @@
135	135	if (loginState == null) {
136	136	return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
137	137	}
	138	+
	139	+ //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
	140	+ if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡
	141	+ //调用mysql表查询baby档案。表还未设计
	142	+ }
	143	+
138	144	//当前登录人医院Id
139	145	String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
	146	+ //医院ID 集合。本院、外院、全部...
	147	+ List<String> outOrgids = new ArrayList<>();
	148	+ if (hdReq.getSource() == 2) {//2.转诊过来的医院、
	149	+ //转诊过来的医院id
	150	+ HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
	151	+ hchQuery.setTargetType(2);//儿童
	152	+ hchQuery.setChangeType(1);//听力转诊
	153	+ hchQuery.setStatus(2);//已接受
	154	+ hchQuery.setIntoOrgid(hospitalId);
	155	+ List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
	156	+ if (hchList != null && hchList.size() > 0) {
	157	+ for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
	158	+ outOrgids.add(hch.getOutOrgid());
	159	+ }
	160	+ }
	161	+ } else if (hdReq.getSource() == 1) {//1.本院
	162	+ //当前医院
	163	+ outOrgids.add(hospitalId);
	164	+ } else {//4.全部医院/默认全部医院
	165	+ //当前医院
	166	+ outOrgids.add(hospitalId);
	167	+ //转诊过来的医院id
	168	+ HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
	169	+ hchQuery.setTargetType(2);//儿童
	170	+ hchQuery.setChangeType(1);//听力转诊
	171	+ hchQuery.setStatus(2);//已接受
	172	+ hchQuery.setIntoOrgid(hospitalId);
	173	+ List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
	174	+ if (hchList != null && hchList.size() > 0) {
	175	+ for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
	176	+ outOrgids.add(hch.getOutOrgid());
	177	+ }
	178	+ }
	179	+ }
	180	+
140	181	BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
141		- //设置分页信息
142		- query.setLimit(hdReq.getLimit());
143		- query.setPage(hdReq.getPage());
	182	+ //设置要显示的医院集合（已加入条件本院、外院、全部）
	183	+ query.setCheckHospitalIds((String[])outOrgids.toArray(new String[outOrgids.size()]));
	184	+
144	185	if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间
145	186	query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime());
146	187	}
147	188
...	...	@@ -179,47 +220,7 @@
179	220	query.setConfirmEndTime(hdReq.getConfirmEndTime());
180	221	}
181	222
182		- //医院ID 集合。本院、外院、全部...
183		- List<String> outOrgids = new ArrayList<>();
184		- if (hdReq.getSource() == 2) {//2.*医院、
185		- //转诊过来的医院id
186		- HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
187		- hchQuery.setTargetType(2);//儿童
188		- hchQuery.setChangeType(1);//听力转诊
189		- hchQuery.setStatus(2);//已接受
190		- hchQuery.setIntoOrgid(hospitalId);
191		- List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
192		- if (hchList != null && hchList.size() > 0) {
193		- for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
194		- outOrgids.add(hch.getOutOrgid());
195		- }
196		- }
197		- } else if (hdReq.getSource() == 1) {//1.本院
198		- //当前医院
199		- outOrgids.add(hospitalId);
200		- } else {//4.全部医院/默认全部医院
201		- //当前医院
202		- outOrgids.add(hospitalId);
203		- //转诊过来的医院id
204		- HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
205		- hchQuery.setTargetType(2);//儿童
206		- hchQuery.setChangeType(1);//听力转诊
207		- hchQuery.setStatus(2);//已接受
208		- hchQuery.setIntoOrgid(hospitalId);
209		- List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
210		- if (hchList != null && hchList.size() > 0) {
211		- for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
212		- outOrgids.add(hch.getOutOrgid());
213		- }
214		- }
215		- }
216	223
217		- if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡
218		- //调用mysql表查询baby档案。表还未设计
219		- }
220		-
221		- //设置要显示的医院集合
222		- // query.setCheckHospitalIds(outOrgids);
223	224
224	225	//根据当前医院id，和已接受儿童档案的转入医院id 进行查询
225	226	if (hdReq.getEnalble() == 2) {//2待诊断，查询听筛记录，还未做听诊的

1	1	<?xml version="1.0" encoding="UTF-8"?>
2		-<application generated-by="eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
	2	+<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
3	3
4	4	<classpath>
5		- <dir name="E:/Workspaces-lyms/regional-platform/platform-operate-api/target/classes">
	5	+ <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/target/classes">
6	6	</dir>
7	7	</classpath>
8	8
9	9	<web>
10	10	<link target="/">
11		- <dir name="E:/Workspaces-lyms/regional-platform/platform-operate-api/src/main/webapp">
	11	+ <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/src/main/webapp">
12	12	</dir>
13	13	</link>
14	14	</web>