From e159851012ea8e2287d3b3751bd914eef436b5f7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 30 Aug 2016 08:46:53 +0800
Subject: [PATCH] code update

---
 .../operate/web/controller/StopPregnancyController.java        |  8 ++++----
 .../lyms/platform/operate/web/facade/StopPregnancyFacade.java  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java
index ef1a299..5b35ee2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java
@@ -45,13 +45,13 @@ public class StopPregnancyController extends BaseController {
 
     /**
      *查询终止妊娠记录
-     * @param patientId 孕妇建档Id
+     * @param id 孕妇建档Id
      * @return
      */
-    @RequestMapping(method = RequestMethod.GET, value = "/queryStopPreg/{patientId}")
+    @RequestMapping(method = RequestMethod.GET, value = "/queryStopPreg/{id}")
     @ResponseBody
-    public BaseResponse queryStopPreg(@PathVariable("patientId")String patientId) {
-        return stopPregnancyFacade.queryStopPreg(patientId);
+    public BaseResponse queryStopPreg(@PathVariable("id")String id) {
+        return stopPregnancyFacade.queryStopPreg(id);
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java
index 7ccb2f3..c2e1f7a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java
@@ -196,15 +196,15 @@ public class StopPregnancyFacade {
 
     /**
      * 查询终止妊娠
-     * @param patientId
+     * @param id
      * @return
      */
-    public BaseResponse queryStopPreg(String patientId) {
+    public BaseResponse queryStopPreg(String id) {
 
         Map map = new HashMap();
         StopPregQuery query =  new StopPregQuery();
         query.setYn(YnEnums.YES.getId());
-        query.setPatientId(patientId);
+        query.setId(id);
         StopPregResult result = null;
         List<StopPregModel> stopPregs =  stopPregnancyService.queryStopPreg(query);
         if (CollectionUtils.isNotEmpty(stopPregs))
@@ -237,12 +237,12 @@ public class StopPregnancyFacade {
 
         //查询孕妇的基本信息
         AntexListResult antexListResult = null;
-        if(!StringUtils.isEmpty(patientId))
+        if(!StringUtils.isEmpty(result.getPatientId()))
         {
             Patients patients = null;
 
                 PatientsQuery patientsQuery = new PatientsQuery();
-                patientsQuery.setId(patientId);
+                patientsQuery.setId(result.getPatientId());
                 patientsQuery.setYn(YnEnums.YES.getId());
 
                 List<Patients> listPatiens = patientsService.queryPatient(patientsQuery);
-- 
1.8.3.1