From a381ebbc92d4752a1da657e9a9bf05a71f1d0ad4 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 25 Oct 2016 16:09:34 +0800
Subject: [PATCH] s

---
 .../src/main/java/com/lyms/platform/pojo/BabyModel.java        | 10 ++++++++++
 .../operate/web/controller/BabyBookbuildingController.java     |  8 +++++---
 .../platform/operate/web/facade/BabyBookbuildingFacade.java    |  8 ++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
index 899a498..c45c5e1 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
@@ -207,6 +207,16 @@ public class BabyModel extends BaseModel {
     //分娩孕周
     private Integer dueWeek;
     private String enable;
+    //操作人
+    private Integer operator;
+
+    public Integer getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Integer operator) {
+        this.operator = operator;
+    }
 
     public String getEnable() {
         return enable;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
index 2125001..7166d7e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
@@ -42,11 +42,13 @@ public class BabyBookbuildingController extends BaseController {
      */
     @RequestMapping(method = RequestMethod.POST, value = "/addOrUpBabyBuild")
     @ResponseBody
-    public BaseResponse addOrUpBabyBuild(@Valid @RequestBody BabyBookbuildingAddRequest request) {
+    @TokenRequired
+    public BaseResponse addOrUpBabyBuild(@Valid @RequestBody BabyBookbuildingAddRequest request,HttpServletRequest httpServletRequest) {
+        LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
         if (request != null && !StringUtils.isEmpty(request.getId())) {
-            return babyBookbuildingFacade.updateBabyBookbuilding(request);
+            return babyBookbuildingFacade.updateBabyBookbuilding(request,loginState.getId());
         }
-        return babyBookbuildingFacade.addBabyBookbuilding(request);
+        return babyBookbuildingFacade.addBabyBookbuilding(request,loginState.getId());
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 3d13439..90ed457 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -177,10 +177,10 @@ public class BabyBookbuildingFacade {
      * @param request
      * @return
      */
-    public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request) {
+    public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request,Integer userId) {
         BabyModel model = getBabyModel(request);
         model.setModified(new Date());
-
+        model.setOperator(userId);
         if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
 
             String cardId = request.getMommyCertificateNum() +
@@ -265,7 +265,7 @@ public class BabyBookbuildingFacade {
      * @param request
      * @return
      */
-    public BaseObjectResponse addBabyBookbuilding(BabyBookbuildingAddRequest request) {
+    public BaseObjectResponse addBabyBookbuilding(BabyBookbuildingAddRequest request,Integer userId) {
         BaseObjectResponse br = new BaseObjectResponse();
 
         //判断儿童是否建档在该医院
@@ -456,7 +456,7 @@ public class BabyBookbuildingFacade {
 
         BabyModel model = getBabyModel(request);
         model.setPid(babyPersonId);
-
+        model.setOperator(userId);
         if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
 
             String cardId = request.getMommyCertificateNum() +
-- 
1.8.3.1