From 43a50a1464b2a876eece16b50259f79ff8eb5368 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Fri, 17 Nov 2017 17:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/ViewController.java     | 22 +++++++++++++++++++---
 .../platform/operate/web/facade/ViewFacade.java    |  4 ++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
index c3d9996..34a021f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
@@ -33,12 +33,28 @@ public class ViewController extends BaseController {
     @Autowired
     private AntenatalExaminationFacade antenatalExaminationFacade;
 
+
+    /**
+     * 获取初诊复诊是否打印过
+     * type = 1 初诊
+     * type = 2 复诊
+     */
+    @RequestMapping(value = "/get/prient", method = RequestMethod.GET)
+    @ResponseBody
+    @TokenRequired
+    public BaseObjectResponse getIsPrient(@RequestParam String id, @RequestParam Integer type) {
+        return viewFacade.getIsPrient(id);
+    }
+
     /**
-     * 获取是否打印过  如果没打印 就把改id存下来 返回false  打印过 直接返回true
+     * 初诊复诊打印后回调controller
+     * type = 1 初诊
+     * type = 2 复诊
      */
-    @RequestMapping(value = "/prient/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/prient", method = RequestMethod.GET)
     @ResponseBody
-    public BaseObjectResponse prient(@PathVariable String id) {
+    @TokenRequired
+    public BaseObjectResponse prient(@RequestParam String id) {
         return viewFacade.prient(id);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 1703704..7db5fc8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -3707,7 +3707,7 @@ public class ViewFacade {
 
     public BaseObjectResponse prient(String id) {
         if(mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class)) {
-            return RespBuilder.buildSuccess(true);
+            return RespBuilder.buildSuccess("已经打印过了");
         }
         PlantformConfigModel plantformConfigModel = new PlantformConfigModel();
         plantformConfigModel.setType(SequenceConstant.PRIENT_TYPE);
@@ -3715,6 +3715,6 @@ public class ViewFacade {
         plantformConfigModel.setCreateDate(new Date());
         plantformConfigModel.setValue(id);
         mongoTemplate.save(plantformConfigModel);
-        return RespBuilder.buildSuccess(false);
+        return RespBuilder.buildSuccess();
     }
 }
-- 
1.8.3.1