From 938c0d7a039ce3a286e8b5b0558eda2a9176aec2 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Tue, 22 Sep 2020 10:24:52 +0800
Subject: [PATCH] update

---
 .../web/result/AntenatalExaminationResult.java        | 18 +++++++++++++++---
 .../platform/operate/web/result/AntexChuResult.java   | 19 +++++++++++++++----
 2 files changed, 30 insertions(+), 7 deletions(-)

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 5507bc6..469d6ba 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
@@ -1094,11 +1094,23 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
 
         setZyzlState(destModel.getZyzlState());
-        setZyzlContent(destModel.getZyzlContent());
+        if("no".equals(destModel.getZyzlState())){
+            setZyzlContent(null);
+        }else {
+            setZyzlContent(destModel.getZyzlContent());
+        }
         setZywzzlState(destModel.getZywzzlState());
-        setZywzzlContent(destModel.getZywzzlContent());
+        if("no".equals(destModel.getZywzzlState())){
+            setZywzzlContent(null);
+        }else {
+            setZywzzlContent(destModel.getZywzzlContent());
+        }
         setZyatzlState(destModel.getZyatzlState());
-        setZyatzlContent(destModel.getZyatzlContent());
+        if("no".equals(destModel.getZyatzlState())){
+            setZyatzlContent(null);
+        }else {
+            setZyatzlContent(destModel.getZyatzlContent());
+        }
 
         setResultSupple(destModel.getResultSupple());
         setTtita(destModel.getTtita());
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 6ae1f77..2777c69 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
@@ -1933,13 +1933,24 @@ public class AntexChuResult {
     }
     public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
         if (null != antExChuModel) {
-
             setZyzlState(antExChuModel.getZyzlState());
-            setZyzlContent(antExChuModel.getZyzlContent());
+            if("no".equals(antExChuModel.getZyzlState())){
+                setZyzlContent(null);
+            }else {
+                setZyzlContent(antExChuModel.getZyzlContent());
+            }
             setZywzzlState(antExChuModel.getZywzzlState());
-            setZywzzlContent(antExChuModel.getZywzzlContent());
+            if("no".equals(antExChuModel.getZywzzlState())){
+                setZywzzlContent(null);
+            }else {
+                setZywzzlContent(antExChuModel.getZywzzlContent());
+            }
             setZyatzlState(antExChuModel.getZyatzlState());
-            setZyatzlContent(antExChuModel.getZyatzlContent());
+            if("no".equals(antExChuModel.getZyatzlState())){
+                setZyatzlContent(null);
+            }else {
+                setZyatzlContent(antExChuModel.getZyatzlContent());
+            }
 
             setResultSupple(antExChuModel.getResultSupple());
             setTtita(antExChuModel.getTtita());
-- 
1.8.3.1