jiangjiazhi / regional-platform

Commit bc9d4b814952557f4aa87ede8fa2f90221a279cc

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

产筛

Showing 8 changed files with 113 additions and 21 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java

...	...	@@ -70,8 +70,8 @@
70	70	//既往史
71	71	private String pastHistory;
72	72
73		- //申请医院
74		- private String applyHospitalId;
	73	+ //产筛医院
	74	+ private String sieveHospitalId;
75	75
76	76	//送检医生
77	77	private String sendDoctor;
78	78
...	...	@@ -204,12 +204,12 @@
204	204	this.pastHistory = pastHistory;
205	205	}
206	206
207		- public String getApplyHospitalId() {
208		- return applyHospitalId;
	207	+ public String getSieveHospitalId() {
	208	+ return sieveHospitalId;
209	209	}
210	210
211		- public void setApplyHospitalId(String applyHospitalId) {
212		- this.applyHospitalId = applyHospitalId;
	211	+ public void setSieveHospitalId(String sieveHospitalId) {
	212	+ this.sieveHospitalId = sieveHospitalId;
213	213	}
214	214
215	215	public Date getApplyTime() {

...	...	@@ -75,6 +75,28 @@
75	75	//接收状态 1未接收 2接收
76	76	private Integer reviceStatus;
77	77
	78	+ //产筛医院
	79	+ private String sieveHospitalId;
	80	+
	81	+ //申请医院
	82	+ private String applyHospitalId;
	83	+
	84	+ public String getSieveHospitalId() {
	85	+ return sieveHospitalId;
	86	+ }
	87	+
	88	+ public void setSieveHospitalId(String sieveHospitalId) {
	89	+ this.sieveHospitalId = sieveHospitalId;
	90	+ }
	91	+
	92	+ public String getApplyHospitalId() {
	93	+ return applyHospitalId;
	94	+ }
	95	+
	96	+ public void setApplyHospitalId(String applyHospitalId) {
	97	+ this.applyHospitalId = applyHospitalId;
	98	+ }
	99	+
78	100	public Integer getReviceStatus() {
79	101	return reviceStatus;
80	102	}

...	...	@@ -76,6 +76,28 @@
76	76	private Date applyTimeStart;
77	77	private Date applyTimeEnd;
78	78
	79	+ //产筛医院
	80	+ private String sieveHospitalId;
	81	+
	82	+ //申请医院
	83	+ private String applyHospitalId;
	84	+
	85	+ public String getSieveHospitalId() {
	86	+ return sieveHospitalId;
	87	+ }
	88	+
	89	+ public void setSieveHospitalId(String sieveHospitalId) {
	90	+ this.sieveHospitalId = sieveHospitalId;
	91	+ }
	92	+
	93	+ public String getApplyHospitalId() {
	94	+ return applyHospitalId;
	95	+ }
	96	+
	97	+ public void setApplyHospitalId(String applyHospitalId) {
	98	+ this.applyHospitalId = applyHospitalId;
	99	+ }
	100	+
79	101	public Date getApplyTimeStart() {
80	102	return applyTimeStart;
81	103	}
...	...	@@ -225,6 +247,15 @@
225	247	if (null != hospitalId) {
226	248	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
227	249	}
	250	+
	251	+ if (null != sieveHospitalId) {
	252	+ condition = condition.and("sieveHospitalId", sieveHospitalId, MongoOper.IS);
	253	+ }
	254	+
	255	+ if (null != applyHospitalId) {
	256	+ condition = condition.and("applyHospitalId", applyHospitalId, MongoOper.IS);
	257	+ }
	258	+
228	259	if (null != parentId) {
229	260	condition = condition.and("parentId", parentId, MongoOper.IS);
230	261	}

...	...	@@ -226,8 +226,24 @@
226	226	@TokenRequired
227	227	public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){
228	228	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
229		- return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true");
	229	+ return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true",false);
230	230	}
	231	+
	232	+
	233	+ /**
	234	+ * 实验室产筛管理
	235	+ * @param cqSieveQueryRequest
	236	+ * @param request
	237	+ * @return
	238	+ */
	239	+ @ResponseBody
	240	+ @RequestMapping(value = "/sieveLabManage",method = RequestMethod.GET)
	241	+ @TokenRequired
	242	+ public BaseResponse sieveLabManage(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){
	243	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	244	+ return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true",true);
	245	+ }
	246	+
231	247
232	248
233	249	/**

...	...	@@ -424,6 +424,8 @@
424	424	SieveModel sieveModel = patientsService.convertToModel(patients);
425	425	sieveModel.setReviceStatus(1);
426	426	sieveModel.setFrom("2");
	427	+ sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
	428	+ sieveModel.setApplyHospitalId(hospitalId);
427	429	sieveModel.setHospitalId(orderModel.getHospitalId());
428	430	SieveService.handOrder(sieveModel);
429	431	sieveService.addChanQianSieve(sieveModel);
430	432
...	...	@@ -454,9 +456,9 @@
454	456	if (CollectionUtils.isNotEmpty(sieveModels))
455	457	{
456	458	SieveModel sieveModel = sieveModels.get(0);
457		-
458	459	sieveModel.setReviceStatus(1);
459		-
	460	+ sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId());
	461	+ sieveModel.setApplyHospitalId(hospitalId);
460	462	sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime());
461	463	sieveModel.setStatus(2);
462	464	if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) {

...	...	@@ -339,7 +339,7 @@
339	339	* @param cqSieveQueryRequest
340	340	* @return
341	341	*/
342		- public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage) {
	342	+ public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage,boolean isSieveLagManage) {
343	343
344	344	SieveQuery sieveQuery = new SieveQuery();
345	345	sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo());
...	...	@@ -397,7 +397,18 @@
397	397	sieveQuery.setLimit(cqSieveQueryRequest.getLimit());
398	398	sieveQuery.setNeed(needPage);
399	399	String hospitalId = autoMatchFacade.getHospitalId(userId);
400		- sieveQuery.setHospitalId(hospitalId);
	400	+
	401	+ if(isSieveLagManage)
	402	+ {
	403	+ sieveQuery.setApplyHospitalId(hospitalId);
	404	+ sieveQuery.setSieveHospitalId(hospitalId);
	405	+ }
	406	+ else
	407	+ {
	408	+ sieveQuery.setHospitalId(hospitalId);
	409	+ }
	410	+
	411	+
401	412	//查询产筛list
402	413	List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
403	414	List<SieveListResult> data = new ArrayList<>();
...	...	@@ -424,7 +435,7 @@
424	435	public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
425	436	try {
426	437
427		- BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null);
	438	+ BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null,false);
428	439
429	440	List<SieveListResult> list = listResponse.getData();
430	441	List<Map<String, Object>> datas = new ArrayList<>();
...	...	@@ -713,7 +724,7 @@
713	724	result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
714	725	result.put("historyBirth",sieveApply.getHistoryBirth());
715	726	result.put("pastHistory",sieveApply.getPastHistory());
716		- result.put("applyHospitalId",sieveApply.getApplyHospitalId());
	727	+ result.put("sieveHospitalId",sieveApply.getSieveHospitalId());
717	728	result.put("sendDoctor",sieveApply.getSendDoctor());
718	729	result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
719	730	result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
...	...	@@ -734,7 +745,7 @@
734	745	String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService);
735	746	viewInfo.put("sendDoctorName",sendDoctorName);
736	747
737		- String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getApplyHospitalId(),organizationService);
	748	+ String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(),organizationService);
738	749	viewInfo.put("applyHospitalName", applyHospitalName);
739	750
740	751	String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService);

...	...	@@ -57,6 +57,16 @@
57	57
58	58	//申请时间
59	59	private String applyTime;
	60	+ //申请医院
	61	+ private String applyHospitalId;
	62	+
	63	+ public String getApplyHospitalId() {
	64	+ return applyHospitalId;
	65	+ }
	66	+
	67	+ public void setApplyHospitalId(String applyHospitalId) {
	68	+ this.applyHospitalId = applyHospitalId;
	69	+ }
60	70
61	71	public String getApplyTime() {
62	72	return applyTime;

...	...	@@ -66,8 +66,8 @@
66	66	//既往史
67	67	private String pastHistory;
68	68
69		- //申请医院
70		- private String applyHospitalId;
	69	+ //产筛医院
	70	+ private String sieveHospitalId;
71	71
72	72	//接收状态 1未接收 2接收
73	73	private Integer reviceStatus;
...	...	@@ -105,7 +105,7 @@
105	105	sieveApplyOrderModel.setBcCheckDate(StringUtils.isNotEmpty(bcCheckDate) ? DateUtil.parseYMD(bcCheckDate) : null);
106	106	sieveApplyOrderModel.setHistoryBirth(historyBirth);
107	107	sieveApplyOrderModel.setPastHistory(pastHistory);
108		- sieveApplyOrderModel.setApplyHospitalId(applyHospitalId);
	108	+ sieveApplyOrderModel.setSieveHospitalId(sieveHospitalId);
109	109	sieveApplyOrderModel.setSendDoctor(sendDoctor);
110	110	sieveApplyOrderModel.setSendTime(StringUtils.isNotEmpty(sendTime) ? DateUtil.parseYMD(sendTime) : null);
111	111	sieveApplyOrderModel.setMensesDay(mensesDay);
112	112
...	...	@@ -259,12 +259,12 @@
259	259	this.pastHistory = pastHistory;
260	260	}
261	261
262		- public String getApplyHospitalId() {
263		- return applyHospitalId;
	262	+ public String getSieveHospitalId() {
	263	+ return sieveHospitalId;
264	264	}
265	265
266		- public void setApplyHospitalId(String applyHospitalId) {
267		- this.applyHospitalId = applyHospitalId;
	266	+ public void setSieveHospitalId(String sieveHospitalId) {
	267	+ this.sieveHospitalId = sieveHospitalId;
268	268	}
269	269
270	270	public String getApplyTime() {