From ff70f467914efc5ebbc6f3faa5bbb30829229188 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 29 Apr 2016 11:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/PatientFacade.java |  2 +-
 .../operate/web/request/VisitAddRequest.java       | 53 ++++++++++++++++++++--
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 3f9506f..cd081cb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -83,9 +83,9 @@ public class PatientFacade {
         puerperaQuery.setKeyword(managerRequest.getKeyword());
         puerperaQuery.setCommunityId(managerRequest.getCommunityId());
         puerperaQuery.setVisitstatus(managerRequest.getVisitstatus());
+        puerperaQuery.setType(3);
         puerperaQuery.setNeed("1");
         puerperaQuery.setYn(YnEnums.YES.getId());
-        puerperaQuery.setType(1);
         // 调用service查询
 
         List<Patients> puerperaList = patientsService.queryPatient(puerperaQuery);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
index 1822183..29d06eb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
@@ -460,7 +460,9 @@ public class VisitAddRequest {
 
     public SimpleVisitPuerpera getPuerpera() {
         SimpleVisitPuerpera puerperaModel = new SimpleVisitPuerpera();
-
+        puerperaModel.setAreaId(areaId);
+        puerperaModel.setCityId(cityId);
+        puerperaModel.setProvinceId(provinceId);
         puerperaModel.setId(parentId);
         puerperaModel.setName(name);
         puerperaModel.setAge(age);
@@ -468,10 +470,10 @@ public class VisitAddRequest {
         puerperaModel.setDueDate(dueDate);
         puerperaModel.setDeliverOrg(deliverOrg);
         puerperaModel.setDueType(dueType);
-        puerperaModel.setAddress(JsonUtil.obj2JsonString(address));
+        puerperaModel.setAddress(address);
         return puerperaModel;
     }
-    public Patients getPatients(){
+    public Patients getPatients() {
         Patients patients = new Patients();
         patients.setId(parentId);
         patients.setUsername(name);
@@ -547,6 +549,34 @@ public class VisitAddRequest {
 
         private String address;
 
+        private int  provinceId;
+        private int cityId;
+        private int areaId;
+
+        public int getAreaId() {
+            return areaId;
+        }
+
+        public void setAreaId(int areaId) {
+            this.areaId = areaId;
+        }
+
+        public int getCityId() {
+            return cityId;
+        }
+
+        public void setCityId(int cityId) {
+            this.cityId = cityId;
+        }
+
+        public int getProvinceId() {
+            return provinceId;
+        }
+
+        public void setProvinceId(int provinceId) {
+            this.provinceId = provinceId;
+        }
+
         public SimpleVisitPuerpera() {
         }
 
@@ -559,6 +589,7 @@ public class VisitAddRequest {
             deliverOrg = model.getDeliverOrg();
             dueType = model.getDueType();
             address = model.getAddress();
+//            cityId =model.getc
         }
         public SimpleVisitPuerpera(Patients model) {
             id = model.getId();
@@ -569,6 +600,10 @@ public class VisitAddRequest {
             deliverOrg = model.getDeliverOrg();
             dueType = model.getDueType();
             address = model.getAddress();
+            cityId=model
+                    .getCityId();
+            areaId=model.getAreaId();
+            provinceId=model.getProvinceId();
         }
 
         public String getId() {
@@ -660,6 +695,9 @@ public class VisitAddRequest {
             result = prime * result + ((dueType == null) ? 0 : dueType.hashCode());
             result = prime * result + ((id == null) ? 0 : id.hashCode());
             result = prime * result + ((name == null) ? 0 : name.hashCode());
+            result = prime * result + cityId;
+            result = prime * result + areaId;
+            result = prime * result + provinceId;
             return result;
         }
 
@@ -691,6 +729,15 @@ public class VisitAddRequest {
             if (name == null) {
                 if (other.name != null) return false;
             } else if (!name.equals(other.name)) return false;
+            if(((SimpleVisitPuerpera) obj).provinceId !=provinceId){
+                return  false;
+            }
+            if(((SimpleVisitPuerpera) obj).cityId !=cityId){
+                return  false;
+            }
+            if(((SimpleVisitPuerpera) obj).areaId !=areaId){
+                return  false;
+            }
             return true;
         }
     }
-- 
1.8.3.1