From 2c6d1ca70159739f9e0322c5b64242ec2cfd3338 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 19 Sep 2017 17:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/PatientMarkHospitalController.java  | 18 ++++++++++++++++--
 .../web/facade/PatientMarkHospServiceFacade.java       | 10 ++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java
index 9cf02bc..17b9321 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java
@@ -31,17 +31,29 @@ public class PatientMarkHospitalController extends BaseController {
     private PatientMarkHospServiceFacade patientMarkHospFacade;
 
     /**
+     * 初始化接口
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/init", method = RequestMethod.GET)
+    public BaseResponse patientMarkServiceInit() {
+        return patientMarkHospFacade.patientMarkHospitalInit();
+    }
+
+
+    /**
      * 预约住院提醒列表
      * @param request
      * @return
      */
     @RequestMapping(value = "/list", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
+    @TokenRequired
     public BaseResponse list(PatientMarkRequest patientMarkRequest
             , HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        patientMarkHospFacade.getPatientMarkHospital(patientMarkRequest,loginState.getId());
-        return null;
+        return patientMarkHospFacade.getPatientMarkHospital(patientMarkRequest,loginState.getId());
     }
 
 
@@ -54,6 +66,7 @@ public class PatientMarkHospitalController extends BaseController {
      */
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @ResponseBody
+    @TokenRequired
     public BaseResponse create(PatientMarkHospital patientMarkHospital, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return patientMarkHospFacade.addPatientMarkHospital(patientMarkHospital, loginState.getId());
@@ -69,6 +82,7 @@ public class PatientMarkHospitalController extends BaseController {
      */
     @RequestMapping(value = "/update", method = {RequestMethod.POST})
     @ResponseBody
+    @TokenRequired
     public BaseResponse update(PatientMarkHospital patientMarkHospital, int type, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return patientMarkHospFacade.updatePatientMarkHospital(patientMarkHospital, type, loginState.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
index 8ad06c8..89a6aad 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
@@ -52,7 +52,7 @@ public class PatientMarkHospServiceFacade {
      *
      * @return
      */
-    public BaseResponse PatientMarkHospitalInit() {
+    public BaseResponse patientMarkHospitalInit() {
         Map map = new HashMap();
         map.put("makeType",MakeHospitalEnums.getMakeHospital());
 
@@ -197,7 +197,9 @@ public class PatientMarkHospServiceFacade {
         result.setBackDate(DateUtil.getyyyy_MM_dd(ps.getBackDate()));
         result.setBackMakeDate(DateUtil.getyyyy_MM_dd(ps.getBackMakeDate()));
         result.setBackRemark(ps.getBackRemark());
-        result.setBackFailure(MakeHospitalEnums.getTitle(ps.getBackFailure()));
+        if(ps.getBackFailure()!=null){
+            result.setBackFailure(MakeHospitalEnums.getTitle(ps.getBackFailure()));
+        }
         result.setInHospitStatus(ps.getInHospitStatus() == 1 ? "待提醒" : "已提醒");
         result.setInHospitResult(ps.getInHospitResult() == 1 ? "成功" : "失败");
         users = usersService.getUsers(Integer.parseInt(ps.getInHospitDoctor()));
@@ -282,7 +284,7 @@ public class PatientMarkHospServiceFacade {
             patientMarkHospQuery.setMakeEndDate(patientMarkRequest.getMakeEndDate());
         }
 
-        patientMarkHospQuery.setSort("create_date");
+        patientMarkHospQuery.setSort("hospit_date");
         patientMarkHospQuery.setNeed("y");
         patientMarkHospQuery.setOffset((patientMarkRequest.getPage() - 1) * patientMarkRequest.getLimit());
         patientMarkHospQuery.setLimit(patientMarkRequest.getLimit());
@@ -309,7 +311,7 @@ public class PatientMarkHospServiceFacade {
     public void synLlHisData(int offset,int page){
 
         PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
-        patientMarkHospQuery.setSort("create_date");
+        patientMarkHospQuery.setSort("hospit_date");
         patientMarkHospQuery.setNeed("y");
         patientMarkHospQuery.setOffset(offset);
         patientMarkHospQuery.setLimit(100);
-- 
1.8.3.1