From 6c92020be2020fad36bf71a5b025dfac8e496b49 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Mon, 26 Nov 2018 15:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E7=AD=9B=E6=9F=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/BabySieveModel.java  | 11 +++++++++++
 .../platform/operate/web/request/BabySieveAddRequest.java     | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java
index 3120e98..2e5fdb2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java
@@ -23,6 +23,8 @@ public class BabySieveModel extends BaseModel {
 
 
     private String id;
+    //血卡编号
+    private String xkNo;
     //实验号
     private String testNumber;
 
@@ -304,9 +306,18 @@ public class BabySieveModel extends BaseModel {
         this.modified = modified;
     }
 
+    public String getXkNo() {
+        return xkNo;
+    }
+
+    public void setXkNo(String xkNo) {
+        this.xkNo = xkNo;
+    }
+
     public Map<String,String> convertToDataModel(){
         Map<String,String> map = new HashMap<String,String>();
         map.put("id",id);
+        map.put("xkNo",xkNo);
         map.put("testNumber",testNumber);
         map.put("collectHospitalId",collectHospitalId);
         map.put("currentHospitalId",currentHospitalId);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java
index bb4e6af..a9c333f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java
@@ -55,6 +55,8 @@ public class BabySieveAddRequest implements IBasicRequestConvert<BabySieveModel>
     }
 
     private String id;
+    //血卡编号
+    private String xkNo;
     //实验号
     private String testNumber;
     //采血单位
@@ -362,6 +364,14 @@ public class BabySieveAddRequest implements IBasicRequestConvert<BabySieveModel>
         this.modified = modified;
     }
 
+    public String getXkNo() {
+        return xkNo;
+    }
+
+    public void setXkNo(String xkNo) {
+        this.xkNo = xkNo;
+    }
+
     @Override
     public BabySieveModel convertToDataModel(){
         BabySieveModel babySieveModel = new BabySieveModel();
@@ -390,6 +400,7 @@ public class BabySieveAddRequest implements IBasicRequestConvert<BabySieveModel>
         babySieveModel.setPatientId(patientId);
         babySieveModel.setCreated(DateUtil.parseYMD(created));
         babySieveModel.setModified(DateUtil.parseYMD(modified));
+        babySieveModel.setXkNo(xkNo);
 
         return babySieveModel;
     }
-- 
1.8.3.1