From ce8e60d1194595a889727365972022cc3d0bd19c Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Thu, 30 Mar 2017 14:06:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E5=8F=B2=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/hospital/entity/history/HistorySource.java  |  4 +++-
 .../service/history/impl/HistorySourceServiceImpl.java        |  6 ++----
 .../src/test/java/test/hospital/BaseServiceTest.java          | 11 +++++++++++
 parent/hospital.web/src/test/java/test/hospital/BaseTest.java |  2 +-
 .../src/test/java/test/hospital/history/HistoryTest.java      |  7 ++++---
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java
index 51840a0..95680a4 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java
@@ -3,6 +3,8 @@ package com.lyms.hospital.entity.history;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.lyms.util.InstanceUtils;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -59,7 +61,7 @@ public class HistorySource implements Serializable {
 	 * 子级别元素
 	 */
 	@TableField(exist=false)
-	private List<HistorySource> children;
+	private List<HistorySource> children = InstanceUtils.newArrayList();
 	
 	public String getId() {
 		return id;
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java
index b89e03d..b030ed9 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java
@@ -31,8 +31,8 @@ public class HistorySourceServiceImpl extends ServiceImpl<HistorySourceMapper, H
         List<HistorySource> dataList = null;
         EntityWrapper<HistorySource> ew = new EntityWrapper<HistorySource>();
         ew.where("enable=1");
-        if(null != historyPatientType){
-            ew.and("type={}", "'"+historyPatientType+"'");
+        if(historyPatientType.length > 0){
+            ew.and("type={0}", "'"+historyPatientType[0]+"'");
         }
         dataList = selectList(ew);
         return dataList;
@@ -47,13 +47,11 @@ public class HistorySourceServiceImpl extends ServiceImpl<HistorySourceMapper, H
             if("1".equals(historySource.getLevel())){
                 firstdataList.add(historySource);
                 firstLevelData.put(historySource.getId(), historySource);
-                dbdataList.remove(historySource);
             }
         }
         for(HistorySource historySource : dbdataList){
             if("2".equals(historySource.getLevel())){
                 firstLevelData.get(historySource.getPid()).getChildren().add(historySource);
-                dbdataList.remove(historySource);
             }
         }
         return firstdataList;
diff --git a/parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java b/parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java
index 1589687..7ad6325 100644
--- a/parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java
+++ b/parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java
@@ -5,9 +5,20 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
+import com.alibaba.fastjson.JSONObject;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = { "classpath:app-context.xml" })
 public class BaseServiceTest {
+    
+    protected void outPrint(Object obj) {
+        System.err.println(obj);
+    }
+
+    protected void outJson(Object obj) {
+        System.err.println(JSONObject.toJSONString(obj));
+    }
+
 
 }
diff --git a/parent/hospital.web/src/test/java/test/hospital/BaseTest.java b/parent/hospital.web/src/test/java/test/hospital/BaseTest.java
index 64a86b4..880f6d5 100644
--- a/parent/hospital.web/src/test/java/test/hospital/BaseTest.java
+++ b/parent/hospital.web/src/test/java/test/hospital/BaseTest.java
@@ -18,7 +18,7 @@ import com.alibaba.fastjson.JSONObject;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
-@ContextConfiguration(locations = { "classpath:app-context.xml", "classpath:dev/xml/app-*.xml"
+@ContextConfiguration(locations = { "classpath:app-context.xml"
 
 		// ,
 		// "classpath:app-datasource.xml",
diff --git a/parent/hospital.web/src/test/java/test/hospital/history/HistoryTest.java b/parent/hospital.web/src/test/java/test/hospital/history/HistoryTest.java
index 68bd29b..01c9ebb 100644
--- a/parent/hospital.web/src/test/java/test/hospital/history/HistoryTest.java
+++ b/parent/hospital.web/src/test/java/test/hospital/history/HistoryTest.java
@@ -3,11 +3,12 @@ package test.hospital.history;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.lyms.hospital.constants.HistoryPatientType;
 import com.lyms.hospital.service.history.HistorySourceService;
 
-import test.hospital.BaseTest;
+import test.hospital.BaseServiceTest;
 
-public class HistoryTest extends BaseTest{
+public class HistoryTest extends BaseServiceTest{
 
     @Autowired
     private HistorySourceService historySourceService;
@@ -22,6 +23,6 @@ public class HistoryTest extends BaseTest{
      */  
     @Test
     public void testHistorySource(){
-        outJson(historySourceService.selectStructureByType());
+        outJson(historySourceService.selectStructureByType(HistoryPatientType.JWS.getCode()));
     }
 }
-- 
1.8.3.1