From 27dd6eb770f3eda493574cb82fdff7dea165c4a6 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 22 Jul 2016 15:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/biz/service/SmsConfigService.java     |  2 +-
 .../operate/web/facade/SmsConfigFacade.java        | 70 ++++++++++++----------
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java
index 76d6eb3..a8f0422 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java
@@ -94,7 +94,7 @@ public class SmsConfigService {
             preMap.put("hospitalId", hid);
             list.add(preMap);
             model.setDeptPrefix(JsonUtil.array2JsonString(list));
-
+            addSmsConfig(model);
         }
 
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
index b4b825a..62f933f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
@@ -8,6 +8,7 @@ import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.JsonUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.request.SmsConfigRequest;
 import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.permission.model.Departments;
@@ -230,54 +231,57 @@ public class SmsConfigFacade {
 			SmsConfigModel model = smsmodels.get(0);
 
 
-			List<Map> deptsPrefixs = JsonUtil.toList(model.getDeptPrefix(), Map.class);
-			if (CollectionUtils.isNotEmpty(deptsPrefixs))
+			if (StringUtils.isNotEmpty(model.getDeptPrefix()))
 			{
-				for (Map dept : deptsPrefixs)
+				List<Map> deptsPrefixs = JsonUtil.toList(model.getDeptPrefix(), Map.class);
+				if (CollectionUtils.isNotEmpty(deptsPrefixs))
 				{
-					//查询科室 并设置名称
-					Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(dept.get("deptId"))));
-					if (qdetp != null)
+					for (Map dept : deptsPrefixs)
 					{
-						dept.put("deptName",qdetp.getName());
+						//查询科室 并设置名称
+						Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(dept.get("deptId"))));
+						if (qdetp != null)
+						{
+							dept.put("deptName",qdetp.getName());
+						}
 					}
-				}
 
-			}
+				}
 
-			DepartmentsQuery departmentsQuery = new DepartmentsQuery();
-			departmentsQuery.setSort("modified desc");
-			departmentsQuery.setYn(YnEnums.YES.getId());
-			departmentsQuery.setOrgId(Integer.valueOf(model.getHospitalId()));
-			List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery);
-			for(Departments dept : departmentses)
-			{
-				boolean isExist = false;
-				if (CollectionUtils.isNotEmpty(deptsPrefixs))
+				DepartmentsQuery departmentsQuery = new DepartmentsQuery();
+				departmentsQuery.setSort("modified desc");
+				departmentsQuery.setYn(YnEnums.YES.getId());
+				departmentsQuery.setOrgId(Integer.valueOf(model.getHospitalId()));
+				List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery);
+				for(Departments dept : departmentses)
 				{
-					for (Map deptsPrefix : deptsPrefixs)
+					boolean isExist = false;
+					if (CollectionUtils.isNotEmpty(deptsPrefixs))
 					{
-						if (dept != null && deptsPrefix.get("deptId") != null)
+						for (Map deptsPrefix : deptsPrefixs)
 						{
-							if (Integer.valueOf(String.valueOf(deptsPrefix.get("deptId"))) == dept.getId())
+							if (dept != null && deptsPrefix.get("deptId") != null)
 							{
-								isExist = true;
+								if (Integer.valueOf(String.valueOf(deptsPrefix.get("deptId"))) == dept.getId())
+								{
+									isExist = true;
+								}
 							}
 						}
-					}
 
+					}
+					if (!isExist)
+					{
+						Map<String,String> map = new HashMap<>();
+						map.put("deptId",String.valueOf(dept.getId()));
+						map.put("hospitalId",String.valueOf(dept.getOrgId()));
+						map.put("deptName",dept.getName());
+						map.put("deptPrefix", "");
+						deptsPrefixs.add(map);
+					}
 				}
-				if (!isExist)
-				{
-					Map<String,String> map = new HashMap<>();
-					map.put("deptId",String.valueOf(dept.getId()));
-					map.put("hospitalId",String.valueOf(dept.getOrgId()));
-					map.put("deptName",dept.getName());
-					map.put("deptPrefix", "");
-					deptsPrefixs.add(map);
-				}
+				sr.setDeptPrefix(deptsPrefixs);
 			}
-			sr.setDeptPrefix(deptsPrefixs);
 		}
 		else
 		{
-- 
1.8.3.1