| 
					
				 | 
			
			
				@@ -1442,7 +1442,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         zlDetail.put("drugQuan", mzChargeDetail.getDrugQuan()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         zlDetail.put("drugUnit", mzChargeDetail.getDrugUnit()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         zlDetail.put("orderDays", mzChargeDetail.getOrderDays()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        zlDetail.put("frequency", mzChargeDetail.getFrequency()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        OrderFrequencyEnum orderFrequencyEnum = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        zlDetail.put("frequency", orderFrequencyEnum != null ? orderFrequencyEnum.name : ""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         zlDetail.put("quantity", mzChargeDetail.getQuantity()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         if (StringUtils.isNotBlank(mzChargeDetail.getInstructionText())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             zlDetail.put("instructionCode", mzChargeDetail.getInstructionCode()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1589,7 +1590,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<String> detail = (List<String>) zlPrescription.get(0).get("detail"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (detail != null && detail.size() > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 sbd.append("诊疗:</br>"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                setJcjyDetail(zlPrescription, sbd); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                setZlDetail(zlPrescription, sbd); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String, Object> zyReqPrescription = (Map<String, Object>) prescriptionDetail.get("zyReqPrescription"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1883,7 +1884,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     * 设置辅助检查、检验\诊疗 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 设置辅助检查、检验 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param prescription 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param sbd 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1901,6 +1902,29 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 设置诊疗 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @param prescription 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @param sbd 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private void setZlDetail(List<Map<String, Object>> prescription, StringBuilder sbd) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (prescription.size() > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for (Map<String, Object> map : prescription) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                List<Map<String, Object>> detail = (List<Map<String, Object>>) map.get("detail"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (detail.size() > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    for (Map<String, Object> detailMap : detail) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        sbd.append(detailMap.get("index")).append(".").append(detailMap.get("name")) .append(" X 总量:") .append(detailMap.get("quantity") == null ? "" : detailMap.get("quantity")).append("</br>"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        sbd.append(" 单量:").append(detailMap.get("drugQuan") == null ? "" : detailMap.get("drugQuan")).append(" 频率:") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                .append(detailMap.get("frequency") == null ? "" : detailMap.get("frequency")).append(" 天数:") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                .append(detailMap.get("orderDays") == null ? "" : detailMap.get("orderDays")).append("</br>"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 设置完整处方  needPatient needVerify 同事为true 时是保存处方 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 
			 |