From af79640dbad6f9eb7b15073f645d4a70c5b59eb7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sat, 16 Feb 2019 17:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mainOrm/master/PatientService.xml    | 83 ++++++++++++++++++++++
 .../operate/web/facade/BabyNutritionFacade.java    |  6 +-
 2 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 87b85a3..59f6d78 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -127,6 +127,47 @@
             <if test="perType != null and perType != ''">
                 per_type = #{perType,jdbcType=INTEGER},
             </if>
+
+            <if test="device != null and device >= 0">
+                device = #{device,jdbcType=INTEGER},
+            </if>
+            <if test="deviceCon != null and deviceCon >= 0">
+                deviceCon = #{deviceCon,jdbcType=INTEGER},
+            </if>
+            <if test="doctorWeek != null and doctorWeek >= 0">
+                doctorWeek = #{doctorWeek,jdbcType=INTEGER},
+            </if>
+            <if test="serviceWeek != null serviceWeek >= 0">
+                serviceWeek = #{serviceWeek,jdbcType=INTEGER},
+            </if>
+            <if test="serStartWeek != null and serStartWeek >= 0">
+                serStartWeek = #{serStartWeek,jdbcType=INTEGER},
+            </if>
+            <if test="serEndWeek != null and serEndWeek >= 0">
+                status = #{status,jdbcType=INTEGER},
+            </if>
+            <if test="docStartWeek != null and docStartWeek >= 0">
+                docStartWeek = #{docStartWeek,jdbcType=INTEGER},
+            </if>
+            <if test="docEndWeek != null and docEndWeek >= 0">
+                docEndWeek = #{docEndWeek,jdbcType=INTEGER},
+            </if>
+
+            <if test="serStartTime != null">
+                serStartTime = #{serStartTime,jdbcType=TIMESTAMP},
+            </if>
+
+            <if test="serEndTime != null">
+                serEndTime = #{serEndTime,jdbcType=TIMESTAMP},
+            </if>
+
+            <if test="docStartTime != null">
+                docStartTime = #{docStartTime,jdbcType=TIMESTAMP},
+            </if>
+
+            <if test="docEndTime != null">
+                docEndTime = #{docEndTime,jdbcType=TIMESTAMP},
+            </if>
         </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
@@ -243,6 +284,48 @@
             <if test="perType != null and perType != ''">
                 and per_type = #{perType,jdbcType=INTEGER}
             </if>
+
+            <if test="device != null and device >= 0">
+                and device = #{device,jdbcType=INTEGER}
+            </if>
+            <if test="deviceCon != null and deviceCon >= 0">
+                and deviceCon = #{deviceCon,jdbcType=INTEGER}
+            </if>
+            <if test="doctorWeek != null and doctorWeek >= 0">
+                and  doctorWeek = #{doctorWeek,jdbcType=INTEGER}
+            </if>
+            <if test="serviceWeek != null serviceWeek >= 0">
+                and  serviceWeek = #{serviceWeek,jdbcType=INTEGER}
+            </if>
+            <if test="serStartWeek != null and serStartWeek >= 0">
+                and  serStartWeek = #{serStartWeek,jdbcType=INTEGER}
+            </if>
+            <if test="serEndWeek != null and serEndWeek >= 0">
+                and  status = #{status,jdbcType=INTEGER},
+            </if>
+            <if test="docStartWeek != null and docStartWeek >= 0">
+                and  docStartWeek = #{docStartWeek,jdbcType=INTEGER}
+            </if>
+            <if test="docEndWeek != null and docEndWeek >= 0">
+                and docEndWeek = #{docEndWeek,jdbcType=INTEGER}
+            </if>
+
+            <if test="serStartTime != null">
+                and serStartTime = #{serStartTime,jdbcType=TIMESTAMP}
+            </if>
+
+            <if test="serEndTime != null">
+                and serEndTime = #{serEndTime,jdbcType=TIMESTAMP}
+            </if>
+
+            <if test="docStartTime != null">
+                and docStartTime = #{docStartTime,jdbcType=TIMESTAMP}
+            </if>
+
+            <if test="docEndTime != null">
+                and  docEndTime = #{docEndTime,jdbcType=TIMESTAMP}
+            </if>
+
             <if test="sql != null and sql != ''">
                 ${sql}
             </if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
index 0aa1a41..f808329 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
@@ -893,11 +893,7 @@ public class BabyNutritionFacade {
     }
 
     private Double getMathRound(Double kcal) {
-       if ((kcal) % 100 == 0)
-       {
-           return kcal;
-       }
-        else
+       if (kcal % 100 != 0)
        {
            kcal+=50;
        }
-- 
1.8.3.1