| 
					
				 | 
			
			
				@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.web.bind.annotation.RestController; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.math.BigDecimal; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.Arrays; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.HashMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Map; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -44,6 +45,12 @@ public class MzZdYpYshController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 resultMap.put("message", "药房编码不能为空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (StringUtils.isBlank(commonParams)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                resultMap.put("code", 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                resultMap.put("message", "查询参数为空,未查询到符合条件的药品"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                resultMap.put("data", Arrays.asList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<MzZdYpYsh> mzZdYpYshes = mzZdYpYshService.queryMzZdYpYshByCommonParamsAndGroupNo(commonParams, groupNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (mzZdYpYshes == null || mzZdYpYshes.size() == 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 resultMap.put("code", -1); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -75,6 +82,12 @@ public class MzZdYpYshController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Map<String, Object> getJcJyItemByCommonParams(@RequestParam("commonParams") String commonParams) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String, Object> resultMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (StringUtils.isBlank(commonParams)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                resultMap.put("code", 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                resultMap.put("message", "查询参数为空,未查询到符合条件的诊疗与医技"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                resultMap.put("data", Arrays.asList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                return resultMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //检查与检验 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<JyZdItem> jyZdItemList = jcJyItemChargeService.queryJcJyItemByCommonParams(commonParams); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //            //诊疗 
			 |