From 1236e00de4c6cc00a2202517776560819f378bf0 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Sat, 23 Oct 2021 08:43:43 +0800
Subject: [PATCH] =?UTF-8?q?//=E9=9A=86=E5=8C=96-=E5=A2=9E=E5=8A=A0=20X?=
 =?UTF-8?q?=E7=BA=BF=E6=91=84=E5=BD=B1=E6=8A=A5=E5=91=8A-=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/PremaritalCheckupFacade.java        |  3 +++
 .../web/result/PremaritalCheckupPageResult.java    | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index 5588448..e239d20 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -2394,6 +2394,9 @@ public class PremaritalCheckupFacade {
         checkupResult.setTingliRight(result.getTingliRight());
         checkupResult.setYuyan(result.getYuyan());
         checkupResult.setSeJue(result.getSeJue());
+        //隆化-增加 X线摄影报告
+        checkupResult.setxRay(result.getxRay());
+        checkupResult.setAbnormalTxt(result.getAbnormalTxt());
 
         return checkupResult;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
index 67fa906..6034879 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
@@ -417,6 +417,28 @@ public class PremaritalCheckupPageResult {
     private String seJue;
 
     private String cxNum;
+    /**隆化-增加 X线摄影报告
+     */
+    //X摄影（1：正常，2：异常-需要写内容）
+    private Integer xRay;
+    //异常情况填写内容
+    private String abnormalTxt;
+
+    public Integer getxRay() {
+        return xRay;
+    }
+
+    public void setxRay(Integer xRay) {
+        this.xRay = xRay;
+    }
+
+    public String getAbnormalTxt() {
+        return abnormalTxt;
+    }
+
+    public void setAbnormalTxt(String abnormalTxt) {
+        this.abnormalTxt = abnormalTxt;
+    }
 
     public String getCxNum() {
         return cxNum;
-- 
1.8.3.1