From 7d346215e8a86341dc4d40492b7c11cd3a091e5d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 13 Jun 2017 09:16:57 +0800
Subject: [PATCH] update code

---
 .../main/java/com/lyms/platform/pojo/SieveResultModel.java  |  9 +++++++++
 .../lyms/platform/operate/web/request/SieveAddRequest.java  | 13 +++++++++++++
 .../com/lyms/platform/operate/web/result/SieveResult.java   |  8 ++++++++
 3 files changed, 30 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java
index 14330f8..544e874 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java
@@ -24,6 +24,7 @@ public class SieveResultModel{
     private String sbst;//   18-三体
     private String dzhpx;// 地中海贫血
     private String cspj;//  产筛评价
+    private String stzhz13; //13-三体
     //录入人员
     private String publishName;
 
@@ -32,6 +33,14 @@ public class SieveResultModel{
     private Date created;
     private Date modified;
 
+    public String getStzhz13() {
+        return stzhz13;
+    }
+
+    public void setStzhz13(String stzhz13) {
+        this.stzhz13 = stzhz13;
+    }
+
     public Integer getYn() {
         return yn;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java
index 0207a12..ae82ff6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java
@@ -24,6 +24,7 @@ public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
     private String sbst;//   18-三体
     private String dzhpx;// 地中海贫血
     private String cspj;//  产筛评价
+    private String stzhz13; //13-三体
     //录入人员
     private String publishName;
 
@@ -91,6 +92,14 @@ public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
         this.tszhz = tszhz;
     }
 
+    public String getStzhz13() {
+        return stzhz13;
+    }
+
+    public void setStzhz13(String stzhz13) {
+        this.stzhz13 = stzhz13;
+    }
+
     @Override
     public SieveResultModel convertToDataModel() {
        /* private String tszhz;//  唐氏综合症
@@ -108,6 +117,7 @@ public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
         sieveModel.setSbst(sbst);
         sieveModel.setDzhpx(dzhpx);
         sieveModel.setCspj(cspj);
+        sieveModel.setStzhz13(stzhz13);
         sieveModel.setPublishName(publishName);
         return sieveModel;
     }
@@ -126,6 +136,9 @@ public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
         if(StringUtils.isNotEmpty(dzhpx)){
             list.add(Integer.valueOf(dzhpx));
         }
+        if(StringUtils.isNotEmpty(stzhz13)){
+            list.add(Integer.valueOf(stzhz13));
+        }
         return Collections.max(list);
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
index 824de30..92fc26c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
@@ -44,6 +44,7 @@ public class SieveResult {
     private String sbst;//   18-三体
     private String dzhpx;// 地中海贫血
     private String cspj;//  产筛评价
+    private String stzhz13; //13-三体
     //录入人员
     private String publishName;
 
@@ -111,7 +112,13 @@ public class SieveResult {
         this.tszhz = tszhz;
     }
 
+    public String getStzhz13() {
+        return stzhz13;
+    }
 
+    public void setStzhz13(String stzhz13) {
+        this.stzhz13 = stzhz13;
+    }
 
     public SieveResult convert(SieveResultModel sieveResultModel,Patients patients){
  /*       try {
@@ -141,6 +148,7 @@ public class SieveResult {
         setSbst(sieveResultModel.getSbst());
         setSjgjx(sieveResultModel.getSjgjx());
         setTszhz(sieveResultModel.getTszhz());
+        setStzhz13(sieveResultModel.getStzhz13());
         return this;
     }
 }
-- 
1.8.3.1