jiangjiazhi / regional-platform

Commit 7b6d23dad61ccace175f1e8f061846f16a6bd94f

Authored by liquanyu about 4 years ago

Exists in master and in 6 other branches

update

Showing 10 changed files with 163 additions and 15 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java
platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.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/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java

...	...	@@ -43,5 +43,7 @@
43	43	* @param referralApplyOrderModel
44	44	*/
45	45	void updateOne(ReferralApplyOrderModel referralApplyOrderModel);
	46	+
	47	+
46	48	}

...	...	@@ -74,5 +74,9 @@
74	74	public void updateByParentId(ReferralApplyOrderQuery referralApplyOrderQuery, ReferralApplyOrderModel orderModel) {
75	75	iReferralApplyOrderDao.findAndModify(referralApplyOrderQuery.convertToQuery(), orderModel);
76	76	}
	77	+
	78	+ public void updateReferralApplyOrder(ReferralApplyOrderModel orderModel) {
	79	+ iReferralApplyOrderDao.updateOne(orderModel);
	80	+ }
77	81	}

...	...	@@ -7,7 +7,8 @@
7	7	CREATED("待接收", "1"),
8	8	O("已接收", "2"),
9	9	O1("建议转诊", "3"),
10		- O2("拒绝接收", "4");
	10	+ O2("拒绝接收", "4"),
	11	+ O3("已转回", "5");
11	12
12	13
13	14	private ApplyOrderStatusEnums(String name, String id) {

...	...	@@ -77,13 +77,21 @@
77	77	private String applyDoctor;
78	78	//接收日期
79	79	private Date received;
	80	+
	81	+ //转回日期
	82	+ private Date backDate;
	83	+ private String backUserId;
	84	+
80	85	//接收医生
81	86	private String recDoctor;
82	87	//创建时间
83	88	private Date created;
84	89	//修改时间
85	90	private Date modified;
86		- //申请单状态 0 已接收 1 已转出 2 建议转诊
	91	+ //申请单状态 CREATED("待接收", "1"),
	92	+// O("已接收", "2"),
	93	+// O1("建议转诊", "3"),
	94	+// O2("拒绝接收", "4");
87	95	private Integer status;
88	96	//转诊类型 1 儿童 2 孕妇
89	97	private Integer type;
...	...	@@ -96,6 +104,22 @@
96	104	private String otherDiagn;
97	105	//拒绝原因
98	106	private String reason;
	107	+
	108	+ public Date getBackDate() {
	109	+ return backDate;
	110	+ }
	111	+
	112	+ public void setBackDate(Date backDate) {
	113	+ this.backDate = backDate;
	114	+ }
	115	+
	116	+ public String getBackUserId() {
	117	+ return backUserId;
	118	+ }
	119	+
	120	+ public void setBackUserId(String backUserId) {
	121	+ this.backUserId = backUserId;
	122	+ }
99	123
100	124	public String getReason() {
101	125	return reason;

...	...	@@ -80,6 +80,10 @@
80	80	private Date revicedStart;
81	81	private Date revicedEnd;
82	82
	83	+
	84	+ private Date backDateStart;
	85	+ private Date backDateEnd;
	86	+
83	87	private Date transferredStart;
84	88
85	89	private Date transferredEnd;
86	90
...	...	@@ -96,7 +100,22 @@
96	100	//查询号
97	101	private String queryNo;
98	102
	103	+ public Date getBackDateStart() {
	104	+ return backDateStart;
	105	+ }
99	106
	107	+ public void setBackDateStart(Date backDateStart) {
	108	+ this.backDateStart = backDateStart;
	109	+ }
	110	+
	111	+ public Date getBackDateEnd() {
	112	+ return backDateEnd;
	113	+ }
	114	+
	115	+ public void setBackDateEnd(Date backDateEnd) {
	116	+ this.backDateEnd = backDateEnd;
	117	+ }
	118	+
100	119	public Date getLastMenses() {
101	120	return lastMenses;
102	121	}
...	...	@@ -404,6 +423,23 @@
404	423	c = Criteria.where("received").lte(revicedEnd);
405	424	}
406	425	}
	426	+
	427	+
	428	+ if (null != backDateStart) {
	429	+ if (null != c) {
	430	+ c = c.where("backDate").gte(backDateStart);
	431	+ } else {
	432	+ c = Criteria.where("backDate").gte(backDateStart);
	433	+ }
	434	+ }
	435	+ if (null != backDateEnd) {
	436	+ if (c != null) {
	437	+ c = c.lte(backDateEnd);
	438	+ } else {
	439	+ c = Criteria.where("backDate").lte(backDateEnd);
	440	+ }
	441	+ }
	442	+
407	443	if (null != transferredStart) {
408	444	if (c != null) {
409	445	c = c.where("created").gte(transferredStart);

...	...	@@ -58,6 +58,16 @@
58	58	return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId(), 2);
59	59	}
60	60
	61	+
	62	+ @RequestMapping(method = RequestMethod.POST, value = "/backReferralapply")
	63	+ @ResponseBody
	64	+ @TokenRequired
	65	+ public BaseResponse backReferralapply(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest, HttpServletRequest request) {
	66	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	67	+ return applyOrderFacade.backReferralapply(applyOrderAddRequest, loginState.getId());
	68	+ }
	69	+
	70	+
61	71	//增加转诊申请单
62	72	@RequestMapping(method = RequestMethod.POST, value = "/referrbapply")
63	73	@ResponseBody

...	...	@@ -888,17 +888,17 @@
888	888	}
889	889
890	890	Patients patients = null;
891		- BabyModel babyModel = null;
	891	+// BabyModel babyModel = null;
892	892	if (referralApplyOrderModel.getType() == 2 )
893	893	{
894	894	patients = patientsService.findOnePatientById(referralApplyOrderModel.getParentId());
895	895	List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
896	896	referralApplyOrderResult.setScreenResult(screenList);
897	897	}
898		- else
899		- {
900		- babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId());
901		- }
	898	+// else
	899	+// {
	900	+// babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId());
	901	+// }
902	902
903	903	referralApplyOrderResult.convertToResult(referralApplyOrderModel, patients, zhuanCName, zhuanRname);
904	904	referralApplyOrderResult.setTransferredHospital(map1);
...	...	@@ -1014,6 +1014,17 @@
1014	1014	}
1015	1015	}
1016	1016
	1017	+
	1018	+ if (StringUtils.isNotEmpty(applyOrderQueryRequest.getBackDate())) {
	1019	+ String[] str = applyOrderQueryRequest.getBackDate().split(" - ");
	1020	+ if (str.length > 1) {
	1021	+ referralApplyOrderQuery.setBackDateStart(DateUtil.parseYMD(str[0]));
	1022	+ }
	1023	+ if (str.length == 2) {
	1024	+ referralApplyOrderQuery.setBackDateEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000));
	1025	+ }
	1026	+ }
	1027	+
1017	1028	if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferred())) {
1018	1029	String[] str = applyOrderQueryRequest.getTransferred().split(" - ");
1019	1030	if (str.length > 1) {
...	...	@@ -2367,7 +2378,19 @@
2367	2378	}
2368	2379	}
2369	2380
2370		-
	2381	+ public BaseResponse backReferralapply(ReferralApplyOrderAddRequest applyOrderAddRequest, Integer userId) {
	2382	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
	2383	+ referralApplyOrderQuery.setId(applyOrderAddRequest.getId());
	2384	+ List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	2385	+ if (CollectionUtils.isNotEmpty(list))
	2386	+ {
	2387	+ ReferralApplyOrderModel orderModel = list.get(0);
	2388	+ orderModel.setBackDate(DateUtil.parseYMD(applyOrderAddRequest.getBackDate()));
	2389	+ orderModel.setBackUserId(userId.toString());
	2390	+ applyOrderService.updateReferralApplyOrder(orderModel);
	2391	+ }
	2392	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功!");
	2393	+ }
2371	2394
2372	2395
2373	2396	/拼json使用/

...	...	@@ -137,8 +137,9 @@
137	137
138	138	@Autowired
139	139	private BabyCheckService babyCheckService;
140		-
141	140	@Autowired
	141	+ private ApplyOrderService applyOrderService;
	142	+ @Autowired
142	143	private UsersService usersService;
143	144
144	145
145	146
146	147
...	...	@@ -3724,14 +3725,28 @@
3724	3725	}
3725	3726
3726	3727	String status = "";
3727		- if ("0".equals(model.getEnable()))
	3728	+
	3729	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
	3730	+ referralApplyOrderQuery.setParentId(model.getParentId());
	3731	+ List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	3732	+
	3733	+ if (CollectionUtils.isNotEmpty(list))
3728	3734	{
3729		- status = "已转诊";
	3735	+ //ApplyOrderStatusEnums
	3736	+ if (list.get(0).getStatus() == 1)
	3737	+ {
	3738	+ status = "已转诊";
	3739	+ }
	3740	+ else if (list.get(0).getStatus() == 2)
	3741	+ {
	3742	+ status = "已转诊已接收";
	3743	+ }
	3744	+ else if (list.get(0).getStatus() == 3)
	3745	+ {
	3746	+ status = "已转诊已接收已转回";
	3747	+ }
3730	3748	}
3731		- else if ("1".equals(model.getEnable()))
3732		- {
3733		- status = "已接收";
3734		- }
	3749	+
3735	3750
3736	3751	String hospitalAddress = "";
3737	3752	if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getHospitalId())) {

...	...	@@ -40,6 +40,17 @@
40	40	//查询号
41	41	private String queryNo;
42	42
	43	+ //转回日期
	44	+ private String backDate;
	45	+
	46	+ public String getBackDate() {
	47	+ return backDate;
	48	+ }
	49	+
	50	+ public void setBackDate(String backDate) {
	51	+ this.backDate = backDate;
	52	+ }
	53	+
43	54	public String getQueryNo() {
44	55	return queryNo;
45	56	}

...	...	@@ -13,6 +13,8 @@
13	13	@Form
14	14	public class ReferralApplyOrderAddRequest implements IBasicRequestConvert<ReferralApplyOrderModel> {
15	15
	16	+
	17	+ private String id;
16	18	private
17	19	String pid;
18	20
...	...	@@ -32,6 +34,26 @@
32	34	private String transferMode;
33	35	@FormParam
34	36	private String applyDoctor;
	37	+
	38	+ private String backDate;
	39	+
	40	+
	41	+ public String getId() {
	42	+ return id;
	43	+ }
	44	+
	45	+ public void setId(String id) {
	46	+ this.id = id;
	47	+ }
	48	+
	49	+ public String getBackDate() {
	50	+ return backDate;
	51	+ }
	52	+
	53	+ public void setBackDate(String backDate) {
	54	+ this.backDate = backDate;
	55	+ }
	56	+
35	57	public String getPid() {
36	58	return pid;
37	59	}