From a9189470587bec9d12b971bfb7ea125a8769d841 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 7 Sep 2017 11:33:42 +0800
Subject: [PATCH] update code

---
 .../controller/AntenatalExaminationController.java | 16 ++++++-
 .../web/facade/AntenatalExaminationFacade.java     | 52 +++++++++++++++++++++-
 2 files changed, 65 insertions(+), 3 deletions(-)

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 28da401..5539ec1 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
@@ -318,6 +318,20 @@ public class AntenatalExaminationController extends BaseController {
     @ResponseBody
     public BaseResponse getLastCheck(HttpServletRequest request,@RequestParam("parentId")String pid){
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        return antenatalExaminationFacade.getLastCheck(loginState.getId(),pid);
+        return antenatalExaminationFacade.getLastCheck(loginState.getId(), pid);
+    }
+
+    /**
+     * 最后高危因素
+     * @param patientId
+     * @param request
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/getLastRisk")
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse getLastRisk(@RequestParam(required = true) String patientId,HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return antenatalExaminationFacade.getLastRisk(patientId, loginState.getId());
     }
 }
\ 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 7c23eae..4bcbc31 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
@@ -263,7 +263,7 @@ public class AntenatalExaminationFacade {
             patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor());
             patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId());
             patientsService.updatePatient(patients);
-            patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime())? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime()));
+            patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime()));
             //修改孕妇高危等级
             updateLastRisk(antExAddRequest.getParentId());
 
@@ -274,7 +274,7 @@ public class AntenatalExaminationFacade {
 
 
             //修改数据
-            syncMaster(antExAddRequest.getParentId(),antExAddRequest.getNextCheckTime());
+            syncMaster(antExAddRequest.getParentId(), antExAddRequest.getNextCheckTime());
 
             //复诊,修改产检管理
             antenatalExaminationService.updateAntExRecord(antExAddRequest.getId(), 2);
@@ -1447,6 +1447,54 @@ public class AntenatalExaminationFacade {
         return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
+    public BaseResponse getLastRisk(String patientId, Integer id) {
+        List highRisk = new ArrayList();
+        Patients patients = patientsService.findOnePatientById(patientId);
+        if (patients != null)
+        {
+            HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true);
+            int score = 0;
+            int index = -1;
+            highRisk = highScoreResult.getHighRisk();
+            if (CollectionUtils.isNotEmpty(highRisk))
+            {
+                for (int i = 0 ; i < highRisk.size() ; i++)
+                {
+                    Map risk = (Map)highRisk.get(i);
+                    if (risk != null && risk.size() > 0)
+                    {
+                        Object codeObj = risk.get("code");
+                        Object idObj = risk.get("id");
+                        if (codeObj != null)
+                        {
+                            Integer code = Integer.valueOf(codeObj.toString());
+                            score += code;
+                        }
+
+                        if (idObj == null || "".equals(idObj.toString()))
+                        {
+                            index = i;
+                        }
+                    }
+
+                }
+            }
+
+            if (index > -1)
+            {
+                Integer otherScore = 0;
+                if (highScoreResult.getScore() != null)
+                {
+                    otherScore = highScoreResult.getScore() - score;
+                }
+                Map risk = (Map)highRisk.get(index);
+                risk.put("code",otherScore);
+            }
+        }
+
+        return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+    }
+
 
     public class SortIn {
 
-- 
1.8.3.1