From 9acd1b5c07fd8ca11a6c5d1d8b0eb65064ffc793 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 28 Dec 2016 10:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/AntExChuModel.java  | 12 ++++++++++--
 .../com/lyms/platform/pojo/AntenatalExaminationModel.java    |  9 +++++++++
 .../lyms/platform/operate/web/request/AntExAddRequest.java   | 10 ++++++++++
 .../lyms/platform/operate/web/request/AntExcAddRequest.java  | 12 ++++++++++++
 .../operate/web/result/AntenatalExaminationResult.java       | 12 ++++++++++--
 .../com/lyms/platform/operate/web/result/AntexChuResult.java | 10 ++++++++++
 6 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
index 7ba2eae..531bf76 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
@@ -17,8 +17,8 @@ import java.util.List;
 public class AntExChuModel extends BaseModel {
 
     private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
-
-
+    //条码
+    private String barCode;
     private String id;
     private String parentId;
     private String pid;
@@ -103,6 +103,14 @@ public class AntExChuModel extends BaseModel {
     //人工流产
     private Integer abortionRG;
 
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
     public Integer getAbortionZR() {
         return abortionZR;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
index 2c45f51..4a89f43 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
@@ -19,6 +19,7 @@ public class AntenatalExaminationModel extends BaseModel {
     private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid();
 
     private String id;
+    private String barCode;
     private String pid;
     private  String parentId;
    /* //名字
@@ -99,6 +100,14 @@ public class AntenatalExaminationModel extends BaseModel {
     //操作人
     private Integer operator;
 
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
     public Integer getOperator() {
         return operator;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
index 2faa553..4756091 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
@@ -19,6 +19,16 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     // 访视记录id
     private String id;
 
+    private String barCode;
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
     private String pid;
     //产妇id
     private String parentId;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
index a6e53ca..cbfbd1d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
@@ -24,6 +24,9 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     @FormParam
     @NotEmpty(message = "孕妇id不能为空")
     private String parentId;
+
+    private String 	barCode;
+
     private String id;
 
     private String pid;
@@ -201,6 +204,14 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     //人工流产
     private Integer abortionRG;
 
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
     public Integer getAbortionZR() {
         return abortionZR;
     }
@@ -874,6 +885,7 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     public AntExChuModel convertToDataModel() {
         AntExChuModel antExChuModel=new AntExChuModel();
         antExChuModel.setBg(bg);
+        antExChuModel.setBarCode(barCode);
         antExChuModel.setId(id);
         antExChuModel.setParentId(parentId);
         antExChuModel.setSyjg(syjg);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index 7d67f18..db2dfe7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -14,7 +14,7 @@ import java.util.Map;
  * Created by Administrator on 2016/6/15 0015.
  */
 public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
-
+    private String barCode;
     private String id;
     private String isSieve;
     private String parentId;
@@ -76,6 +76,14 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     private int hasSieve;
     private String cDueWeek;
 
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
     public String getIsSieve() {
         return isSieve;
     }
@@ -120,7 +128,7 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
         setEdema(destModel.getEdema());
         setParentId(destModel.getParentId());
-
+        setBarCode(destModel.getBarCode());
         setUrineProtein(destModel.getUrineProtein());
         setTreatmentOpinion(destModel.getTreatmentOpinion());
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index a2956ad..d04ece7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -14,6 +14,15 @@ import java.util.Map;
  * Created by Administrator on 2016/6/20 0020.
  */
 public class AntexChuResult {
+    private String barCode;
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
 
     private String parentId;
 
@@ -893,6 +902,7 @@ public class AntexChuResult {
 
     public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
         if (null != antExChuModel) {
+            setBarCode(antExChuModel.getBarCode());
             setId(antExChuModel.getId());
             setParentId(antExChuModel.getParentId());
             try {
-- 
1.8.3.1