From 46c2e84c2ef4f5a7b88359d9065d1a9e9372ae91 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Tue, 24 Apr 2018 13:45:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=9F=8E=E5=88=86=E5=A8=A9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java
index 08fe9cf..c6b8a43 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java
@@ -24,7 +24,7 @@ import java.util.Map;
 @Service("LcdcfFmService")
 public class LcdcfFmService {
 
-    public MaternalDeliverResult queryFmPatient(String bhnum){
+    public static MaternalDeliverResult queryFmPatient(String bhnum){
 
         String cloumns = "  ID     as      ID,\n" +
                 "  BHNUM     as      BHNUM,\n" +
@@ -63,14 +63,15 @@ public class LcdcfFmService {
         Connection conn = com.lyms.hospitalapi.lcdcf.ConnTools.makeHisConnection();
         QueryRunner queryRunner = new QueryRunner();
         SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult();
         try {
-
             String sql = "select "+cloumns+" from v_deliveryinfo where BHNUM="+bhnum+"and BABY_PREGNANCY_OUT='活胎'";
             List<Fm> list = queryRunner.query(conn, sql, new BeanListHandler<Fm>(Fm.class));
+
             if(list!=null && list.size()>0){
 
                 List<MaternalDeliverResult.Baby> babys = new ArrayList<MaternalDeliverResult.Baby>();
-                MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult();
+
                 Map deliveryMode = new HashMap(); //分娩方式
                 for(Fm fm:list){
                     maternalDeliverResult.setParentId(fm.getID());
@@ -180,14 +181,14 @@ public class LcdcfFmService {
 
                 }
 
-
+                maternalDeliverResult.setBabies(babys);
             }else
                 return null;
         }catch (Exception e){
             e.printStackTrace();
         }
 
-        return null;
+        return maternalDeliverResult;
     }
 
 }
-- 
1.8.3.1