| 
					
				 | 
			
			
				@ -119,7 +119,7 @@ public class PatientPreDiagnosisInfoService extends BaseJpaService<PatientPreDia 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                com.alibaba.fastjson.JSONArray array = object.getJSONArray("cardlist"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                if (array==null||array.size()==0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    JSONObject jsonObject = dsyyPrescriptionService.buildAccountAllToHospital(infoDO.getName(),infoDO.getName(),infoDO.getIdcard(),infoDO.getSex(),infoDO.getMobile(),infoDO.getCardNo(),infoDO.getChargeType(),address,infoDO.getAge()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if("00".equals(object.getString("retCode"))){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if("00".equals(jsonObject.getString("retCode"))){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        System.out.println("注册成功"+infoDO.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -156,6 +156,15 @@ public class PatientPreDiagnosisInfoService extends BaseJpaService<PatientPreDia 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (StringUtils.isNoneBlank(idcard)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                patient.setIdcard(idcard); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setProvinceCode(infoDO.getProvince()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setProvinceName(infoDO.getProvinceName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setCityCode(infoDO.getCity()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setCityName(infoDO.getCityName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setTownCode(infoDO.getTown()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setTownName(infoDO.getTownName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setStreetCode(infoDO.getStreet()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setStreetName(infoDO.getStreetName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setAddress(infoDO.getAddress()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            BasePatientDO temp = patientDao.save(patient); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            PatientMedicareCardDO medicareCardDO = new PatientMedicareCardDO(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -174,6 +183,16 @@ public class PatientPreDiagnosisInfoService extends BaseJpaService<PatientPreDia 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                wlyyPatientFamilyMemberDO.setCardNo(idcard); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            familyMemberDao.save(wlyyPatientFamilyMemberDO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setProvinceCode(infoDO.getProvince()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setProvinceName(infoDO.getProvinceName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setCityCode(infoDO.getCity()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setCityName(infoDO.getCityName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setTownCode(infoDO.getTown()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setTownName(infoDO.getTownName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setStreetCode(infoDO.getStreet()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setStreetName(infoDO.getStreetName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            patient.setAddress(infoDO.getAddress()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        infoDO.setPatient(patient.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        infoDO.setCreateTime(new Date()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -194,6 +213,12 @@ public class PatientPreDiagnosisInfoService extends BaseJpaService<PatientPreDia 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return infoDO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public BasePatientDO getPatientInfo(String idcard){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        BasePatientDO basePatientDO = patientDao.findByIdcard(idcard); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return basePatientDO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    //获取患者档案 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public PatientPreDiagnosisInfoDO findInfoDetail(Long id){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return patientPreDiagnosisInfoDao.getOne(id); 
			 |