From 3bd148de0d08d022c8a3020203eba1d52d522bf5 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 16 Nov 2021 18:24:07 +0800
Subject: [PATCH] update

---
 .../operate/web/request/AntExAddRequest.java       | 24 +++++++---------------
 .../web/result/AntenatalExaminationResult.java     | 24 +++++++---------------
 .../operate/web/result/AntexChuResult.java         | 23 +++++++--------------
 3 files changed, 21 insertions(+), 50 deletions(-)

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 27a7189..9d39224 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
@@ -374,24 +374,15 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
      */
     private String sieveType;
 
-    private String teamIdOld;//旧医生团队
-    private String teamIdNew;//新医生团队
+    private String teamId;//医生团队
     private String reason;//换团队的原因
 
-    public String getTeamIdOld() {
-        return teamIdOld;
+    public String getTeamId() {
+        return teamId;
     }
 
-    public void setTeamIdOld(String teamIdOld) {
-        this.teamIdOld = teamIdOld;
-    }
-
-    public String getTeamIdNew() {
-        return teamIdNew;
-    }
-
-    public void setTeamIdNew(String teamIdNew) {
-        this.teamIdNew = teamIdNew;
+    public void setTeamId(String teamId) {
+        this.teamId = teamId;
     }
 
     public String getReason() {
@@ -1474,9 +1465,8 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         examinationModel.setSieveType(sieveType);
 
         //产团
-//        examinationModel.setTeamIdOld(teamIdOld);
-//        examinationModel.setTeamIdNew(teamIdNew);
-//        examinationModel.setReason(reason);
+        examinationModel.setTeamId(teamId);
+        examinationModel.setReason(reason);
 
         return examinationModel;
     }
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 7f5c5e7..83083da 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
@@ -551,24 +551,15 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     }
     /************************/
 
-    private String teamIdOld;//旧医生团队
-    private String teamIdNew;//新医生团队
+    private String teamId;//医生团队
     private String reason;//换团队的原因
 
-    public String getTeamIdOld() {
-        return teamIdOld;
+    public String getTeamId() {
+        return teamId;
     }
 
-    public void setTeamIdOld(String teamIdOld) {
-        this.teamIdOld = teamIdOld;
-    }
-
-    public String getTeamIdNew() {
-        return teamIdNew;
-    }
-
-    public void setTeamIdNew(String teamIdNew) {
-        this.teamIdNew = teamIdNew;
+    public void setTeamId(String teamId) {
+        this.teamId = teamId;
     }
 
     public String getReason() {
@@ -1337,9 +1328,8 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         if(StringUtils.isNotEmpty(destModel.getWcNt())){
             setWcNt(destModel.getWcNt());
         }
-//        setTeamIdNew(destModel.getTeamIdNew());
-//        setTeamIdOld(destModel.getTeamIdOld());
-//        setReason(destModel.getReason());
+        setTeamId(destModel.getTeamId());
+        setReason(destModel.getReason());
         return this;
     }
 
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 b205e3e..cfc2a44 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
@@ -671,24 +671,16 @@ public class AntexChuResult {
     }
     /***********************************************/
 
-    private String teamIdOld;//旧医生团队
-    private String teamIdNew;//新医生团队
+    private String teamId;//医生团队
     private String reason;//换团队的原因
 
-    public String getTeamIdOld() {
-        return teamIdOld;
-    }
-
-    public void setTeamIdOld(String teamIdOld) {
-        this.teamIdOld = teamIdOld;
-    }
 
-    public String getTeamIdNew() {
-        return teamIdNew;
+    public String getTeamId() {
+        return teamId;
     }
 
-    public void setTeamIdNew(String teamIdNew) {
-        this.teamIdNew = teamIdNew;
+    public void setTeamId(String teamId) {
+        this.teamId = teamId;
     }
 
     public String getReason() {
@@ -2314,9 +2306,8 @@ public class AntexChuResult {
                 setWcNt(antExChuModel.getWcNt());
             }
 
-//            setTeamIdNew(antExChuModel.getTeamIdNew());
-//            setTeamIdOld(antExChuModel.getTeamIdOld());
-//            setReason(antExChuModel.getReason());
+            setTeamId(antExChuModel.getTeamId());
+            setReason(antExChuModel.getReason());
         }
         return this;
     }
-- 
1.8.3.1