From 51cdf0bcaaa008cb9d234970ce38a21e9f11e8f3 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 12 Jun 2017 17:08:40 +0800 Subject: [PATCH] commit --- .../com/lyms/platform/pojo/DischargeAbstractBabyModel.java | 10 ++++++++++ .../lyms/platform/pojo/DischargeAbstractMotherModel.java | 10 ++++++++++ .../operate/web/controller/DischargeAbstractController.java | 12 ++++++++---- .../operate/web/facade/DischargeAbstractFacade.java | 13 +++++++++++++ 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java index 0c95b5f..e08ce51 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java @@ -146,6 +146,16 @@ public class DischargeAbstractBabyModel extends BaseModel { */ private Date createDate; + private Integer yn; + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + public String getId() { return id; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java index 97fc0f4..cf60a3e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java @@ -69,6 +69,16 @@ public class DischargeAbstractMotherModel extends BaseModel { */ private Integer operatorId; + private Integer yn; + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + public String getId() { return id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java index 9fbb64d..230ba75 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.DischargeAbstractFacade; @@ -15,10 +16,7 @@ import com.lyms.platform.operate.web.result.DischargeAbstractSaveResult; import com.lyms.platform.permission.service.CouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -97,4 +95,10 @@ public class DischargeAbstractController extends BaseController { return baseObjectResponse; } + @TokenRequired + @ResponseBody + @RequestMapping(value = "discharge", method = RequestMethod.DELETE) + public BaseResponse delDisCharge(@RequestParam("id")String id){ + return dischargeAbstractFacade.delDisCharge(id); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 2adb69b..35ac06b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.RenShenJieJuEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.ResponseCode; import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.DateUtil; @@ -92,6 +93,7 @@ public class DischargeAbstractFacade { dischargeAbstractMotherModel.setOperatorId(dischargeAbstractSaveRequest.getOperatorId()); dischargeAbstractMotherModel.setAfterMakeBabyDays(DateUtil.getDays(DateUtil.parseYMD(dischargeAbstractSaveRequest.getFmDate()), new Date())); dischargeAbstractMotherModel.setpId(dischargeAbstractSaveRequest.getpId()); + dischargeAbstractMotherModel.setYn(YnEnums.YES.getId()); if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) { dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel); @@ -295,4 +297,15 @@ public class DischargeAbstractFacade { return dischargeAbstractQueryResult; } + /** + * 删除出院小结 + * @return + */ + public BaseResponse delDisCharge(String id){ + DischargeAbstractMotherModel dischargeAbstractMotherQueryModel = new DischargeAbstractMotherModel(); + dischargeAbstractMotherQueryModel.setYn(YnEnums.NO.getId()); + dischargeAbstractMotherQueryModel.setId(id); + dischargeAbstractMotherService.update(dischargeAbstractMotherQueryModel); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } -- 1.8.3.1