From 4adcb95560c61c96b8f53ab735ddc77a57aebb2d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 16 Mar 2020 10:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E5=BB=BA=E6=A1=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/ResidentsArchiveModel.java  | 12 ++++++++++++
 .../operate/web/request/ResidentsArchiveAddRequest.java     | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
index fb8f243..a791f01 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
@@ -187,9 +187,21 @@ public class ResidentsArchiveModel extends BaseModel {
 
     private String trackHospitalId;
 
+    // 是否军嫂  0 或者空不是  1是
+    private Integer military;
+
 
     private Long code;
 
+
+    public Integer getMilitary() {
+        return military;
+    }
+
+    public void setMilitary(Integer military) {
+        this.military = military;
+    }
+
     public Long getCode() {
         return code;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
index 76d1381..37ab351 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
@@ -159,6 +159,10 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
     private String photo;
 
 
+    // 是否军嫂  0 或者空不是  1是
+    private Integer military;
+
+
     @Override
     public ResidentsArchiveModel convertToDataModel() {
         ResidentsArchiveModel model = new ResidentsArchiveModel();
@@ -256,9 +260,16 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
         //追访时间默认为当前建档时间
         model.setFollowupTime(new Date());
         model.setChildExtAddrs(childExtAddrs);
+        model.setMilitary(military);
+        return model;
+    }
 
+    public Integer getMilitary() {
+        return military;
+    }
 
-        return model;
+    public void setMilitary(Integer military) {
+        this.military = military;
     }
 
     public List<String> getChildExtAddrs() {
-- 
1.8.3.1