|  | @ -3430,6 +3430,30 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
	
		
			
				|  |  |         logger.info("json:" + json.toString());
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 设置诊断his入参
 | 
	
		
			
				|  |  |      *
 | 
	
		
			
				|  |  |      * @param jsonData
 | 
	
		
			
				|  |  |      * @param doctorMappingDO
 | 
	
		
			
				|  |  |      * @param outpatientDO
 | 
	
		
			
				|  |  |      * @param info
 | 
	
		
			
				|  |  |      * @param Icd10
 | 
	
		
			
				|  |  |      */
 | 
	
		
			
				|  |  |     public void setIcd10JsonParam(com.alibaba.fastjson.JSONArray jsonData, DoctorMappingDO doctorMappingDO, WlyyOutpatientDO outpatientDO,  String Icd10) {
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
 | 
	
		
			
				|  |  |         json.put("cardNo", outpatientDO.getCardNo());
 | 
	
		
			
				|  |  |         json.put("doctor", doctorMappingDO.getMappingCode());
 | 
	
		
			
				|  |  |         json.put("dept", outpatientDO.getDept());
 | 
	
		
			
				|  |  |         json.put("winNo", outpatientDO.getWinNo());
 | 
	
		
			
				|  |  |         json.put("chargeFlag", 3); //项目类别-必输  1-药品 2检验检查
 | 
	
		
			
				|  |  |         //设置诊断
 | 
	
		
			
				|  |  |         setIcd10(json, Icd10);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         jsonData.add(json);
 | 
	
		
			
				|  |  |         logger.info("json:" + json.toString());
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setIcd10(com.alibaba.fastjson.JSONObject json, String Icd10) {
 | 
	
		
			
				|  |  |         String Icd10s[] = Icd10.split(",");
 | 
	
		
			
				|  |  |         for (int i = 0; i < Icd10s.length; i++) {
 | 
	
	
		
			
				|  | @ -10436,12 +10460,15 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
	
		
			
				|  |  |             if (wxId.equalsIgnoreCase("xm_zsyy_wx")) {
 | 
	
		
			
				|  |  |                     //his处方拼接开方条件
 | 
	
		
			
				|  |  |                     com.alibaba.fastjson.JSONArray jsonData = new com.alibaba.fastjson.JSONArray();
 | 
	
		
			
				|  |  |                     if(infoDOS==null||infoDOS.size()==0){
 | 
	
		
			
				|  |  |                         setIcd10JsonParam(jsonData,doctorMappingDO,outpatientDO,outpatientDO.getIcd10());
 | 
	
		
			
				|  |  |                     }
 | 
	
		
			
				|  |  |                     for (WlyyPrescriptionInfoDO info : infoDOS) {
 | 
	
		
			
				|  |  |                         //设置his药品查询条件
 | 
	
		
			
				|  |  |                         setInfoJsonParam(jsonData, doctorMappingDO, outpatientDO, wlyyPrescriptionDO, info, outpatientDO.getIcd10());
 | 
	
		
			
				|  |  |                     }
 | 
	
		
			
				|  |  |                     for (WlyyInspectionDO ins : inspectionDOS) {
 | 
	
		
			
				|  |  |                         //设置his药品查询条件
 | 
	
		
			
				|  |  |                         //设置his检查查询条件
 | 
	
		
			
				|  |  |                         setInspectionParam(jsonData, doctorMappingDO, outpatientDO, wlyyPrescriptionDO, ins, outpatientDO.getIcd10());
 | 
	
		
			
				|  |  |                     }
 | 
	
		
			
				|  |  |                     if (expressageDOS!=null&&expressageDOS.size()!=0){
 |