| 
					
				 | 
			
			
				@ -850,9 +850,9 @@ public class TasyNatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            orderObj.put("openId",openId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            orderObj.put("name",baseNatAppointmentDO.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            orderObj.put("idNo",baseNatAppointmentDO.getCardNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String hisPatientId=getPatientHisId(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getMedicare()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            orderObj.put("patientId",hisPatientId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            orderObj.put("mobile",baseNatAppointmentDO.getMobile()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            Map mapHis=getPatientHisId(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getMedicare()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            orderObj.put("patientId",mapHis.get("Patientid").toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            orderObj.put("mobile",mapHis.get("MobilePhone").toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //orderObj.put("socialCard",""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            orderObj.put("icCard",baseNatAppointmentDO.getMedicare()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            BigDecimal b = new BigDecimal(baseNatAppointmentDO.getChargeAmount()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1007,7 +1007,8 @@ public class TasyNatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        result.put("msg","验证通过"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return  result; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String getPatientHisId(String idcard,String mediacard) throws Exception{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public Map getPatientHisId(String idcard,String mediacard) throws Exception{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        Map map = new HashMap(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String res = findHisPatientCard(idcard); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        JSONObject jsonObject = JSON.parseObject(res); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if ("1".equalsIgnoreCase(jsonObject.getString("ReturnCode"))) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1019,7 +1020,10 @@ public class TasyNatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        JSONObject child = jsonArray.getJSONObject(i); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        if (mediacard.equalsIgnoreCase(child.getString("CardNo"))) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            String Patientid = child.getString("Patientid"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            return Patientid; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            String MobilePhone = child.getString("MobilePhone"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            map.put("Patientid",Patientid); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            map.put("MobilePhone",MobilePhone); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            return map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1029,7 +1033,10 @@ public class TasyNatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    JSONObject jsonObject1 = JSONObject.parseObject(patients); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if (mediacard.equalsIgnoreCase(jsonObject1.getString("CardNo"))) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        String Patientid = jsonObject1.getString("Patientid"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        return Patientid; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        String MobilePhone = jsonObject1.getString("MobilePhone"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        map.put("Patientid",Patientid); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        map.put("MobilePhone",MobilePhone); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        return map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   e.printStackTrace(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1037,6 +1044,6 @@ public class TasyNatService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				} 
			 |