jiangjiazhi / regional-platform

Commit 40f3387fd099107a7ea45477eb62b3a0d21a7b7f

Authored by landong2015 over 8 years ago

Exists in master and in 8 other branches

提交代码

Showing 2 changed files with 140 additions and 24 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java

...	...	@@ -17,8 +17,10 @@
17	17	import com.lyms.platform.pojo.EmergenceTreatmentModel;
18	18	import com.lyms.platform.pojo.LisCrisisItem;
19	19	import com.lyms.platform.query.EmergenceTreatmentQuery;
	20	+import com.lyms.platform.query.LisCrisisItemQuery;
20	21	import org.apache.commons.collections.CollectionUtils;
21	22	import org.apache.commons.lang.StringUtils;
	23	+import org.apache.commons.lang.math.NumberUtils;
22	24	import org.springframework.beans.factory.annotation.Autowired;
23	25	import org.springframework.stereotype.Controller;
24	26	import org.springframework.web.bind.annotation.RequestMapping;
25	27
26	28
27	29
...	...	@@ -54,16 +56,22 @@
54	56	@RequestMapping(value = "/emergenceTreatments", method = RequestMethod.POST)
55	57	// @TokenRequired
56	58	public void addDepartments(HttpServletRequest request,
	59	+ HttpServletResponse response,
57	60	@RequestParam("id") String emergenceId,
58	61	@RequestParam("content") String content,
59		- @RequestParam("status") String status,
	62	+ @RequestParam(value = "status",required = false) Integer status,
	63	+ @RequestParam(value = "statusName",required = false) String statusName,
60	64	@RequestParam(value = "message", required = false) String message) {
61	65	Map<String, Object> map = new HashMap<>();
62	66	//判断emergenceId是否存在
63		- LisCrisisItem crisisItem = new LisCrisisItem();
64		- crisisItem.setId(emergenceId);
	67	+ LisCrisisItemQuery query = new LisCrisisItemQuery();
	68	+ query.setId(emergenceId);
	69	+ List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
	70	+ if (lisCrisisItemList.size()==0){
	71	+ ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在");
	72	+ return;
	73	+ }
65	74
66		-
67	75	//拿到登录用户的ID
68	76	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
69	77	Users users = usersService.getUsers(loginState.getId());
...	...	@@ -73,7 +81,7 @@
73	81	return;
74	82	}
75	83
76		- //
	84	+ //提交处理意见
77	85	EmergenceTreatmentModel model = new EmergenceTreatmentModel();
78	86	model.setEmergenceId(emergenceId);
79	87	model.setYn(YnEnums.YES.getId());
80	88
81	89
82	90
83	91
84	92
85	93
...	...	@@ -82,16 +90,32 @@
82	90
83	91	model.setDoctorName(users.getName());
84	92
	93	+ model.setContent(content);
85	94	//修改危急信息的状态和处理信息的状态
86		-
	95	+ LisCrisisItem lisCrisisItem = new LisCrisisItem();
	96	+ lisCrisisItem.setId(emergenceId);
87	97	//当状态code和状态名称,危急信息的Messages不为null时,修改危急信息数据
	98	+ if (status!=null){
	99	+ lisCrisisItem.setStatus(status);
	100	+ model.setStatus(status);
	101	+ }
	102	+ if (StringUtils.isNotEmpty(statusName)) {
	103	+ lisCrisisItem.setStatusName(statusName);
	104	+ model.setStatusName(statusName);
	105	+ }
88	106
	107	+ emergenceTreatmentService.addEmergenceTreatmentModel(model);
89	108
	109	+ if (status!=null \|\| StringUtils.isNotEmpty(statusName)){
	110	+ lisCrisisItemService.updateLisCrisisItem(lisCrisisItem,lisCrisisItem.getId());
	111	+ }
	112	+
90	113	//找到患者,拿到她的手机号,发送短信
91	114
92		-
93	115	//找到患者对应的用户,发送推送
94	116
	117	+ ResultUtils.buildSuccessResultAndWrite(response);
	118	+
95	119	}
96	120
97	121
98	122
99	123
...	...	@@ -104,31 +128,24 @@
104	128	// @TokenRequired
105	129	public void getEmergenceTreatments(HttpServletResponse response,
106	130	@Valid EmergenceTreatmentRequest emergenceTreatmentRequest) {
107		-
108		-// EmergenceTreatmentModel model = new EmergenceTreatmentModel();
109		-// model.setYn(YnEnums.YES.getId());
110		-// model.setCreated(new Date());
111		-// model.setModified(new Date());
112		-// model.setEmergenceId("12345678");
113		-// model.setContent("快来检查");
114		-// model.setStatus(1);
115		-// model.setStatusName("待处理");
116		-// model.setDoctorName("王医生");
117		-// emergenceTreatmentService.addEmergenceTreatmentModel(model);
118		-
119		- System.out.println("emergenceTreatmentService :" + emergenceTreatmentService);
120		-
121		-
122	131	String emergenceId = null;
123	132
124	133	if (StringUtils.isNotEmpty(emergenceTreatmentRequest.getId())){
125	134	//判断emergenceId是否存在
126		- emergenceId = emergenceTreatmentRequest.getId();
	135	+ LisCrisisItemQuery query = new LisCrisisItemQuery();
	136	+ query.setId(emergenceId);
	137	+ List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
	138	+ if (lisCrisisItemList.size()==1){
	139	+ emergenceId = lisCrisisItemList.get(0).getId();
	140	+ }else {
	141	+ ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在");
	142	+ return;
	143	+ }
127	144	}
128	145
129	146	//查询满足条件的数据
130	147	EmergenceTreatmentQuery query = new EmergenceTreatmentQuery();
131		- query.setEmergenceId(emergenceTreatmentRequest.getId());
	148	+ query.setEmergenceId(emergenceId);
132	149	query.setPage(emergenceTreatmentRequest.getPage());
133	150	query.setLimit(emergenceTreatmentRequest.getLimit());
134	151	query.setYn(YnEnums.YES.getId());

	1	+package com.lyms.platform.operate.web.controller;
	2	+
	3	+import com.lyms.platform.biz.dal.LisCrisisItemDao;
	4	+import com.lyms.platform.biz.dal.impl.LisCrisisItemDaoImpl;
	5	+import com.lyms.platform.biz.service.LisCrisisItemService;
	6	+import com.lyms.platform.common.result.IdTextModel;
	7	+import com.lyms.platform.common.utils.DateUtil;
	8	+import com.lyms.platform.common.utils.ResultUtils;
	9	+import com.lyms.platform.pojo.LisCrisisItem;
	10	+import com.lyms.platform.query.LisCrisisItemQuery;
	11	+import org.apache.commons.collections.CollectionUtils;
	12	+import org.springframework.beans.factory.annotation.Autowired;
	13	+import org.springframework.stereotype.Controller;
	14	+import org.springframework.web.bind.annotation.RequestMapping;
	15	+import org.springframework.web.bind.annotation.RequestMethod;
	16	+import org.springframework.web.bind.annotation.RequestParam;
	17	+
	18	+import javax.servlet.http.HttpServletResponse;
	19	+import java.util.*;
	20	+
	21	+/**
	22	+ *
	23	+ * 危急管理列表
	24	+ *
	25	+ * Created by Administrator on 2016/10/19 0019.
	26	+ */
	27	+@Controller
	28	+public class LisCrisisItemController {
	29	+
	30	+ @Autowired
	31	+ private LisCrisisItemService lisCrisisItemService;
	32	+ @Autowired
	33	+ private LisCrisisItemDao lisCrisisItemDao;
	34	+
	35	+
	36	+ @RequestMapping(value = "/lisCrisisItems", method = RequestMethod.GET)
	37	+// @TokenRequired
	38	+ public void getEmergenceTreatments(HttpServletResponse response,
	39	+ @RequestParam("page") int page,
	40	+ @RequestParam("limit") int limit){
	41	+ LisCrisisItemQuery query = new LisCrisisItemQuery();
	42	+ query.setSort("publishTime desc");
	43	+ query.setPage(page);
	44	+ query.setLimit(limit);
	45	+ List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
	46	+
	47	+ List<Map> list = new ArrayList<>();
	48	+
	49	+ if (CollectionUtils.isNotEmpty(lisCrisisItemList)){
	50	+ for (LisCrisisItem data : lisCrisisItemList){
	51	+ Map<String,Object> map = new HashMap<>();
	52	+ map.put("id",data.getId());
	53	+ map.put("hospitalId",data.getHospitalId());
	54	+ map.put("name",data.getName());
	55	+ map.put("age",data.getAge());
	56	+ map.put("weeks",data.getWeeks());
	57	+ map.put("itemCode",data.getItemCode());
	58	+ map.put("itemName",data.getItemName());
	59	+ map.put("classify",data.getClassify());
	60	+ map.put("classifyName",data.getClassifyName());
	61	+ map.put("flag",data.getFlag());
	62	+ map.put("ref",data.getRef());
	63	+ map.put("result",data.getResult());
	64	+ map.put("unit",data.getUnit());
	65	+ map.put("applyDoctorCode",data.getApplyDoctorCode());
	66	+ map.put("applyDoctorName",data.getApplyDoctorName());
	67	+ map.put("publishTime", DateUtil.getSecond(data.getPublishTime()));
	68	+ map.put("status",data.getStatus());
	69	+ map.put("statusName",data.getStatusName());
	70	+ list.add(map);
	71	+ }
	72	+ ResultUtils.buildSuccessResultAndWrite(response, list);
	73	+ }else {
	74	+ ResultUtils.buildParameterErrorResultAndWrite(response,"没有查询到数据");
	75	+ }
	76	+
	77	+ // LisCrisisItem data = new LisCrisisItem();
	78	+// data.setName("黄小希");
	79	+// data.setAge(30);
	80	+// data.setWeeks("17+3");
	81	+// data.setItemCode("123456789dfdsafsdafsdaf");
	82	+// data.setItemName("血红蛋白");
	83	+// data.setClassify("8");
	84	+// data.setClassifyName("血常规");
	85	+// data.setFlag("1");
	86	+// data.setRef("120~200");
	87	+// data.setResult("500");
	88	+// data.setUnit("g/L");
	89	+// data.setApplyDoctorCode("fsdfsdfsdaf4544fsdaf");
	90	+// data.setApplyDoctorName("王大伟");
	91	+// data.setPublishTime(new Date());
	92	+// data.setStatus(1);
	93	+// data.setStatusName("待处理");
	94	+// lisCrisisItemDao.addLisCrisisItem(data);
	95	+
	96	+
	97	+ }
	98	+
	99	+}