|  | @ -6,6 +6,7 @@ import com.yihu.wlyy.sign.common.util.DateUtil;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.sign.common.util.StringUtil;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.sign.dao.*;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.sign.entity.*;
 | 
	
		
			
				|  |  | import net.sf.json.JSONObject;
 | 
	
		
			
				|  |  | import org.apache.commons.lang.StringUtils;
 | 
	
		
			
				|  |  | import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  | import org.springframework.stereotype.Service;
 | 
	
	
		
			
				|  | @ -112,7 +113,7 @@ public class ChargeZYService {
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             String idcard = sign.getIdcard();
 | 
	
		
			
				|  |  |             String year = sign.getSignYear();
 | 
	
		
			
				|  |  |             String operator = sign.getSignDoctorCode();
 | 
	
		
			
				|  |  |             String operator = sign.getDoctor();
 | 
	
		
			
				|  |  |             String signCode = sign.getCode();
 | 
	
		
			
				|  |  |             String[] hm = null;
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -187,6 +188,30 @@ public class ChargeZYService {
 | 
	
		
			
				|  |  |                     System.out.print("operator:"+operator+","+hm[0]);
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 params.put("CHARGE_OPERATOR", operator);  //收费医生
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |                 //缴费明细---2017.12.12---黄文杰
 | 
	
		
			
				|  |  |                 Map<String, String> INSUR_FEE_INFO = new HashMap<>();
 | 
	
		
			
				|  |  |                 HospitalMapping hospitalMapping = hospitalMappingDao.getMappingCode(sign.getHospital(), "1");  //转换成基卫机构代码
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("qyjg00",hospitalMapping.getSbCode());//签约机构
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("qyys00",sign.getDoctorName());//签约医生
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("btlx00",sign.getExpensesType());//补贴类型
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("djjg00",hospitalMapping.getSbCode());//登记机构
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("djr000",sign.getDoctorName());//登记人
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("djsj00",DateUtil.dateToStrShort(sign.getBegin()));//登记时间
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("qyzt00",charge.getMiRegisterStatus());//登记状态
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("kfjg00",hospitalMapping.getSbCode());//扣费机构
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("kfrxm0",sign.getDoctorName());//扣费人
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("kfsj00",charge.getChargeTime());//扣费时间
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("kfzt00",charge.getMiCollectStatus());//扣费状态
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("kfdjh0",charge.getMiSettleNo());//扣费单据号
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("zje000",String.valueOf(charge.getMiTotalFee()));//扣费总额
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("zfbtzf",charge.getCadresPay());//政府补贴支付
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("tcjjzf",charge.getHealthCarePay());//医保统筹支付
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("jkzhzf",charge.getHeathPay());//健康账户支付
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("zhzfe0",charge.getAccountPay());//医保账户支付
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("xjzfe0",charge.getSelfPay());//个人现金自付
 | 
	
		
			
				|  |  |                 INSUR_FEE_INFO.put("INSUR_FEE_INFO",JSONObject.fromObject(INSUR_FEE_INFO).toString());
 | 
	
		
			
				|  |  |                 
 | 
	
		
			
				|  |  |                 String response = zysoftService.uploadChargeInfo(params, hm[0], hm[1], operator);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |                 Map<String, String> map = zysoftService.getJwOne(response);
 |