寓健接口代码添加

tran-service/src/main/java/com/diagbot/yujian/controller/YJInquiryController.java

@@ -0,0 +1,75 @@
+package com.diagbot.yujian.controller;
+
+import com.lantone.core.api.Response;
+import com.lantone.icss.api.at.model.InquiryResult;
+import com.lantone.icss.api.at.model.wrapper.InquiryInfoWrapper;
+import com.lantone.icss.trans.yujian.service.YJInquiryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/***Title: 
+*	Description: 疾病电子病历检验检查写回
+*	Company:杭州朗通信息技术有限公司 
+	@author 吴文俊
+	@date 2016年5月30日
+*/
+@Controller
+@RequestMapping("/yujian/at")
+public class YJInquiryController {
+	
+	private static Logger logger = LoggerFactory.getLogger(YJInquiryController.class);
+	
+	@Autowired
+	YJInquiryService inquiryService;
+
+	
+	/**
+	 * @Description:保存诊断信息
+	 * @author:ztg
+	 * @time:2017年5月12日 下午12:04:50
+	 */
+	@RequestMapping(value = "/saveInquiry")
+	@ResponseBody
+	public Response<InquiryResult> saveInquiry(@RequestBody InquiryInfoWrapper info) throws Exception {
+		Response<InquiryResult> response = new Response<InquiryResult>();
+		response.start();
+		try {
+			// 调接口
+			logger.info("------------诊疗信息保存接口------------");
+			response.setData(inquiryService.saveInquiryInfo(info));
+		} catch (Exception loadException) {
+			loadException.printStackTrace();
+			logger.error("数据写入出错!", loadException);
+			return response.failure("数据写入出错!");
+		}
+		return response.success();
+	}
+	
+
+	/**
+	 * @Description:查询
+	 * @author:ztg
+	 * @time:2017年5月12日 下午12:06:34
+	 */
+	/*@RequestMapping(value = "/searchInquiry")
+	@ResponseBody	
+	public Response<VisitedObject> searchInquiry(Long visitedId) throws Exception {
+		Response<VisitedObject> response = new Response<VisitedObject>();
+		response.start();
+		try {
+			// 调接口
+			logger.info("------------诊疗信息保存接口------------");
+			response.setData(inquiryService.searchInquiry(visitedId));
+		} catch (Exception loadException) {
+			loadException.printStackTrace();
+			logger.error("数据写入出错!", loadException);
+			return response.failure("数据写入出错!");
+		}
+		return response.success();
+	}*/
+}

tran-service/src/main/java/com/diagbot/yujian/controller/YJInquiryMsgController.java

@@ -0,0 +1,64 @@
+package com.diagbot.yujian.controller;
+
+import com.lantone.core.api.Response;
+import com.lantone.core.utils.http.HttpApi;
+import com.lantone.icss.api.at.model.wrapper.InquiryMsgWrapper;
+import com.lantone.icss.trans.common.listen.InitConfig;
+import com.lantone.icss.trans.yujian.model.inquiryMsg.response.LsData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/***Title: 
+*	Description: 疾病电子病历检验检查写回
+*	Company:杭州朗通信息技术有限公司 
+	@author 吴文俊
+	@date 2016年5月30日
+*/
+@Controller
+@RequestMapping("/yujian/at")
+public class YJInquiryMsgController {
+	
+	private static Logger logger = LoggerFactory.getLogger(YJInquiryMsgController.class);
+	
+	/**
+	 * @Description:保存诊断信息
+	 * @author:lpc
+	 * @time:2017年6月119日 下午16:04:50
+	 */
+	@ResponseBody
+	@RequestMapping(value="/saveinquirymsg_yujian",produces = "application/json; charset=utf-8",method=RequestMethod.POST)
+	public LsData saveInquirymsg(@RequestBody String patdescribe) throws Exception {
+		Response<Object> response = new Response<Object>();
+		response.start();
+		LsData lsData=new LsData();
+		try {
+			HttpApi<Response> httpApi = new HttpApi<Response>();
+			logger.info("---his就诊记录获取---"+patdescribe);
+			if(patdescribe!=null){
+				InquiryMsgWrapper infomsg=new InquiryMsgWrapper();
+				//String data=URLDecoder.decode(patdescribe.substring(0, patdescribe.length()-1),"UTF-8");
+				infomsg.setPatdescribe(patdescribe);
+				response= httpApi.doPost(InitConfig.get("yujian.inquirymsg.url"), infomsg, Response.class);
+				lsData.setRet(response.getRet());
+				lsData.setMsg(response.getMsg());
+				return lsData;
+			}else{
+				lsData.setRet(1);
+				lsData.setMsg("发送数据为空");
+				return lsData;
+			}	
+		} catch (Exception loadException) {
+			loadException.printStackTrace();
+			logger.error("数据写入出错:", loadException);
+			lsData.setRet(1);
+			lsData.setMsg("数据写入出错:"+loadException.getMessage());
+			return lsData;
+		}
+	}
+
+}

tran-service/src/main/java/com/diagbot/yujian/controller/YJPatientInfoController.java

@@ -0,0 +1,43 @@
+package com.diagbot.yujian.controller;
+
+import com.lantone.core.api.Response;
+import com.lantone.icss.api.at.model.PatientInfo;
+import com.lantone.icss.api.at.model.wrapper.PatientInfoWrapper;
+import com.lantone.icss.trans.yujian.service.YJPatientInfoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("/yujian/at/patient_info")
+public class YJPatientInfoController {
+
+	private static Logger logger = LoggerFactory.getLogger(YJPatientInfoController.class);
+	
+	@Autowired
+	YJPatientInfoService service;
+	//根据病人证号查询病人详细信息
+	@RequestMapping(value = "/get_patient_info")
+	@ResponseBody
+	public Response<PatientInfo> getPatientInfo(@RequestBody PatientInfoWrapper patientInfoWrapper) throws Exception {
+		Response<PatientInfo> response = new Response<PatientInfo>();
+		response.start();
+		try {
+			PatientInfo patientInfo = service.remotePatientInfo(patientInfoWrapper);
+			if(patientInfo!=null){
+				response.setData(patientInfo);
+			}else{
+				return response.failure("无数据!");
+			}
+		} catch (Exception loadException) {
+			loadException.printStackTrace();
+			logger.error("数据查看出错!", loadException);
+			return response.failure("数据查看出错!");
+		}
+		return response.success();
+	}
+}

tran-service/src/main/java/com/diagbot/yujian/model/InterfaceResponse.java

@@ -0,0 +1,7 @@
+package com.diagbot.yujian.model;
+
+import com.lantone.core.api.Response;
+
+public class InterfaceResponse extends Response<String> {
+    private static final long serialVersionUID = 1L;
+}

tran-service/src/main/java/com/diagbot/yujian/model/ReqBody.java

@@ -0,0 +1,41 @@
+package com.diagbot.yujian.model;
+
+import com.lantone.icss.trans.yujian.model.inquiryInfo.request.InquiryInfoRequest;
+import com.lantone.icss.trans.yujian.model.patientInfo.request.PatientInfoRequest;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "ROOT")
+
+@XmlSeeAlso({InquiryInfoRequest.class,PatientInfoRequest.class})
+
+
+public class ReqBody<T> {
+	private ReqHead HEAD;
+	
+	private T BODY;
+
+
+
+	public ReqHead getHead() {
+		return HEAD;
+	}
+
+	public void setHead(ReqHead hEAD) {
+		HEAD = hEAD;
+	}
+
+	public T getBody() {
+		return BODY;
+	}
+
+	public void setBody(T bODY) {
+		BODY = bODY;
+	}
+
+
+}

tran-service/src/main/java/com/diagbot/yujian/model/ReqHead.java

@@ -0,0 +1,60 @@
+package com.diagbot.yujian.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "head")
+public class ReqHead {
+	@XmlElement(name = "tranKey")
+	private String tranKey = "";
+	@XmlElement(name = "tranType")
+	private String tranType = "";
+	@XmlElement(name = "stffNo")
+	private String stffNo = "";
+	@XmlElement(name = "hospitalId")
+	private String hospitalId = "";
+	@XmlElement(name = "departId")
+	private String departId = "";
+	@XmlElement(name = "tranData")
+	private String tranData = "";
+	public String getTranKey() {
+		return tranKey;
+	}
+	public void setTranKey(String tranKey) {
+		this.tranKey = tranKey;
+	}
+	public String getTranType() {
+		return tranType;
+	}
+	public void setTranType(String tranType) {
+		this.tranType = tranType;
+	}
+	public String getStffNo() {
+		return stffNo;
+	}
+	public void setStffNo(String stffNo) {
+		this.stffNo = stffNo;
+	}
+	public String getHospitalId() {
+		return hospitalId;
+	}
+	public void setHospitalId(String hospitalId) {
+		this.hospitalId = hospitalId;
+	}
+	public String getDepartId() {
+		return departId;
+	}
+	public void setDepartId(String departId) {
+		this.departId = departId;
+	}
+	public String getTranData() {
+		return tranData;
+	}
+	public void setTranData(String tranData) {
+		this.tranData = tranData;
+	}
+	
+}

tran-service/src/main/java/com/diagbot/yujian/model/ResBody.java

@@ -0,0 +1,19 @@
+package com.diagbot.yujian.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "root")
+public class ResBody<T> {
+	T response;
+
+	public T getResquest() {
+		return response;
+	}
+
+	public void setResquest(T response) {
+		this.response = response;
+	}
+}

tran-service/src/main/java/com/diagbot/yujian/model/ResHead.java

@@ -0,0 +1,70 @@
+package com.diagbot.yujian.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
+public class ResHead {
+	@XmlElement(name = "status")
+	private String status;
+	@XmlElement(name = "startTime")
+	private String startTime;
+	@XmlElement(name = "endTime")
+	private String endTime;
+	@XmlElement(name = "version")
+	private String version;
+	@XmlElement(name = "msg")
+	private String msg;
+	@XmlElement(name = "ret")
+	private String ret;
+	@XmlElement(name = "data")
+	private String data;
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	public String getRet() {
+		return ret;
+	}
+	public void setRet(String ret) {
+		this.ret = ret;
+	}
+	public String getData() {
+		return data;
+	}
+	public void setData(String data) {
+		this.data = data;
+	}
+	
+	
+}

tran-service/src/main/java/com/diagbot/yujian/model/inquiryInfo/request/InquiryInfoRequest.java

@@ -0,0 +1,153 @@
+package com.diagbot.yujian.model.inquiryInfo.request;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "BODY")
+public class InquiryInfoRequest {
+	//@XmlElement(name = "HOSPITALID")
+	//private String hospitalId;	//机构id
+	//@XmlElement(name = "HISCODE")
+	//private String hisCode;	//病人就诊序号
+	
+	@XmlElement(name = "FEETYPE")
+	private String feetype = "";	//寓健新加字段--费用类型
+	@XmlElement(name = "BRJZID")
+	private String brjzId = "";	//寓健新加字段--病人就诊id
+	@XmlElement(name = "CLINICNO")
+	private String clinicno = "";	//寓健新加字段
+	@XmlElement(name = "USERID")
+	private String userid = "";	//寓健新加字段
+	@XmlElement(name = "CLINICTYPEID")
+	private String clinictypeid = "";	//寓健新加字段
+	
+	
+	@XmlElement(name = "PATIENTID")
+	private String patientId = "";	//病人流水号
+	@XmlElement(name = "CHIEFCOMPLAINT")
+	private String chiefComplaint = "";	//主诉
+	@XmlElement(name = "PRESENTHISTORY")
+	private String presentHistory = "";	//现病史
+	@XmlElement(name = "PASTHISTORY")
+	private String pastHistory = "";	//既往史
+	@XmlElement(name = "OTHERHISTORY")
+	private String otherHistory = "";	//其他史
+	@XmlElement(name = "SIGNS")
+	private String signs = "";	//体征
+	@XmlElement(name = "ASSAY")
+	private String assay = "";	//化验
+	@XmlElement(name = "SITEADVISOR")
+	private String siteAdvisor = "";	//器查
+	@XmlElement(name = "DIAGNOSIS")
+	private String diagnosis = "";	//诊断
+	@XmlElement(name = "TREATMENT")
+	private String treatment = "";	//治疗
+	
+	/*public String getHospitalId() {
+		return hospitalId;
+	}
+	public void setHospitalId(String hospitalId) {
+		this.hospitalId = hospitalId;
+	}
+	public String getHisCode() {
+		return hisCode;
+	}
+	public void setHisCode(String hisCode) {
+		this.hisCode = hisCode;
+	}*/
+	
+	public String getBrjzId() {
+		return brjzId;
+	}
+	public String getClinicno() {
+		return clinicno;
+	}
+	public void setClinicno(String clinicno) {
+		this.clinicno = clinicno;
+	}
+	public String getUserid() {
+		return userid;
+	}
+	public void setUserid(String userid) {
+		this.userid = userid;
+	}
+	public String getClinictypeid() {
+		return clinictypeid;
+	}
+	public void setClinictypeid(String clinictypeid) {
+		this.clinictypeid = clinictypeid;
+	}
+	public void setBrjzId(String brjzId) {
+		this.brjzId = brjzId;
+	}
+	public String getFeetype() {
+		return feetype;
+	}
+	public void setFeetype(String feetype) {
+		this.feetype = feetype;
+	}
+	public String getPatientId() {
+		return patientId;
+	}
+	public void setPatientId(String patientId) {
+		this.patientId = patientId;
+	}
+	public String getChiefComplaint() {
+		return chiefComplaint;
+	}
+	public void setChiefComplaint(String chiefComplaint) {
+		this.chiefComplaint = chiefComplaint;
+	}
+	public String getPresentHistory() {
+		return presentHistory;
+	}
+	public void setPresentHistory(String presentHistory) {
+		this.presentHistory = presentHistory;
+	}
+	public String getPastHistory() {
+		return pastHistory;
+	}
+	public void setPastHistory(String pastHistory) {
+		this.pastHistory = pastHistory;
+	}
+	public String getOtherHistory() {
+		return otherHistory;
+	}
+	public void setOtherHistory(String otherHistory) {
+		this.otherHistory = otherHistory;
+	}
+	public String getSigns() {
+		return signs;
+	}
+	public void setSigns(String signs) {
+		this.signs = signs;
+	}
+	public String getAssay() {
+		return assay;
+	}
+	public void setAssay(String assay) {
+		this.assay = assay;
+	}
+	public String getSiteAdvisor() {
+		return siteAdvisor;
+	}
+	public void setSiteAdvisor(String siteAdvisor) {
+		this.siteAdvisor = siteAdvisor;
+	}
+	public String getDiagnosis() {
+		return diagnosis;
+	}
+	public void setDiagnosis(String diagnosis) {
+		this.diagnosis = diagnosis;
+	}
+	public String getTreatment() {
+		return treatment;
+	}
+	public void setTreatment(String treatment) {
+		this.treatment = treatment;
+	}
+	
+}

tran-service/src/main/java/com/diagbot/yujian/model/inquiryInfo/response/InquiryResponseBody.java

@@ -0,0 +1,95 @@
+package com.diagbot.yujian.model.inquiryInfo.response;
+
+import com.lantone.core.Constants;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "ROOT")
+public class InquiryResponseBody<T> implements java.io.Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	@XmlElement(name = "status")
+	private String status; // 状态
+	@XmlElement(name = "startTime")
+	private long startTime = Constants.INVALIDATE_VALUE; // 起始时间
+	@XmlElement(name = "endTime")
+	private long endTime = Constants.INVALIDATE_VALUE; // 结束时间
+	@XmlElement(name = "version")
+	private String version = "1.0";
+	@XmlElement(name = "msg")
+	private String msg = Constants.MSG_SUCCESS; // 消息
+
+	private InquiryResponseDetail data = null;
+	
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public long getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(long startTime) {
+		this.startTime = startTime;
+	}
+	public long getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(long endTime) {
+		this.endTime = endTime;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	public InquiryResponseDetail getData() {
+		return data;
+	}
+	public void setData(InquiryResponseDetail data) {
+		this.data = data;
+	}
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+	public int getRet() {
+		return ret;
+	}
+	public void setRet(int ret) {
+		this.ret = ret;
+	}
+	public String getToken() {
+		return token;
+	}
+	public void setToken(String token) {
+		this.token = token;
+	}
+	public long getTimeConsum() {
+		return timeConsum;
+	}
+	public void setTimeConsum(long timeConsum) {
+		this.timeConsum = timeConsum;
+	}
+	
+	@XmlElement(name = "ret")
+	private int ret = Constants.RET_SUCCESS;
+	@XmlElement(name = "token")
+
+	private String token;
+	// 耗时
+	@XmlElement(name = "timeConsum")
+	private long timeConsum;
+
+}

tran-service/src/main/java/com/diagbot/yujian/model/inquiryInfo/response/InquiryResponseDetail.java

@@ -0,0 +1,18 @@
+package com.diagbot.yujian.model.inquiryInfo.response;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name ="data")
+public class InquiryResponseDetail {
+	//HIS生成记录序号
+	private String recordId;
+
+	public String getRecordId() {
+		return recordId;
+	}
+
+	public void setRecordId(String recordId) {
+		this.recordId = recordId;
+	}
+	
+}

tran-service/src/main/java/com/diagbot/yujian/model/inquiryMsg/response/LsData.java

@@ -0,0 +1,37 @@
+package com.diagbot.yujian.model.inquiryMsg.response;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @author:CSP
+ * @time:2017年6月6日上午12:17:43
+ */
+public class LsData implements Serializable {
+	private static final long serialVersionUID = 1L;
+//	private String data = null;
+	private String msg;
+	private int ret;
+//	public String getData() {
+//		return data;
+//	}
+//	public void setData(String data) {
+//		this.data = data;
+//	}
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	public int getRet() {
+		return ret;
+	}
+	public void setRet(int ret) {
+		this.ret = ret;
+	}  
+	
+}

tran-service/src/main/java/com/diagbot/yujian/model/patientInfo/request/PatientInfoRequest.java

@@ -0,0 +1,22 @@
+package com.diagbot.yujian.model.patientInfo.request;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlRootElement(name = "body")
+public class PatientInfoRequest {
+	@XmlElement(name = "PATIENTID")
+	private String patientId = "";
+
+	public String getPatientId() {
+		return patientId;
+	}
+
+	public void setPatientId(String patientId) {
+		this.patientId = patientId;
+	}
+	
+}

tran-service/src/main/java/com/diagbot/yujian/model/patientInfo/response/HISPatient.java

@@ -0,0 +1,244 @@
+package com.diagbot.yujian.model.patientInfo.response;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+@XmlRootElement(name = "data")
+
+public class HISPatient implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	// 医院编号
+	// @XmlElement(name = "id")
+	private String id;
+	//
+	// @XmlElement(name = "patName")
+	private String patName;
+	// @XmlElement(name = "patSex")
+	private String patSex;
+	// @XmlElement(name = "patBirthday")
+	private String patBirthday;
+	// @XmlElement(name = "natureId")
+	private String natureId;
+	// @XmlElement(name = "patIdentityNum")
+	private String patIdentityNum;
+	// @XmlElement(name = "patFamAddress")
+	private String patFamAddress;
+	// @XmlElement(name = "patPostcode")
+	private String patPostcode;
+	// @XmlElement(name = "patContactPhone")
+	private String patContactPhone;
+	// @XmlElement(name = "patContacts")
+	private String patContacts;
+	// @XmlElement(name = "patPhone")
+	private String patPhone;
+	// @XmlElement(name = "patWorkUnit")
+	private String patWorkUnit;
+	// @XmlElement(name = "patOperation")
+	private String patOperation;
+	// @XmlElement(name = "patCountry")
+	private String patCountry;
+	// @XmlElement(name = "patNationality")
+	private String patNationality;
+	// @XmlElement(name = "patMatrimony")
+	private String patMatrimony;
+	// @XmlElement(name = "patHisPrevious")
+	private String patHisPrevious;
+	// @XmlElement(name = "patHisAllergic")
+	private String patHisAllergic;
+	// @XmlElement(name = "patHisFamily")
+	private String patHisFamily;
+	// @XmlElement(name = "patRecordDate")
+	private String patRecordDate;
+	// @XmlElement(name = "patMemGrade")
+	private String patMemGrade;
+	// @XmlElement(name = "patCardNum")
+	private String patCardNum;
+	// @XmlElement(name = "feeId")
+	private String feeId;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getPatName() {
+		return patName;
+	}
+
+	public void setPatName(String patName) {
+		this.patName = patName;
+	}
+
+	public String getPatSex() {
+		return patSex;
+	}
+
+	public void setPatSex(String patSex) {
+		this.patSex = patSex;
+	}
+
+	public String getPatBirthday() {
+		return patBirthday;
+	}
+
+	public void setPatBirthday(String patBirthday) {
+		this.patBirthday = patBirthday;
+	}
+
+	public String getNatureId() {
+		return natureId;
+	}
+
+	public void setNatureId(String natureId) {
+		this.natureId = natureId;
+	}
+
+	public String getPatIdentityNum() {
+		return patIdentityNum;
+	}
+
+	public void setPatIdentityNum(String patIdentityNum) {
+		this.patIdentityNum = patIdentityNum;
+	}
+
+	public String getPatFamAddress() {
+		return patFamAddress;
+	}
+
+	public void setPatFamAddress(String patFamAddress) {
+		this.patFamAddress = patFamAddress;
+	}
+
+	public String getPatPostcode() {
+		return patPostcode;
+	}
+
+	public void setPatPostcode(String patPostcode) {
+		this.patPostcode = patPostcode;
+	}
+
+	public String getPatContactPhone() {
+		return patContactPhone;
+	}
+
+	public void setPatContactPhone(String patContactPhone) {
+		this.patContactPhone = patContactPhone;
+	}
+
+	public String getPatContacts() {
+		return patContacts;
+	}
+
+	public void setPatContacts(String patContacts) {
+		this.patContacts = patContacts;
+	}
+
+	public String getPatPhone() {
+		return patPhone;
+	}
+
+	public void setPatPhone(String patPhone) {
+		this.patPhone = patPhone;
+	}
+
+	public String getPatWorkUnit() {
+		return patWorkUnit;
+	}
+
+	public void setPatWorkUnit(String patWorkUnit) {
+		this.patWorkUnit = patWorkUnit;
+	}
+
+	public String getPatOperation() {
+		return patOperation;
+	}
+
+	public void setPatOperation(String patOperation) {
+		this.patOperation = patOperation;
+	}
+
+	public String getPatCountry() {
+		return patCountry;
+	}
+
+	public void setPatCountry(String patCountry) {
+		this.patCountry = patCountry;
+	}
+
+	public String getPatNationality() {
+		return patNationality;
+	}
+
+	public void setPatNationality(String patNationality) {
+		this.patNationality = patNationality;
+	}
+
+	public String getPatMatrimony() {
+		return patMatrimony;
+	}
+
+	public void setPatMatrimony(String patMatrimony) {
+		this.patMatrimony = patMatrimony;
+	}
+
+	public String getPatHisPrevious() {
+		return patHisPrevious;
+	}
+
+	public void setPatHisPrevious(String patHisPrevious) {
+		this.patHisPrevious = patHisPrevious;
+	}
+
+	public String getPatHisAllergic() {
+		return patHisAllergic;
+	}
+
+	public void setPatHisAllergic(String patHisAllergic) {
+		this.patHisAllergic = patHisAllergic;
+	}
+
+	public String getPatHisFamily() {
+		return patHisFamily;
+	}
+
+	public void setPatHisFamily(String patHisFamily) {
+		this.patHisFamily = patHisFamily;
+	}
+
+	public String getPatRecordDate() {
+		return patRecordDate;
+	}
+
+	public void setPatRecordDate(String patRecordDate) {
+		this.patRecordDate = patRecordDate;
+	}
+
+	public String getPatMemGrade() {
+		return patMemGrade;
+	}
+
+	public void setPatMemGrade(String patMemGrade) {
+		this.patMemGrade = patMemGrade;
+	}
+
+	public String getPatCardNum() {
+		return patCardNum;
+	}
+
+	public void setPatCardNum(String patCardNum) {
+		this.patCardNum = patCardNum;
+	}
+
+	public String getFeeId() {
+		return feeId;
+	}
+
+	public void setFeeId(String feeId) {
+		this.feeId = feeId;
+	}
+
+}

tran-service/src/main/java/com/diagbot/yujian/model/patientInfo/response/PatientInfoResponse.java

@@ -0,0 +1,198 @@
+package com.diagbot.yujian.model.patientInfo.response;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlRootElement
+public class PatientInfoResponse {
+
+	@XmlElement(name = "ID")
+	private String id = "";
+	@XmlElement(name = "PATNAME")
+	private String patName = "";
+	@XmlElement(name = "PATSEX")
+	private String patSex = "";
+	@XmlElement(name = "PATBIRTHDAY")
+	private String patBirthday = "";
+	@XmlElement(name = "NATUREID")
+	private String natureId = "";
+	@XmlElement(name = "PATIDENTITYNUM")
+	private String patIdentityNum = "";
+	@XmlElement(name = "PATFAMADDRESS")
+	private String patFamAddress = "";
+	@XmlElement(name = "PATPOSTCODE")
+	private String patPostcode = "";
+	@XmlElement(name = "PATCONTACTPHONE")
+	private String patContactPhone = "";
+	@XmlElement(name = "PATCONTACTS")
+	private String patContacts = "";
+	@XmlElement(name = "PATPHONE")
+	private String patPhone = "";
+	@XmlElement(name = "PATWORKUNIT")
+	private String patWorkUnit = "";
+	@XmlElement(name = "PATOPERATION")
+	private String patOperation = "";
+	@XmlElement(name = "PATCOUNIRY")
+	private String patCountry = "";
+	@XmlElement(name = "PATNATIOMALITY")
+	private String patNationality = "";
+	@XmlElement(name = "PATMATRIMONY")
+	private String patMatrimony = "";
+	@XmlElement(name = "PATHISPREVIOUS")
+	private String patHisPrevious = "";
+	@XmlElement(name = "PATHISALLERGIC")
+	private String patHisAllergic = "";
+	@XmlElement(name = "PATHISFAMILY")
+	private String patHisFamily = "";
+	@XmlElement(name = "PATRECORDDATE")
+	private String patRecordDate = "";
+	@XmlElement(name = "PATMEMGRADE")
+	private String patMemGrade = "";
+	@XmlElement(name = "PATCARDNUM")
+	private String patCardNum = "";
+	@XmlElement(name = "FEEID")
+	private String feeId = "";
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getPatName() {
+		return patName;
+	}
+	public void setPatName(String patName) {
+		this.patName = patName;
+	}
+	public String getPatSex() {
+		return patSex;
+	}
+	public void setPatSex(String patSex) {
+		this.patSex = patSex;
+	}
+	public String getPatBirthday() {
+		return patBirthday;
+	}
+	public void setPatBirthday(String patBirthday) {
+		this.patBirthday = patBirthday;
+	}
+	public String getNatureId() {
+		return natureId;
+	}
+	public void setNatureId(String natureId) {
+		this.natureId = natureId;
+	}
+	public String getPatIdentityNum() {
+		return patIdentityNum;
+	}
+	public void setPatIdentityNum(String patIdentityNum) {
+		this.patIdentityNum = patIdentityNum;
+	}
+	public String getPatFamAddress() {
+		return patFamAddress;
+	}
+	public void setPatFamAddress(String patFamAddress) {
+		this.patFamAddress = patFamAddress;
+	}
+	public String getPatPostcode() {
+		return patPostcode;
+	}
+	public void setPatPostcode(String patPostcode) {
+		this.patPostcode = patPostcode;
+	}
+	public String getPatContactPhone() {
+		return patContactPhone;
+	}
+	public void setPatContactPhone(String patContactPhone) {
+		this.patContactPhone = patContactPhone;
+	}
+	public String getPatContacts() {
+		return patContacts;
+	}
+	public void setPatContacts(String patContacts) {
+		this.patContacts = patContacts;
+	}
+	public String getPatPhone() {
+		return patPhone;
+	}
+	public void setPatPhone(String patPhone) {
+		this.patPhone = patPhone;
+	}
+	public String getPatWorkUnit() {
+		return patWorkUnit;
+	}
+	public void setPatWorkUnit(String patWorkUnit) {
+		this.patWorkUnit = patWorkUnit;
+	}
+	public String getPatOperation() {
+		return patOperation;
+	}
+	public void setPatOperation(String patOperation) {
+		this.patOperation = patOperation;
+	}
+	public String getPatCountry() {
+		return patCountry;
+	}
+	public void setPatCountry(String patCountry) {
+		this.patCountry = patCountry;
+	}
+	public String getPatNationality() {
+		return patNationality;
+	}
+	public void setPatNationality(String patNationality) {
+		this.patNationality = patNationality;
+	}
+	public String getPatMatrimony() {
+		return patMatrimony;
+	}
+	public void setPatMatrimony(String patMatrimony) {
+		this.patMatrimony = patMatrimony;
+	}
+	public String getPatHisPrevious() {
+		return patHisPrevious;
+	}
+	public void setPatHisPrevious(String patHisPrevious) {
+		this.patHisPrevious = patHisPrevious;
+	}
+	public String getPatHisAllergic() {
+		return patHisAllergic;
+	}
+	public void setPatHisAllergic(String patHisAllergic) {
+		this.patHisAllergic = patHisAllergic;
+	}
+	public String getPatHisFamily() {
+		return patHisFamily;
+	}
+	public void setPatHisFamily(String patHisFamily) {
+		this.patHisFamily = patHisFamily;
+	}
+	public String getPatRecordDate() {
+		return patRecordDate;
+	}
+	public void setPatRecordDate(String patRecordDate) {
+		this.patRecordDate = patRecordDate;
+	}
+	public String getPatMemGrade() {
+		return patMemGrade;
+	}
+	public void setPatMemGrade(String patMemGrade) {
+		this.patMemGrade = patMemGrade;
+	}
+	public String getPatCardNum() {
+		return patCardNum;
+	}
+	public void setPatCardNum(String patCardNum) {
+		this.patCardNum = patCardNum;
+	}
+	public String getFeeId() {
+		return feeId;
+	}
+	public void setFeeId(String feeId) {
+		this.feeId = feeId;
+	}
+	
+}

tran-service/src/main/java/com/diagbot/yujian/model/patientInfo/response/PatientInfoResponseBody.java

@@ -0,0 +1,93 @@
+package com.diagbot.yujian.model.patientInfo.response;
+
+import com.lantone.core.Constants;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "ROOT")
+public class PatientInfoResponseBody<T> implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	@XmlElement(name = "status")
+	private String status; // 状态
+	@XmlElement(name = "startTime")
+	private long startTime = Constants.INVALIDATE_VALUE; // 起始时间
+	@XmlElement(name = "endTime")
+	private long endTime = Constants.INVALIDATE_VALUE; // 结束时间
+	@XmlElement(name = "version")
+	private String version = "1.0";
+	@XmlElement(name = "msg")
+	private String msg = Constants.MSG_SUCCESS; // 消息
+
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public long getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(long startTime) {
+		this.startTime = startTime;
+	}
+	public long getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(long endTime) {
+		this.endTime = endTime;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	
+	public HISPatient getData() {
+		return data;
+	}
+	public void setData(HISPatient data) {
+		this.data = data;
+	}
+	public int getRet() {
+		return ret;
+	}
+	public void setRet(int ret) {
+		this.ret = ret;
+	}
+	public String getToken() {
+		return token;
+	}
+	public void setToken(String token) {
+		this.token = token;
+	}
+	public long getTimeConsum() {
+		return timeConsum;
+	}
+	public void setTimeConsum(long timeConsum) {
+		this.timeConsum = timeConsum;
+	}
+	
+	private HISPatient data = null;
+	@XmlElement(name = "ret")
+	private int ret = Constants.RET_SUCCESS;
+	@XmlElement(name = "token")
+
+	private String token;
+	// 耗时
+	@XmlElement(name = "timeConsum")
+	private long timeConsum;
+
+}

tran-service/src/main/java/com/diagbot/yujian/model/patientInfo/response/PatientResponseBody.java

@@ -0,0 +1,95 @@
+package com.diagbot.yujian.model.patientInfo.response;
+
+import com.lantone.core.Constants;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "root")
+public class PatientResponseBody<T> implements java.io.Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@XmlElement(name = "status")
+	private String status; // 状态
+	@XmlElement(name = "startTime")
+	private long startTime = Constants.INVALIDATE_VALUE; // 起始时间
+	@XmlElement(name = "endTime")
+	private long endTime = Constants.INVALIDATE_VALUE; // 结束时间
+	@XmlElement(name = "version")
+	private String version = "1.0";
+	@XmlElement(name = "msg")
+	private String msg = Constants.MSG_SUCCESS; // 消息
+
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public long getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(long startTime) {
+		this.startTime = startTime;
+	}
+	public long getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(long endTime) {
+		this.endTime = endTime;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	public HISPatient  getData() {
+		return data;
+	}
+	public void setData(HISPatient data) {
+		this.data = data;
+	}
+	public int getRet() {
+		return ret;
+	}
+	public void setRet(int ret) {
+		this.ret = ret;
+	}
+	public String getToken() {
+		return token;
+	}
+	public void setToken(String token) {
+		this.token = token;
+	}
+	public long getTimeConsum() {
+		return timeConsum;
+	}
+	public void setTimeConsum(long timeConsum) {
+		this.timeConsum = timeConsum;
+	}
+	
+	private HISPatient data = null;
+	@XmlElement(name = "ret")
+	private int ret = Constants.RET_SUCCESS;
+	@XmlElement(name = "token")
+
+	private String token;
+	// 耗时
+	@XmlElement(name = "timeConsum")
+	private long timeConsum;
+
+}

tran-service/src/main/java/com/diagbot/yujian/service/YJInquiryService.java

@@ -0,0 +1,214 @@
+package com.diagbot.yujian.service;
+
+import com.alibaba.dubbo.common.utils.CollectionUtils;
+import com.lantone.core.utils.JaxbUtil;
+import com.lantone.core.utils.http.HttpApi;
+import com.lantone.icss.api.at.model.InquiryResult;
+import com.lantone.icss.api.at.model.wrapper.InquiryDetailWrapper;
+import com.lantone.icss.api.at.model.wrapper.InquiryInfoWrapper;
+import com.lantone.icss.api.at.model.wrapper.InterfaceInfoWrapper;
+import com.lantone.icss.trans.common.listen.InitConfig;
+import com.lantone.icss.trans.yujian.model.InterfaceResponse;
+import com.lantone.icss.trans.yujian.model.ReqBody;
+import com.lantone.icss.trans.yujian.model.ReqHead;
+import com.lantone.icss.trans.yujian.model.inquiryInfo.request.InquiryInfoRequest;
+import com.lantone.icss.trans.yujian.model.inquiryInfo.response.InquiryResponseBody;
+import com.lantone.icss.trans.yujian.webservicetest.WebServicesPortTypeProxy;
+import net.sf.json.JSONArray;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.rmi.RemoteException;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Description:诊疗信息
+ * @author:ztg
+ * @time:2017年5月9日 下午3:00:36
+ */
+@Service
+public class YJInquiryService {
+    private static Logger logger = LoggerFactory.getLogger(YJInquiryService.class);
+
+    /***
+     * Title: Description: 调取病人信息 Company:杭州朗通信息技术有限公司
+     *
+     * @author 吴文俊
+     * @throws ParseException
+     * @date 2016年5月30日
+     */
+    public InquiryResult saveInquiryInfo(InquiryInfoWrapper info) throws RemoteException, ParseException {
+        ReqHead head = new ReqHead();
+        head.setTranKey("ICSS_POST_DIS_EMR_LIS_PACS");
+        head.setTranType("ICSS_POST_DIS_EMR_LIS_PACS");
+        head.setStffNo(info.getDoctorNo());
+        head.setHospitalId(info.getHospitalCode());
+        head.setDepartId(info.getDeptCode());
+
+        InquiryInfoRequest request = new InquiryInfoRequest();
+        //数据格式转换
+        dataFormat(info, request);
+
+        ReqBody<InquiryInfoRequest> body = new ReqBody<InquiryInfoRequest>();
+        body.setHead(head);
+        body.setBody(request);
+
+        String reqXml = JaxbUtil.convertToXml(body);
+        logger.info("请求Xml : " + reqXml);
+        WebServicesPortTypeProxy proxy = new WebServicesPortTypeProxy(InitConfig.get("yujian.webservice.url"));
+        String resXml = proxy.ICSS_POST_DIS_EMR_LIS_PACS(reqXml);
+        logger.info("返回 Xml : " + resXml);
+        
+        try {
+			//接口调用信息记录
+			HttpApi<InterfaceResponse> api = new HttpApi<InterfaceResponse>();
+			InterfaceInfoWrapper interfaces = new InterfaceInfoWrapper();
+			interfaces.setHospitalId(info.getHospitalCode());
+			interfaces.setDoctorNo(info.getDoctorNo());
+			interfaces.setName("寓健保存接口");
+			interfaces.setParamIn(reqXml);
+			interfaces.setParamOut(resXml);
+			interfaces.setTransTime(new Date().toString());
+			api.doPost(InitConfig.get("save.interfaces.record.url"), interfaces, InterfaceResponse.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+        
+        /**
+         * 添加webservice访问寓健接口
+         */
+        InquiryResponseBody resBody = (InquiryResponseBody) JaxbUtil.converyToJavaBean(resXml, InquiryResponseBody.class);
+        String recordId = resBody.getData().getRecordId();
+        InquiryResult result = new InquiryResult();
+        result.setSCJLID(Long.parseLong(recordId));
+        //返回信息
+        return result;
+    }
+
+
+    //数据格式转换
+    private void dataFormat(InquiryInfoWrapper info, InquiryInfoRequest req) {
+        //1、病人流水号
+        req.setPatientId(info.getHisPatientId());
+        //寓健需求参数
+        if (info.getFeeType() != null) {
+            req.setFeetype(info.getFeeType());
+        }
+        if (info.getHisCode() != null) {
+            req.setBrjzId(info.getHisCode());
+        }
+        if (info.getClinicNo() != null) {
+            req.setClinicno(info.getClinicNo());
+        }
+        if (info.getClinicTypeId() != null) {
+            req.setClinictypeid(info.getClinicTypeId());
+        }
+        if (info.getUserId() != null) {
+            req.setUserid(info.getUserId());
+        }
+
+        //req.setHisCode(info.getHisCode());
+        //req.setHospitalId(info.getHospitalCode());
+        StringBuffer sb = new StringBuffer();
+        JSONArray detail = JSONArray.fromObject(info.getDetailStr());
+        List<InquiryDetailWrapper> details = (List<InquiryDetailWrapper>) JSONArray.toCollection(detail, InquiryDetailWrapper.class);
+
+        //主诉
+        if (CollectionUtils.isNotEmpty(details)) {
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 0) {
+                    sb.append(bean.getItemDescribe());
+                }
+            }
+            req.setChiefComplaint(sb.toString());
+        }
+        //现病史
+        if (CollectionUtils.isNotEmpty(details)) {
+            sb.setLength(0);
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 1) {
+                    if (!bean.getItemDescribe().equals("诊疗过程")) {
+                        sb.append(bean.getItemDescribe());
+                    }
+                }
+            }
+            req.setPresentHistory(sb.toString());
+        }
+        //既往史
+        if (CollectionUtils.isNotEmpty(details)) {
+            sb.setLength(0);
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 2) {
+                    sb.append(bean.getItemDescribe());
+                }
+            }
+            req.setPastHistory(sb.toString());
+        }
+        //其他史
+        if (CollectionUtils.isNotEmpty(details)) {
+            sb.setLength(0);
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 3) {
+                    sb.append(bean.getItemDescribe());
+                }
+            }
+            req.setOtherHistory(sb.toString());
+        }
+        //体征
+        if (CollectionUtils.isNotEmpty(details)) {
+            sb.setLength(0);
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 4) {
+                    sb.append(bean.getItemDescribe());
+                }
+            }
+            req.setSigns(sb.toString());
+        }
+        //化验
+        if (CollectionUtils.isNotEmpty(details)) {
+            sb.setLength(0);
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 5) {
+                    sb.append(bean.getItemDescribe() + ";");
+                }
+            }
+            req.setAssay(sb.toString());
+        }
+        //器查
+        if (CollectionUtils.isNotEmpty(details)) {
+            sb.setLength(0);
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 6) {
+                    sb.append(bean.getItemDescribe().replace(";", " ") + ";");
+                }
+            }
+            req.setSiteAdvisor(sb.toString());
+        }
+        //诊断
+        if (CollectionUtils.isNotEmpty(details)) {
+            sb.setLength(0);
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 7) {
+                	if(bean.getIcd()!=null){
+                		sb.append(bean.getItemDescribe() + "[" + bean.getIcd() + "]" + ";");
+                	}
+                }
+            }
+            req.setDiagnosis(sb.toString());
+        }
+        //治疗
+        if (CollectionUtils.isNotEmpty(details)) {
+            sb.setLength(0);
+            for (InquiryDetailWrapper bean : details) {
+                if (bean.getType() == 8) {
+                    sb.append(bean.getItemDescribe() + ";");
+                }
+            }
+            req.setTreatment(sb.toString());
+        }
+    }
+}

tran-service/src/main/java/com/diagbot/yujian/service/YJPatientInfoService.java

@@ -0,0 +1,112 @@
+package com.diagbot.yujian.service;
+
+import com.lantone.core.utils.JaxbUtil;
+import com.lantone.core.utils.http.HttpApi;
+import com.lantone.icss.api.at.model.PatientInfo;
+import com.lantone.icss.api.at.model.wrapper.InterfaceInfoWrapper;
+import com.lantone.icss.api.at.model.wrapper.PatientInfoWrapper;
+import com.lantone.icss.trans.common.listen.InitConfig;
+import com.lantone.icss.trans.yujian.model.InterfaceResponse;
+import com.lantone.icss.trans.yujian.model.ReqBody;
+import com.lantone.icss.trans.yujian.model.ReqHead;
+import com.lantone.icss.trans.yujian.model.patientInfo.request.PatientInfoRequest;
+import com.lantone.icss.trans.yujian.model.patientInfo.response.HISPatient;
+import com.lantone.icss.trans.yujian.model.patientInfo.response.PatientInfoResponseBody;
+import com.lantone.icss.trans.yujian.webservicetest.WebServicesPortTypeProxy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.rmi.RemoteException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Service
+public class YJPatientInfoService {
+	private static Logger logger = LoggerFactory.getLogger(YJPatientInfoService.class);
+
+	public PatientInfo remotePatientInfo(PatientInfoWrapper patient) throws RemoteException, ParseException {
+		//请求交易头head
+		ReqHead head = new ReqHead();
+		head.setTranType("ICSS_GET_PATIENT");
+		head.setTranKey("ICSS_GET_PATIENT");
+		head.setStffNo("");
+		head.setHospitalId("");
+		head.setDepartId("");
+		//body
+		PatientInfoRequest request = new PatientInfoRequest();
+		request.setPatientId(patient.getHisCode());
+		//将head、body组成一个请求
+		ReqBody<PatientInfoRequest> body = new ReqBody<PatientInfoRequest>();
+		body.setHead(head);
+		body.setBody(request);
+
+		String reqXml = JaxbUtil.convertToXml(body);
+		logger.info("请求Xml : " + reqXml);
+		WebServicesPortTypeProxy proxy = new WebServicesPortTypeProxy(InitConfig.get("yujian.webservice.url"));
+		String resXml=proxy.ICSS_GET_PATIENT(reqXml);
+		logger.info("返回 Xml : " + resXml);
+		
+		try {
+			//接口调用信息记录
+			HttpApi<InterfaceResponse> api = new HttpApi<InterfaceResponse>();
+			InterfaceInfoWrapper interfaces = new InterfaceInfoWrapper();
+			interfaces.setHospitalId(patient.getHospitalCode());
+			interfaces.setDoctorNo(patient.getDoctorCode());
+			interfaces.setName("创业保存接口");
+			interfaces.setParamIn(reqXml);
+			interfaces.setParamOut(resXml);
+			interfaces.setTransTime(new Date().toString());
+			api.doPost(InitConfig.get("save.interfaces.record.url"), interfaces, InterfaceResponse.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		//将返回的xml格式的数据拆包
+		PatientInfoResponseBody resBody = (PatientInfoResponseBody) JaxbUtil.converyToJavaBean(resXml,
+				PatientInfoResponseBody.class);
+		
+		PatientInfo patientInfo = new PatientInfo();
+		if(resBody!=null){
+			if(resBody.getRet()==0){
+				HISPatient hISPatien = resBody.getData();
+				patientInfo.setId(Long.parseLong(patient.getHisCode()));
+				patientInfo.setName(hISPatien.getPatName());
+				patientInfo.setSex(hISPatien.getPatSex());
+				if (hISPatien.getPatBirthday() != null) {
+					SimpleDateFormat sdf=new SimpleDateFormat("yyyy-mm-dd");//小写的mm表示的是分钟  
+					patientInfo.setBirthday(sdf.parse(hISPatien.getPatBirthday()));
+				}
+				patientInfo.setHisCode(patient.getHisCode());
+				if((hISPatien.getNatureId()).equals("3")){
+					patientInfo.setNatureId("2");
+				}else{
+					patientInfo.setNatureId(hISPatien.getNatureId());
+				}
+				patientInfo.setIdNo(hISPatien.getPatIdentityNum());
+				patientInfo.setAddress(hISPatien.getPatFamAddress());
+				patientInfo.setPostcode(hISPatien.getPatPostcode());
+				patientInfo.setContactPhone(hISPatien.getPatContactPhone());
+				patientInfo.setContacts(hISPatien.getPatContacts());
+				patientInfo.setPhone(hISPatien.getPatPhone());
+				patientInfo.setWorkUnit(hISPatien.getPatWorkUnit());
+				patientInfo.setOperation(hISPatien.getPatOperation());
+				patientInfo.setCountry(hISPatien.getPatCountry());
+				patientInfo.setNationality(hISPatien.getPatNationality());
+				patientInfo.setMatrimony(hISPatien.getPatMatrimony());
+				patientInfo.setHisPrevious(hISPatien.getPatHisPrevious());
+				patientInfo.setHisAllergic(hISPatien.getPatHisAllergic());
+				patientInfo.setHisFamily(hISPatien.getPatHisFamily());
+				patientInfo.setRecordDate(hISPatien.getPatRecordDate());
+				patientInfo.setMemGrade(hISPatien.getPatMemGrade());
+				patientInfo.setCardNum(hISPatien.getPatCardNum());
+				patientInfo.setFeeId(hISPatien.getFeeId());
+	
+				return patientInfo;
+			}
+			return null;
+		}
+		return null;
+	}
+}

tran-service/src/main/java/com/diagbot/yujian/util/YJConstant.java

@@ -0,0 +1,21 @@
+package com.diagbot.yujian.util;
+
+public class YJConstant {
+	public static String sourceType = "8081";//信息来源类型
+	public static String sourceIp = "192.168.3.157";//机器IP
+	public static String sourceMac="";//机器硬件编码
+	public static String sourceName="";//机器名称
+	
+	/* 证件类型*/
+	
+	public static String idType1="1";//身份证
+	/* 疾病确诊类型*/
+	public static String diagnosisType="2";//疑似
+	
+	public static String LIS_TYPE = "5"; //化验
+	public static String PACS_TYPE = "6"; //器查
+	public static String DRUG_XY_TYPE = "1"; //西药
+	public static String DRUG_ZCY_TYPE = "2"; //中成药
+	public static String DRUG_CY_TYPE = "4"; //草药
+	
+}

tran-service/src/main/java/com/diagbot/yujian/webservicetest/WebServices.java

@@ -0,0 +1,16 @@
+/**
+ * WebServices.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.diagbot.yujian.webservicetest;
+
+public interface WebServices extends javax.xml.rpc.Service {
+    public String getWebServicesHttpPortAddress();
+
+    public WebServicesPortType getWebServicesHttpPort() throws javax.xml.rpc.ServiceException;
+
+    public WebServicesPortType getWebServicesHttpPort(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
+}

tran-service/src/main/java/com/diagbot/yujian/webservicetest/WebServicesHttpBindingStub.java

@@ -0,0 +1,171 @@
+/**
+ * WebServicesHttpBindingStub.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.diagbot.yujian.webservicetest;
+
+public class WebServicesHttpBindingStub extends org.apache.axis.client.Stub implements WebServicesPortType {
+    private java.util.Vector cachedSerClasses = new java.util.Vector();
+    private java.util.Vector cachedSerQNames = new java.util.Vector();
+    private java.util.Vector cachedSerFactories = new java.util.Vector();
+    private java.util.Vector cachedDeserFactories = new java.util.Vector();
+
+    static org.apache.axis.description.OperationDesc [] _operations;
+
+    static {
+        _operations = new org.apache.axis.description.OperationDesc[2];
+        _initOperationDesc1();
+    }
+
+    private static void _initOperationDesc1(){
+        org.apache.axis.description.OperationDesc oper;
+        org.apache.axis.description.ParameterDesc param;
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("ICSS_GET_PATIENT");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://webservice", "in0"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        param.setNillable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://webservice", "out"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[0] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("ICSS_POST_DIS_EMR_LIS_PACS");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://webservice", "in0"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        param.setNillable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://webservice", "out"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[1] = oper;
+
+    }
+
+    public WebServicesHttpBindingStub() throws org.apache.axis.AxisFault {
+         this(null);
+    }
+
+    public WebServicesHttpBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+         this(service);
+         super.cachedEndpoint = endpointURL;
+    }
+
+    public WebServicesHttpBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+        if (service == null) {
+            super.service = new org.apache.axis.client.Service();
+        } else {
+            super.service = service;
+        }
+        ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
+    }
+
+    protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
+        try {
+            org.apache.axis.client.Call _call = super._createCall();
+            if (super.maintainSessionSet) {
+                _call.setMaintainSession(super.maintainSession);
+            }
+            if (super.cachedUsername != null) {
+                _call.setUsername(super.cachedUsername);
+            }
+            if (super.cachedPassword != null) {
+                _call.setPassword(super.cachedPassword);
+            }
+            if (super.cachedEndpoint != null) {
+                _call.setTargetEndpointAddress(super.cachedEndpoint);
+            }
+            if (super.cachedTimeout != null) {
+                _call.setTimeout(super.cachedTimeout);
+            }
+            if (super.cachedPortName != null) {
+                _call.setPortName(super.cachedPortName);
+            }
+            java.util.Enumeration keys = super.cachedProperties.keys();
+            while (keys.hasMoreElements()) {
+                String key = (String) keys.nextElement();
+                _call.setProperty(key, super.cachedProperties.get(key));
+            }
+            return _call;
+        }
+        catch (Throwable _t) {
+            throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
+        }
+    }
+
+    public String ICSS_GET_PATIENT(String in0) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[0]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice", "ICSS_GET_PATIENT"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {in0});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (String) _resp;
+            } catch (Exception _exception) {
+                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public String ICSS_POST_DIS_EMR_LIS_PACS(String in0) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[1]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice", "ICSS_POST_DIS_EMR_LIS_PACS"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {in0});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (String) _resp;
+            } catch (Exception _exception) {
+                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+}

tran-service/src/main/java/com/diagbot/yujian/webservicetest/WebServicesLocator.java

@@ -0,0 +1,142 @@
+/**
+ * WebServicesLocator.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.diagbot.yujian.webservicetest;
+
+public class WebServicesLocator extends org.apache.axis.client.Service implements WebServices {
+
+    public WebServicesLocator() {
+    }
+
+
+    public WebServicesLocator(org.apache.axis.EngineConfiguration config) {
+        super(config);
+    }
+
+    public WebServicesLocator(String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException {
+        super(wsdlLoc, sName);
+    }
+
+    // Use to get a proxy class for WebServicesHttpPort
+    private String WebServicesHttpPort_address = "http://hk1.mofasuidao.cn:56653/APP_Webservicesfuzl/service/WebServices";
+
+    public String getWebServicesHttpPortAddress() {
+        return WebServicesHttpPort_address;
+    }
+
+    // The WSDD service name defaults to the port name.
+    private String WebServicesHttpPortWSDDServiceName = "WebServicesHttpPort";
+
+    public String getWebServicesHttpPortWSDDServiceName() {
+        return WebServicesHttpPortWSDDServiceName;
+    }
+
+    public void setWebServicesHttpPortWSDDServiceName(String name) {
+        WebServicesHttpPortWSDDServiceName = name;
+    }
+
+    public WebServicesPortType getWebServicesHttpPort() throws javax.xml.rpc.ServiceException {
+       java.net.URL endpoint;
+        try {
+            endpoint = new java.net.URL(WebServicesHttpPort_address);
+        }
+        catch (java.net.MalformedURLException e) {
+            throw new javax.xml.rpc.ServiceException(e);
+        }
+        return getWebServicesHttpPort(endpoint);
+    }
+
+    public WebServicesPortType getWebServicesHttpPort(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
+        try {
+            WebServicesHttpBindingStub _stub = new WebServicesHttpBindingStub(portAddress, this);
+            _stub.setPortName(getWebServicesHttpPortWSDDServiceName());
+            return _stub;
+        }
+        catch (org.apache.axis.AxisFault e) {
+            return null;
+        }
+    }
+
+    public void setWebServicesHttpPortEndpointAddress(String address) {
+        WebServicesHttpPort_address = address;
+    }
+
+    /**
+     * For the given interface, get the stub implementation.
+     * If this service has no port for the given interface,
+     * then ServiceException is thrown.
+     */
+    public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
+        try {
+            if (WebServicesPortType.class.isAssignableFrom(serviceEndpointInterface)) {
+                WebServicesHttpBindingStub _stub = new WebServicesHttpBindingStub(new java.net.URL(WebServicesHttpPort_address), this);
+                _stub.setPortName(getWebServicesHttpPortWSDDServiceName());
+                return _stub;
+            }
+        }
+        catch (Throwable t) {
+            throw new javax.xml.rpc.ServiceException(t);
+        }
+        throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface:  " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
+    }
+
+    /**
+     * For the given interface, get the stub implementation.
+     * If this service has no port for the given interface,
+     * then ServiceException is thrown.
+     */
+    public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
+        if (portName == null) {
+            return getPort(serviceEndpointInterface);
+        }
+        String inputPortName = portName.getLocalPart();
+        if ("WebServicesHttpPort".equals(inputPortName)) {
+            return getWebServicesHttpPort();
+        }
+        else  {
+            java.rmi.Remote _stub = getPort(serviceEndpointInterface);
+            ((org.apache.axis.client.Stub) _stub).setPortName(portName);
+            return _stub;
+        }
+    }
+
+    public javax.xml.namespace.QName getServiceName() {
+        return new javax.xml.namespace.QName("http://webservice", "WebServices");
+    }
+
+    private java.util.HashSet ports = null;
+
+    public java.util.Iterator getPorts() {
+        if (ports == null) {
+            ports = new java.util.HashSet();
+            ports.add(new javax.xml.namespace.QName("http://webservice", "WebServicesHttpPort"));
+        }
+        return ports.iterator();
+    }
+
+    /**
+    * Set the endpoint address for the specified port name.
+    */
+    public void setEndpointAddress(String portName, String address) throws javax.xml.rpc.ServiceException {
+
+if ("WebServicesHttpPort".equals(portName)) {
+            setWebServicesHttpPortEndpointAddress(address);
+        }
+        else
+{ // Unknown Port Name
+            throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
+        }
+    }
+
+    /**
+    * Set the endpoint address for the specified port name.
+    */
+    public void setEndpointAddress(javax.xml.namespace.QName portName, String address) throws javax.xml.rpc.ServiceException {
+        setEndpointAddress(portName.getLocalPart(), address);
+    }
+
+}

tran-service/src/main/java/com/diagbot/yujian/webservicetest/WebServicesPortType.java

@@ -0,0 +1,13 @@
+/**
+ * WebServicesPortType.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.diagbot.yujian.webservicetest;
+
+public interface WebServicesPortType extends java.rmi.Remote {
+    public String ICSS_GET_PATIENT(String in0) throws java.rmi.RemoteException;
+    public String ICSS_POST_DIS_EMR_LIS_PACS(String in0) throws java.rmi.RemoteException;
+}

tran-service/src/main/java/com/diagbot/yujian/webservicetest/WebServicesPortTypeProxy.java

@@ -0,0 +1,60 @@
+package com.diagbot.yujian.webservicetest;
+
+public class WebServicesPortTypeProxy implements WebServicesPortType {
+  private String _endpoint = null;
+  private WebServicesPortType webServicesPortType = null;
+  
+  public WebServicesPortTypeProxy() {
+    _initWebServicesPortTypeProxy();
+  }
+  
+  public WebServicesPortTypeProxy(String endpoint) {
+    _endpoint = endpoint;
+    _initWebServicesPortTypeProxy();
+  }
+  
+  private void _initWebServicesPortTypeProxy() {
+    try {
+      webServicesPortType = (new WebServicesLocator()).getWebServicesHttpPort();
+      if (webServicesPortType != null) {
+        if (_endpoint != null)
+          ((javax.xml.rpc.Stub)webServicesPortType)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
+        else
+          _endpoint = (String)((javax.xml.rpc.Stub)webServicesPortType)._getProperty("javax.xml.rpc.service.endpoint.address");
+      }
+      
+    }
+    catch (javax.xml.rpc.ServiceException serviceException) {}
+  }
+  
+  public String getEndpoint() {
+    return _endpoint;
+  }
+  
+  public void setEndpoint(String endpoint) {
+    _endpoint = endpoint;
+    if (webServicesPortType != null)
+      ((javax.xml.rpc.Stub)webServicesPortType)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
+    
+  }
+  
+  public WebServicesPortType getWebServicesPortType() {
+    if (webServicesPortType == null)
+      _initWebServicesPortTypeProxy();
+    return webServicesPortType;
+  }
+  
+  public String ICSS_GET_PATIENT(String in0) throws java.rmi.RemoteException{
+    if (webServicesPortType == null)
+      _initWebServicesPortTypeProxy();
+    return webServicesPortType.ICSS_GET_PATIENT(in0);
+  }
+
+  public String ICSS_POST_DIS_EMR_LIS_PACS(String in0) throws java.rmi.RemoteException{
+    if (webServicesPortType == null)
+      _initWebServicesPortTypeProxy();
+    return webServicesPortType.ICSS_POST_DIS_EMR_LIS_PACS(in0);
+  }
+  
+  
+}