合并前
Merge remote-tracking branch 'llloy/master'

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/android/hospital/ui/activity/GroupDcAdviceActivity.java
backup
backup before merge 
backup before merge two
Merge remote-tracking branch 'llloy/master'

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
时间查询
未测试actionbar 状态前
增加了默认选中病人列表功能，需进一步完善actionbar切换时，fragment未被added的未获取数据后的显示问题

Signed-off-by: SeaDragon King <81813780@qq.com>
完善了如果从服务器获取的某个字段为空，则赋值空字符串,dataobjectentity.java

Signed-off-by: SeaDragon King <81813780@qq.com>
测试frament被added，onActivityCreated回调方法

Signed-off-by: SeaDragon King <81813780@qq.com>

dfasdf
Signed-off-by: SeaDragon King <81813780@qq.com>


Signed-off-by: SeaDragon King <81813780@qq.com>
Merge branch 'hospitalbeta'

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/android/hospital/ui/fragment/CheckFragment.java

Signed-off-by: SeaDragon King <81813780@qq.com>


Signed-off-by: SeaDragon King <81813780@qq.com>
代码完善和生命体征部分功能添加

Signed-off-by: SeaDragon King <81813780@qq.com>


Signed-off-by: SeaDragon King <81813780@qq.com>
确认版本一

Signed-off-by: SeaDragon King <81813780@qq.com>
版本一，版本号确定

Signed-off-by: SeaDragon King <81813780@qq.com>
合并前