From 0f1c4dad2a0d493a2bfaeb8ac31ada2c4027f474 Mon Sep 17 00:00:00 2001
From: "[wangbo]" <www.184677810@qq.com>
Date: Mon, 1 Jul 2019 09:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E9=99=A2=E8=AF=8A?=
 =?UTF-8?q?=E6=96=AD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/permission/dao/master/BabyDiagnoseMapper.java |  1 +
 .../platform/permission/service/impl/BabyDiagnoseImpl.java |  3 +++
 .../main/resources/mainOrm/master/BabyDiagnoseMapper.xml   | 14 ++++++++++++--
 .../java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java   |  2 +-
 .../operate/web/facade/BabyBookbuildingFacade.java         |  4 +++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java
index b6d0ef2..3a20674 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java
@@ -19,4 +19,5 @@ public interface BabyDiagnoseMapper {
     List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query);
 
 
+    int queryBabyDiagnosesListCount(BabyDiagnoseQuery query);
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java
index 2debbc4..7e3b552 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java
@@ -36,6 +36,9 @@ public class BabyDiagnoseImpl implements BabyDiagnoseService {
 
     @Override
     public List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query) {
+        if (query.getNeed() != null) {
+            query.mysqlBuild(babyDiagnoseMapper.queryBabyDiagnosesListCount(query));
+        }
         return babyDiagnoseMapper.queryBabyDiagnosesList(query);
     }
 
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
index ab381cb..a1d118b 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
@@ -57,7 +57,7 @@
 
     <select id="queryBabyDiagnoses" parameterType="java.util.Map" resultType="com.lyms.platform.pojo.BabyDiagnoseModel">
         SELECT
-        id,blh,syxh,hzxm,py,wb,birth,
+        id,blh,syxh,hzxm,birth,
         birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,
         curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,
         cyzdmc,ksdm,bqdm,mblh,msyxh,isbuild
@@ -119,7 +119,7 @@
                 and blh = #{hospitalizationNo}
             </if>
             <if test="babyName != null and babyName!=''">
-                and hzxm =#{babyName} or lxrdh=#{babyName}
+                and hzxm =#{babyName} or lxrdh=#{babyName} OR lxdh=#{babyName}
             </if>
             <if test="finalDiagnosis != null and finalDiagnosis!= '' ">
                 and cyzddm like CONCAT(#{finalDiagnosis},'%')
@@ -143,4 +143,14 @@
         <include refid="orderAndLimit"/>
     </select>
 
+
+    <select id="queryBabyDiagnosesListCount" parameterType="com.lyms.platform.permission.model.BabyDiagnoseQuery"
+            resultType="java.lang.Integer"
+    >
+        SELECT
+        count(1)
+        FROM lyms_baby_diagnose
+        <include refid="babyDiagnosesCondition"/>
+
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
index ec16384..1d39de0 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
@@ -990,7 +990,7 @@ public class QhdfyHisService {
         try {
 
             if (StringUtils.isNotEmpty(lrrqStart) && StringUtils.isNotEmpty(lrrqEnd)) {
-                sql = " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)";
+                sql += " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)";
             }
 
             conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index f3bbb89..b6a6447 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -4050,6 +4050,9 @@ public class BabyBookbuildingFacade {
 
         babyDiagnoseQuery.setLimit(limit);
         babyDiagnoseQuery.setPage(page);
+        babyDiagnoseQuery.setNeed("true");
+        babyDiagnoseQuery.setSort(" cyrq desc ");
+
         if (StringUtils.isNotEmpty(babyDiagnoseQuery.getStartDischargeDate()) && StringUtils.isNotEmpty(babyDiagnoseQuery.getEndDischargeDate())) {
             babyDiagnoseQuery.setStartDischargeDate(babyDiagnoseQuery.getStartDischargeDate() + " 00:00:00");
             babyDiagnoseQuery.setEndDischargeDate(babyDiagnoseQuery.getEndDischargeDate() + " 23:59:59");
@@ -4079,7 +4082,6 @@ public class BabyBookbuildingFacade {
                 }
             }
         }
-        babyDiagnoseQuery.setCount(babyDiagnoseModels.size());
         BaseListResponse objectResponse = new BaseListResponse();
         objectResponse.setPageInfo(babyDiagnoseQuery.getPageInfo());
         objectResponse.setData(result);
-- 
1.8.3.1