From d2e8f74329ece9950fa0480c009d32ded241efcd Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Wed, 18 Nov 2020 14:01:57 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/pojo/BabySieveQhdModel.java    | 10 ----------
 .../lyms/platform/operate/web/facade/BabySieveFacede.java |  2 +-
 .../operate/web/request/BabySieveAddQhdRequest.java       | 15 ++-------------
 .../platform/operate/web/result/BabySieveQhdManager.java  | 10 +++++-----
 .../operate/web/utils/BabySieveQhdHandleTask.java         |  2 +-
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
index 20dbab6..1ebfade 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
@@ -32,8 +32,6 @@ public class BabySieveQhdModel extends BaseModel {
     private Date modified;
     //医院ID
     private String hospitalId;
-    //证件号
-    private String certNo;
 
     /*儿童信息*/
     /*
@@ -395,19 +393,11 @@ public class BabySieveQhdModel extends BaseModel {
         this.weight = weight;
     }
 
-    public String getCertNo() {
-        return certNo;
-    }
-
-    public void setCertNo(String certNo) {
-        this.certNo = certNo;
-    }
 
     public Map <String,String> convertToDataModel(){
         Map<String,String> map = new HashMap <String,String>();
         map.put("id",id);
         map.put("babyId",babyId);
-        map.put("certNo",certNo);
         map.put("bhnum",bhnum);
         map.put("matdeliverId",matdeliverId);
         map.put("patientId",patientId);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
index f721f76..837535c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
@@ -271,7 +271,7 @@ public class BabySieveFacede {
                 babySieveQhdManager.setBabyId(babyModel.getId());
                 babySieveQhdManager.setPatientId(pat.getId());
                 babySieveQhdManager.setmName(pat.getUsername());
-                babySieveQhdManager.setCardNo(pat.getCardNo());
+                babySieveQhdManager.setIdcard(pat.getCardNo());
                 babySieveQhdManager.setPhone(pat.getPhone());
                 babySieveQhdManager.setBirthYMD(DateUtil.getYmd(babyModel.getBirth()));
                 babySieveQhdManager.setBabyName(babyModel.getName());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java
index 56aac6e..af5ab48 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java
@@ -23,10 +23,9 @@ public class BabySieveAddQhdRequest implements IBasicRequestConvert<BabySieveQhd
     @NotEmpty(message = "儿童id不能为空")
     private String babyId;
 
-    //证件号
+    //证件号 //母亲证件号码（身份证 军官证 士官证 护照 手机号 其他）
     @NotEmpty(message = "证件号不能为空")
-    private String certNo;
-
+    private String idcard;
     //分娩id
     private String matdeliverId;
     //孕妇档案id
@@ -74,8 +73,6 @@ public class BabySieveAddQhdRequest implements IBasicRequestConvert<BabySieveQhd
     private String momName;
     //住院号
     private String zhuYuanNum;
-    //母亲证件号码（身份证 军官证 士官证 护照 手机号 其他）
-    private String idcard;
     //联系方式
     private String phone;
     //户口性质:    0 城市  1农村
@@ -314,13 +311,6 @@ public class BabySieveAddQhdRequest implements IBasicRequestConvert<BabySieveQhd
         this.bornTime = bornTime;
     }
 
-    public String getCertNo() {
-        return certNo;
-    }
-
-    public void setCertNo(String certNo) {
-        this.certNo = certNo;
-    }
 
     public String getYunZhou() {
         return yunZhou;
@@ -436,7 +426,6 @@ public class BabySieveAddQhdRequest implements IBasicRequestConvert<BabySieveQhd
         BabySieveQhdModel babySieveQhdModel = new BabySieveQhdModel();
         babySieveQhdModel.setId(id);
         babySieveQhdModel.setBabyId(babyId);
-        babySieveQhdModel.setCertNo(certNo);
         babySieveQhdModel.setMatdeliverId(matdeliverId);
         babySieveQhdModel.setPatientId(patientId);
         babySieveQhdModel.setHospitalId(hospitalId);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveQhdManager.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveQhdManager.java
index 45b41a4..983fc35 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveQhdManager.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveQhdManager.java
@@ -22,7 +22,7 @@ public class BabySieveQhdManager {
     //母亲姓名
     private String mName;
     //母亲身份证号（也是证件号）
-    private String cardNo;
+    private String idcard;
     //分娩日期（也是 出生日期）
     private String birthYMD;
     //娩出时间
@@ -122,12 +122,12 @@ public class BabySieveQhdManager {
         this.matdeliverId = matdeliverId;
     }
 
-    public String getCardNo() {
-        return cardNo;
+    public String getIdcard() {
+        return idcard;
     }
 
-    public void setCardNo(String cardNo) {
-        this.cardNo = cardNo;
+    public void setIdcard(String idcard) {
+        this.idcard = idcard;
     }
 
     public String getPhone() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveQhdHandleTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveQhdHandleTask.java
index 007eabe..0d89104 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveQhdHandleTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveQhdHandleTask.java
@@ -112,7 +112,7 @@ public class BabySieveQhdHandleTask implements Callable {
                     Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
                     if(patients != null){
                         babySieveQhdManager.setPatientId(patients.getId());//母亲ID
-                        babySieveQhdManager.setCardNo(patients.getCardNo());//母亲身份证号（也是证件号）
+                        babySieveQhdManager.setIdcard(patients.getCardNo());//母亲身份证号（也是证件号）
                         babySieveQhdManager.setPhone(patients.getPhone());
 
                         //母亲居住地址（详细地址）
-- 
1.8.3.1