shiyang / regional-platform

Commit 821c4a89aa53296b1fdfb9096c723466f5a28f5d

Authored by baohanddd about 9 years ago

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/PatientStatusEnum.java
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

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * Created by Administrator on 2016/10/19 0019.
	5	+ */
	6	+public enum PatientStatusEnum {
	7	+
	8	+ daichuli(1,"待处理"),
	9	+ chulizhong(2,"处理中"),
	10	+ qita(3, "其它"),
	11	+ yihuifu(4, "已恢复"),
	12	+ yizhuanyuan(5, "已转院")
	13	+ ;
	14	+
	15	+ private PatientStatusEnum(Integer id, String title) {
	16	+ this.id = id;
	17	+ this.title = title;
	18	+ }
	19	+
	20	+ public static String getTitle(Integer id) {
	21	+ for (PatientStatusEnum e:values()) {
	22	+ if (e.getId() == id) {
	23	+ return e.getTitle();
	24	+ }
	25	+ }
	26	+ return "";
	27	+ }
	28	+
	29	+ public static PatientStatusEnum getEnum(Integer id) {
	30	+ for (PatientStatusEnum e:values()) {
	31	+ if (e.getId() == id) {
	32	+ return e;
	33	+ }
	34	+ }
	35	+ return null;
	36	+ }
	37	+
	38	+ private Integer id;
	39	+ private String title;
	40	+
	41	+ public Integer getId() {
	42	+ return id;
	43	+ }
	44	+
	45	+ public void setId(Integer id) {
	46	+ this.id = id;
	47	+ }
	48	+
	49	+ public String getTitle() {
	50	+ return title;
	51	+ }
	52	+
	53	+ public void setTitle(String title) {
	54	+ this.title = title;
	55	+ }
	56	+}

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