From 8d9b56c3fef113d8dc36860a7d18a0a9b1afc6c1 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 29 Aug 2017 16:17:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainOrm/master/BabyPatientExtendEarBirth.xml   | 60 +++++++++++-----------
 .../java/com/lyms/platform/pojo/BabyModel.java     |  1 -
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml
index e236fd8..0e801ab 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml
@@ -56,58 +56,58 @@ insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_w
             parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBirth">
         update baby_patient_extend_ear_birth
         <set>
-            <if test="fetuNumber != null and fetuNumber >= 0">
+            <if test="fetuNumber != null">
                 fetu_number = #{fetuNumber,jdbcType=INTEGER},
             </if>
-            <if test="productNumber != null and productNumber >= 0">
+            <if test="productNumber != null">
                 product_number = #{productNumber,jdbcType=INTEGER},
             </if>
-            <if test="birthWeight != null and birthWeight >= 0">
+            <if test="birthWeight != null">
                 birth_weight = #{birthWeight,jdbcType=DOUBLE},
             </if>
             <if test="parturitionType != null and parturitionType != ''">
                 parturition_type = #{parturitionType,jdbcType=VARCHAR},
             </if>
-            <if test="birthDefectType != null and birthDefectType >= 0">
+            <if test="birthDefectType != null">
                 birth_defect_type = #{birthDefectType,jdbcType=INTEGER},
             </if>
             <if test="birthDefectDesc != null and birthDefectDesc != ''">
                 birth_defect_desc = #{birthDefectDesc,jdbcType=VARCHAR},
             </if>
-            <if test="fetuEmbarrasType != null and fetuEmbarrasType >= 0">
+            <if test="fetuEmbarrasType != null">
                 fetu_embarras_type = #{fetuEmbarrasType,jdbcType=INTEGER},
             </if>
-            <if test="apgarScoreOne != null and apgarScoreOne >= 0">
+            <if test="apgarScoreOne != null">
                 apgar_score_one = #{apgarScoreOne,jdbcType=DOUBLE},
             </if>
-            <if test="apgarScoreFive != null and apgarScoreFive >= 0">
+            <if test="apgarScoreFive != null">
                 apgar_score_five = #{apgarScoreFive,jdbcType=DOUBLE},
             </if>
-            <if test="apgarScoreTen != null and apgarScoreTen >= 0">
+            <if test="apgarScoreTen != null">
                 apgar_score_ten = #{apgarScoreTen,jdbcType=DOUBLE},
             </if>
-            <if test="birthInjuryType != null and birthInjuryType >= 0">
+            <if test="birthInjuryType != null">
                 birth_injury_type = #{birthInjuryType,jdbcType=INTEGER},
             </if>
             <if test="birthInjuryPosition != null and birthInjuryPosition != ''">
                 birth_injury_position = #{birthInjuryPosition,jdbcType=VARCHAR},
             </if>
-            <if test="amnioticFluidType != null and amnioticFluidType >= 0">
+            <if test="amnioticFluidType != null">
                 amniotic_fluid_type = #{amnioticFluidType,jdbcType=INTEGER},
             </if>
-            <if test="abnormalParturitionType != null and abnormalParturitionType >= 0">
+            <if test="abnormalParturitionType != null">
                 abnormal_parturition_type = #{abnormalParturitionType,jdbcType=INTEGER},
             </if>
             <if test="abnormalParturitionPosition != null and abnormalParturitionPosition != ''">
                 abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=VARCHAR},
             </if>
-            <if test="deformityType != null and deformityType >= 0">
+            <if test="deformityType != null">
                 deformity_type = #{deformityType,jdbcType=INTEGER},
             </if>
             <if test="deformityPosition != null and deformityPosition != ''">
                 deformity_position = #{deformityPosition,jdbcType=VARCHAR},
             </if>
-            <if test="birthInfectionType != null and birthInfectionType >= 0">
+            <if test="birthInfectionType != null">
                 birth_infection_type = #{birthInfectionType,jdbcType=INTEGER},
             </if>
             <if test="birthInfectionCause != null and birthInfectionCause != ''">
@@ -116,7 +116,7 @@ insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_w
             <if test="birthCourseDisease != null and birthCourseDisease != ''">
                 birth_course_disease = #{birthCourseDisease,jdbcType=VARCHAR},
             </if>
-            <if test="birthIllType != null and birthIllType >= 0">
+            <if test="birthIllType != null">
                 birth_ill_type = #{birthIllType,jdbcType=INTEGER},
             </if>
             <if test="birthIllCause != null and birthIllCause != ''">
@@ -125,7 +125,7 @@ insert into baby_patient_extend_ear_birth (id,fetu_number,product_number,birth_w
             <if test="birthIllDisease != null and birthIllDisease != ''">
                 birth_ill_disease = #{birthIllDisease,jdbcType=VARCHAR},
             </if>
-            <if test="headTraumaHistory != null and headTraumaHistory >= 0">
+            <if test="headTraumaHistory != null">
                 head_trauma_history = #{headTraumaHistory,jdbcType=INTEGER},
             </if>
             <if test="headTraumaDesc != null and headTraumaDesc != ''">
@@ -203,58 +203,58 @@ select id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_
             <if test="id != null and id != ''">
                 and id = #{id,jdbcType=VARCHAR}
             </if>
-            <if test="fetuNumber != null and fetuNumber >= 0">
+            <if test="fetuNumber != null">
                 and fetu_number = #{fetuNumber,jdbcType=INTEGER}
             </if>
-            <if test="productNumber != null and productNumber >= 0">
+            <if test="productNumber != null">
                 and product_number = #{productNumber,jdbcType=INTEGER}
             </if>
-            <if test="birthWeight != null and birthWeight >= 0">
+            <if test="birthWeight != null">
                 and birth_weight = #{birthWeight,jdbcType=DOUBLE}
             </if>
             <if test="parturitionType != null and parturitionType != ''">
                 and parturition_type = #{parturitionType,jdbcType=VARCHAR}
             </if>
-            <if test="birthDefectType != null and birthDefectType >= 0">
+            <if test="birthDefectType != null">
                 and birth_defect_type = #{birthDefectType,jdbcType=INTEGER}
             </if>
             <if test="birthDefectDesc != null and birthDefectDesc != ''">
                 and birth_defect_desc = #{birthDefectDesc,jdbcType=VARCHAR}
             </if>
-            <if test="fetuEmbarrasType != null and fetuEmbarrasType >= 0">
+            <if test="fetuEmbarrasType != null">
                 and fetu_embarras_type = #{fetuEmbarrasType,jdbcType=INTEGER}
             </if>
-            <if test="apgarScoreOne != null and apgarScoreOne >= 0">
+            <if test="apgarScoreOne != null">
                 and apgar_score_one = #{apgarScoreOne,jdbcType=DOUBLE}
             </if>
-            <if test="apgarScoreFive != null and apgarScoreFive >= 0">
+            <if test="apgarScoreFive != null">
                 and apgar_score_five = #{apgarScoreFive,jdbcType=DOUBLE}
             </if>
-            <if test="apgarScoreTen != null and apgarScoreTen >= 0">
+            <if test="apgarScoreTen != null">
                 and apgar_score_ten = #{apgarScoreTen,jdbcType=DOUBLE}
             </if>
-            <if test="birthInjuryType != null and birthInjuryType >= 0">
+            <if test="birthInjuryType != null">
                 and birth_injury_type = #{birthInjuryType,jdbcType=INTEGER}
             </if>
             <if test="birthInjuryPosition != null and birthInjuryPosition != ''">
                 and birth_injury_position = #{birthInjuryPosition,jdbcType=VARCHAR}
             </if>
-            <if test="amnioticFluidType != null and amnioticFluidType >= 0">
+            <if test="amnioticFluidType != null">
                 and amniotic_fluid_type = #{amnioticFluidType,jdbcType=INTEGER}
             </if>
-            <if test="abnormalParturitionType != null and abnormalParturitionType >=0">
+            <if test="abnormalParturitionType != null">
                 and abnormal_parturition_type = #{abnormalParturitionType,jdbcType=INTEGER}
             </if>
             <if test="abnormalParturitionPosition != null and abnormalParturitionPosition != ''">
                 and abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=VARCHAR}
             </if>
-            <if test="deformityType != null and deformityType >= 0">
+            <if test="deformityType != null">
                 and deformity_type = #{deformityType,jdbcType=INTEGER}
             </if>
             <if test="deformityPosition != null and deformityPosition != ''">
                 and deformity_position = #{deformityPosition,jdbcType=VARCHAR}
             </if>
-            <if test="birthInfectionType != null and birthInfectionType >= 0">
+            <if test="birthInfectionType != null">
                 and birth_infection_type = #{birthInfectionType,jdbcType=INTEGER}
             </if>
             <if test="birthInfectionCause != null and birthInfectionCause != ''">
@@ -263,7 +263,7 @@ select id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_
             <if test="birthCourseDisease != null and birthCourseDisease != ''">
                 and birth_course_disease = #{birthCourseDisease,jdbcType=VARCHAR}
             </if>
-            <if test="birthIllType != null and birthIllType >= 0">
+            <if test="birthIllType != null">
                 and birth_ill_type = #{birthIllType,jdbcType=INTEGER}
             </if>
             <if test="birthIllCause != null and birthIllCause != ''">
@@ -272,7 +272,7 @@ select id,fetu_number,product_number,birth_weight,parturition_type,birth_defect_
             <if test="birthIllDisease != null and birthIllDisease != ''">
                 and birth_ill_disease = #{birthIllDisease,jdbcType=VARCHAR}
             </if>
-            <if test="headTraumaHistory != null and headTraumaHistory >= 0">
+            <if test="headTraumaHistory != null">
                 and head_trauma_history = #{headTraumaHistory,jdbcType=INTEGER}
             </if>
             <if test="headTraumaDesc != null and headTraumaDesc != ''">
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
index 3e35165..8152e43 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
@@ -122,7 +122,6 @@ public class BabyModel extends BaseModel {
     private String babyHead;
     //助产机构
     private String deliverOrg;
-
     //是否畸形 0非畸形 1畸形
     private Integer malformation;
 
-- 
1.8.3.1