From 6ed58f88ccfa8e616753cde691f5034155f5893d Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Mon, 23 Jan 2017 09:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/controller/ViewController.java   | 14 +++++++-------
 .../com/lyms/platform/operate/web/utils/ResolveUtils.java | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 8 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 0a79385..688a917 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
@@ -34,7 +34,7 @@ public class ViewController extends BaseController{
      */
     @RequestMapping(value = "/findAntExChuData",method = RequestMethod.GET)
     @ResponseBody
-//    @TokenRequired
+    @TokenRequired
     public BaseObjectResponse findAntExChuData(@RequestParam("id")String id,
                                                HttpServletRequest request){
         BaseObjectResponse br = viewFacade.findAntExChu(id);
@@ -50,7 +50,7 @@ public class ViewController extends BaseController{
      */
     @RequestMapping(value = "/findAntenatalExaminationData",method = RequestMethod.GET)
     @ResponseBody
-//    @TokenRequired
+    @TokenRequired
     public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id")String id,
                                                            HttpServletRequest request){
 
@@ -64,7 +64,7 @@ public class ViewController extends BaseController{
      */
     @RequestMapping(value = "/findMatDeliverData", method = RequestMethod.GET)
     @ResponseBody
-//    @TokenRequired
+    @TokenRequired
     public BaseObjectResponse findMatDeliverData(@RequestParam("id")String id){
         return viewFacade.findMatDeliverData(id);
     }
@@ -76,7 +76,7 @@ public class ViewController extends BaseController{
      */
     @RequestMapping(value = "/findPatientData", method = RequestMethod.GET)
     @ResponseBody
-//    @TokenRequired
+    @TokenRequired
     public BaseObjectResponse findPatientData(@RequestParam("id")String id){
         return viewFacade.findPatientData(id);
     }
@@ -88,7 +88,7 @@ public class ViewController extends BaseController{
      */
     @RequestMapping(value = "/findPostReviewData", method = RequestMethod.GET)
     @ResponseBody
-//    @TokenRequired
+    @TokenRequired
     public BaseObjectResponse findPostReviewData(@RequestParam("id")String id){
         return viewFacade.findPostReviewData(id);
     }
@@ -100,7 +100,7 @@ public class ViewController extends BaseController{
      */
     @RequestMapping(value = "/findDischargeAbstractData", method = RequestMethod.GET)
     @ResponseBody
-//    @TokenRequired
+    @TokenRequired
     public BaseObjectResponse findDischargeAbstractData(@RequestParam("id")String id){
         return viewFacade.findDischargeAbstractData(id);
     }
@@ -112,7 +112,7 @@ public class ViewController extends BaseController{
      */
     @RequestMapping(value = "/findStopPregData", method = RequestMethod.GET)
     @ResponseBody
-//    @TokenRequired
+    @TokenRequired
     public BaseObjectResponse findStopPregData(@RequestParam("id")String id){
         return viewFacade.findStopPregData(id);
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java
index 33d34eb..feaefb7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java
@@ -43,6 +43,11 @@ public class ResolveUtils {
         content.put("cqzdyx", "产前诊断阳性");
     }
 
+    /**
+     * 解析终止妊娠
+     * @param map
+     * @return
+     */
     public static String replaceStopPreg(Map map) {
         if (null == map) {
             return "";
@@ -136,7 +141,12 @@ public class ResolveUtils {
         return "";
     }
 
-    //解析阴道分泌物字段
+    /**
+     * 解析阴道分泌物字段
+     * @param map
+     * @param type  1,返回阴道分泌物2,返回阴道清洁度
+     * @return
+     */
     public static String replaceYDFMW(Map map,Integer type) {
         if (map==null){
             return null;
@@ -260,6 +270,7 @@ public class ResolveUtils {
         return highScoreResult;
     }
 
+    //其他高危
     public static Map queryOtherRisk(String otherHighRisk,Map<String,Object>map,BasicConfigService basicConfigService){
         if (StringUtils.isEmpty(otherHighRisk)){
             return map;
@@ -292,6 +303,8 @@ public class ResolveUtils {
         return map;
     }
 
+
+    //解析高危,返回名字和颜色
     public static List<Map<String,Object>> queryHighRisk(HighScoreResult result){
 
         if (result==null){
-- 
1.8.3.1