jiangjiazhi / regional-platform

Commit 51cdf0bcaaa008cb9d234970ce38a21e9f11e8f3

Authored by jiangjiazhi over 8 years ago

Exists in master and in 6 other branches

commit

Showing 4 changed files with 41 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java

...	...	@@ -146,6 +146,16 @@
146	146	*/
147	147	private Date createDate;
148	148
	149	+ private Integer yn;
	150	+
	151	+ public Integer getYn() {
	152	+ return yn;
	153	+ }
	154	+
	155	+ public void setYn(Integer yn) {
	156	+ this.yn = yn;
	157	+ }
	158	+
149	159	public String getId() {
150	160	return id;
151	161	}

...	...	@@ -69,6 +69,16 @@
69	69	*/
70	70	private Integer operatorId;
71	71
	72	+ private Integer yn;
	73	+
	74	+ public Integer getYn() {
	75	+ return yn;
	76	+ }
	77	+
	78	+ public void setYn(Integer yn) {
	79	+ this.yn = yn;
	80	+ }
	81	+
72	82	public String getId() {
73	83	return id;
74	84	}

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.common.base.LoginContext;
6	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
7	7	import com.lyms.platform.common.result.BaseObjectResponse;
	8	+import com.lyms.platform.common.result.BaseResponse;
8	9	import com.lyms.platform.common.utils.ExceptionUtils;
9	10	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
10	11	import com.lyms.platform.operate.web.facade.DischargeAbstractFacade;
...	...	@@ -15,10 +16,7 @@
15	16	import com.lyms.platform.permission.service.CouponService;
16	17	import org.springframework.beans.factory.annotation.Autowired;
17	18	import org.springframework.stereotype.Controller;
18		-import org.springframework.web.bind.annotation.RequestBody;
19		-import org.springframework.web.bind.annotation.RequestMapping;
20		-import org.springframework.web.bind.annotation.RequestMethod;
21		-import org.springframework.web.bind.annotation.ResponseBody;
	19	+import org.springframework.web.bind.annotation.*;
22	20
23	21	import javax.servlet.http.HttpServletRequest;
24	22
...	...	@@ -97,5 +95,11 @@
97	95	return baseObjectResponse;
98	96	}
99	97
	98	+ @TokenRequired
	99	+ @ResponseBody
	100	+ @RequestMapping(value = "discharge", method = RequestMethod.DELETE)
	101	+ public BaseResponse delDisCharge(@RequestParam("id")String id){
	102	+ return dischargeAbstractFacade.delDisCharge(id);
	103	+ }
100	104	}

...	...	@@ -8,6 +8,7 @@
8	8	import com.lyms.platform.common.enums.RenShenJieJuEnums;
9	9	import com.lyms.platform.common.enums.YnEnums;
10	10	import com.lyms.platform.common.result.BaseObjectResponse;
	11	+import com.lyms.platform.common.result.BaseResponse;
11	12	import com.lyms.platform.common.result.ResponseCode;
12	13	import com.lyms.platform.common.utils.BeanUtils;
13	14	import com.lyms.platform.common.utils.DateUtil;
...	...	@@ -92,6 +93,7 @@
92	93	dischargeAbstractMotherModel.setOperatorId(dischargeAbstractSaveRequest.getOperatorId());
93	94	dischargeAbstractMotherModel.setAfterMakeBabyDays(DateUtil.getDays(DateUtil.parseYMD(dischargeAbstractSaveRequest.getFmDate()), new Date()));
94	95	dischargeAbstractMotherModel.setpId(dischargeAbstractSaveRequest.getpId());
	96	+ dischargeAbstractMotherModel.setYn(YnEnums.YES.getId());
95	97	if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) {
96	98	dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel);
97	99
...	...	@@ -295,5 +297,16 @@
295	297	return dischargeAbstractQueryResult;
296	298	}
297	299
	300	+ /**
	301	+ * 删除出院小结
	302	+ * @return
	303	+ */
	304	+ public BaseResponse delDisCharge(String id){
	305	+ DischargeAbstractMotherModel dischargeAbstractMotherQueryModel = new DischargeAbstractMotherModel();
	306	+ dischargeAbstractMotherQueryModel.setYn(YnEnums.NO.getId());
	307	+ dischargeAbstractMotherQueryModel.setId(id);
	308	+ dischargeAbstractMotherService.update(dischargeAbstractMotherQueryModel);
	309	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	310	+ }
298	311	}