From c032c672efd66b32dee536b9ba9bb0c41eba5463 Mon Sep 17 00:00:00 2001
From: shiyang <wtt@qq.com>
Date: Wed, 13 Oct 2021 15:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E5=81=A5=E5=BA=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=9C=A8=E7=94=B7=E5=A5=B3=E6=80=A7=E5=A9=9A?=
 =?UTF-8?q?=E6=A3=80=E8=BE=85=E5=8A=A9=E6=A3=80=E6=9F=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8AX=E7=BA=BF=E6=91=84=E5=BD=B1=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/PremaritalCheckup.java  | 23 ++++++++++++++++++++++
 .../web/facade/PremaritalCheckupFacade.java        | 13 ++++++++++++
 .../web/request/PremaritalCheckupAddRequest.java   | 23 ++++++++++++++++++++++
 .../web/result/PremaritalCheckupResult.java        | 23 ++++++++++++++++++++++
 4 files changed, 82 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
index b54c7cf..b9a045e 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
@@ -464,6 +464,29 @@ public class PremaritalCheckup  extends BaseModel {
     //采血编号
     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;
     }
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 356c04f..5588448 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
@@ -494,6 +494,13 @@ public class PremaritalCheckupFacade {
         checkupResult.setJczt(result.getJczt());
         checkupResult.setFkjjState(result.getFkjjState());
         checkupResult.setNumCode(com.lyms.platform.common.utils.StringUtils.numCodeStr(result.getNumCode()));
+        /**隆化-增加 X线摄影报告
+         */
+        //X摄影（1：正常，2：异常-需要写内容）
+        checkupResult.setxRay(result.getxRay());
+        //异常情况填写内容
+        checkupResult.setAbnormalTxt(result.getAbnormalTxt());
+
         return checkupResult;
     }
 
@@ -948,6 +955,12 @@ public class PremaritalCheckupFacade {
         checkup.setGuidSign(addRequest.getGuidSign());
         checkup.setUserSign(addRequest.getUserSign());
 
+        /**隆化-增加 X线摄影报告
+         */
+        //X摄影（1：正常，2：异常-需要写内容）
+        checkup.setxRay(addRequest.getxRay());
+        //异常情况填写内容
+        checkup.setAbnormalTxt(addRequest.getAbnormalTxt());
 
         /* 基础数据 */
         checkup.setYn(YnEnums.YES.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
index f9de313..e020dd5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
@@ -453,6 +453,29 @@ public class PremaritalCheckupAddRequest {
     //采血编号
     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;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
index 77aeead..fd0fda0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
@@ -428,6 +428,29 @@ public class PremaritalCheckupResult {
     private String numCode;
     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