From ba8ea083fa98a3c1b40b0ca1035a45203bf7afcb Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 3 Apr 2018 15:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E8=AF=8A=E6=96=AD=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/common/enums/DiagnoseEnums.java  |  4 +--
 .../controller/AntenatalExaminationController.java | 33 ++++++++++++++++++++++
 .../web/facade/AntenatalExaminationFacade.java     | 20 +++++++++++--
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
index 5c59946..c4171e2 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
@@ -215,12 +215,12 @@ public class DiagnoseEnums {
 
 
         //辅助检查——肝功能
-        XQGBZAM(9, "血清谷丙转氨酶",7,TypeEnums.SF.getId(),0,"U/L"),
+        XQGBZAM(9, "血清谷丙转氨酶",7,TypeEnums.SZ.getId(),0,"U/L"),
         XQGCZAM(10, "血清谷草转氨酶",7,TypeEnums.SZ.getId(),0,"U/L"),
         XDB(11, "白蛋白",7,TypeEnums.SZ.getId(),0,"g/L"),
         ZDHS(12, "总胆红素",7,TypeEnums.SZ.getId(),0,"umol/L"),
         JHDHS(13, "结合胆红素",7,TypeEnums.SZ.getId(),0,"umol/L"),
-        GGNBG(14, "丙肝",7,TypeEnums.SF.getId(),1,""),
+        GGNBG(14, "丙肝——阳性（+）",7,TypeEnums.WZJ.getId(),1,""),
 
         // 辅助检查——乙肝五项
         YGBMKY(15, "乙肝表面抗原——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
index 8ea78b0..6d60afe 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
@@ -370,4 +370,37 @@ public class AntenatalExaminationController extends BaseController {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return antenatalExaminationFacade.getGongGaoLine(patientId, loginState.getId());
     }
+
+
+    /**
+     * 获取复诊页面匹配的高危因素
+     *
+     * @param antExAddRequest
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/getAntenatalExRisk")
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse getAntenatalExRisk(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        BaseResponse baseResponse = antenatalExaminationFacade.getAntenatalExRisk(antExAddRequest, loginState.getId());
+        return baseResponse;
+    }
+
+    /**
+     * 获取初诊页面匹配的高危因素
+     *
+     * @param antExcAddRequest
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/getAntexExRisk")
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse getAntexExRisk(@Valid @RequestBody AntExcAddRequest antExcAddRequest,HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        BaseResponse baseResponse = antenatalExaminationFacade.getAntexExRisk(antExcAddRequest, loginState.getId());
+        return baseResponse;
+    }
+
+
 }
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 1eb82af..054a622 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -2636,12 +2636,28 @@ public class AntenatalExaminationFacade {
             }
         }
 
-        map.put("titles",titles);
-        map.put("values",values);
+        map.put("titles", titles);
+        map.put("values", values);
         map.put("tables", tables);
 
         return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
 
+    public BaseResponse getAntenatalExRisk(AntExAddRequest antExAddRequest, Integer userId) {
+        Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId());
+        String hospitalId = autoMatchFacade.getHospitalId(userId);
+
+
+        return null;
+    }
+
+
+    public BaseResponse getAntexExRisk(AntExcAddRequest antExcAddRequest, Integer userId) {
+        Patients patients = patientsService.findOnePatientById(antExcAddRequest.getParentId());
+        String hospitalId = autoMatchFacade.getHospitalId(userId);
+        return null;
+    }
+
+
 }
\ No newline at end of file
-- 
1.8.3.1