From 02bacd31aa4c652806ae19a3e71c0b366ecf86ec Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Mon, 24 Jul 2017 18:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E8=AE=BF=E8=A7=86?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/dao/master/CouponMapper.java        |  4 +++
 .../main/resources/mainOrm/master/CouponMapper.xml |  8 ++++++
 .../com/lyms/platform/common/utils/DateUtil.java   | 15 ++++++++++
 .../web/controller/NewbornVisitControoler.java     | 14 ++++++++-
 .../operate/web/service/INewbornVisitService.java  |  2 ++
 .../web/service/impl/NewbornServiceImpl.java       | 33 ++++++++++++++++++----
 6 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
index ac6b3f4..dcbacde 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
@@ -86,4 +86,8 @@ public interface CouponMapper {
     List<String> findSendUserIds(Map<String, Object> param);
 
     List<String> findUsedUserIds(Map<String, Object> param);
+
+    String getUserName(String doctor);
+
+    String getHospitalName(String visitHospitalId);
 }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index b0b3cbe..3897e52 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -21,6 +21,14 @@
         sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_id,used_hospital_id,status
     </sql>
 
+    <select id="getUserName" parameterType="string" resultType="string">
+        select name from users where id = #{id}
+    </select>
+
+    <select id="getHospitalName" parameterType="string" resultType="string">
+        select name from organization where id = #{id}
+    </select>
+
     <select id="findList" parameterType="map" resultMap="couponInfoMap">
         select id,<include refid="columnList" />  from coupon_info
         <where>
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 623c46e..afb03b3 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -250,6 +250,21 @@ public class DateUtil {
         }
     }
 
+    public static String getYyyyMmDd(Date d) {
+        if (d == null) {
+            return null;
+        }
+        try {
+            return y_m_d.format(d);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getYyyyMmDd(new Date()));
+    }
+
     public static Date parseYMD(String s) {
         if (s == null) {
             return null;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
index a3ccced..f83efa7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
@@ -62,7 +62,7 @@ public class NewbornVisitControoler extends BaseController {
     }
 
     /**
-     * 新生儿访视详情
+     * 新生儿访视修改
      * @param id
      * @return
      */
@@ -74,6 +74,18 @@ public class NewbornVisitControoler extends BaseController {
     }
 
     /**
+     * 新生儿访视详情
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    @TokenRequired
+    public BaseObjectResponse info(@PathVariable String id) {
+        return visitService.info(id);
+    }
+
+    /**
      * 新生儿访视删除
      * @param id
      * @return
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
index 83297bf..6b89493 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
@@ -21,4 +21,6 @@ public interface INewbornVisitService extends IBaseService {
     BaseObjectResponse get(String id);
 
     BaseObjectResponse delete(String id);
+
+    BaseObjectResponse info(String id);
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
index f42a733..6214c76 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
@@ -15,6 +15,8 @@ import com.lyms.platform.operate.web.service.INewbornVisitService;
 import com.lyms.platform.operate.web.utils.CollectionUtils;
 import com.lyms.platform.operate.web.utils.MongoUtil;
 import com.lyms.platform.operate.web.utils.ResponseUtil;
+import com.lyms.platform.permission.dao.master.CouponMapper;
+import com.lyms.platform.permission.dao.slave.OrganizationMapper;
 import com.lyms.platform.permission.dao.slave.UsersMapper;
 import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.pojo.*;
@@ -53,8 +55,8 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
     @Autowired
     private MongoUtil mongoUtil;
 
-//    @Autowired
-    private UsersMapper usersMapper;
+    @Autowired
+    private CouponMapper mapper;
 
     @Override
     public BaseObjectResponse init() {
@@ -174,8 +176,8 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
                 }
                 temp.put("count", mongoTemplate.count(new Query(criteria), NewbornVisit.class));
                 temp.put("benyuan", mongoTemplate.count(new Query(criteria.and("visitHositalId").is(hospitalId)), NewbornVisit.class));
-                Users users = usersMapper.getUsers(Integer.parseInt(visit.getDoctor()));
-                temp.put("doctorName", users == null ? null : users.getName());
+//                Users users = mapper.getUsers(Integer.parseInt(visit.getDoctor()));
+//                temp.put("doctorName", users == null ? null : users.getName());
             }
 
         }
@@ -247,8 +249,29 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
 
     @Override
     public BaseObjectResponse delete(String id) {
-        mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), NewbornVisit.class);
+        mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("yn", "0"), NewbornVisit.class);
         return RespBuilder.buildSuccess();
     }
 
+    @Override
+    public BaseObjectResponse info(String id) {
+        NewbornVisit newbornVisit = mongoTemplate.findById(id, NewbornVisit.class);
+        if(newbornVisit != null) {
+            Map<String, Object> restMap = new HashMap<>();
+            restMap.put("checkTimeDesc", newbornVisit.getCheckTimeDesc()); /** 产后天数 */
+            restMap.put("visitHospitalId", mapper.getHospitalName(newbornVisit.getVisitHospitalId())); /** 访视机构 */
+            restMap.put("doctor", mapper.getUserName(newbornVisit.getDoctor())); /** 访视医生 */
+            restMap.put("checkTime", DateUtil.getYyyyMmDd(newbornVisit.getCheckTime())); /** 访视时间 */
+
+        }
+
+        //        Users users = usersMapper.getUsers(Integer.parseInt(newbornVisit.getVisitHospitalId()));
+//        if(users != null) {
+//            newbornVisit.setVisitHospitalId(users.getName());
+//        } else {
+//            newbornVisit.setVisitHospitalId("");
+//        }
+        return null;
+    }
+
 }
-- 
1.8.3.1