寓健代码修改

tran-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -8,13 +8,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.yujian.model.ReqBody;
-import com.diagbot.yujian.model.ReqHead;
-import com.diagbot.yujian.model.patientInfo.request.PatientInfoRequest;
-import com.diagbot.yujian.model.patientInfo.response.HISPatient;
-import com.diagbot.yujian.model.patientInfo.response.PatientInfoResponseBody;
+import com.diagbot.yujian.entity.wrapper.InterfaceInfoWrapper;
+import com.diagbot.yujian.request.PatientInfoRequest;
+import com.diagbot.yujian.response.HISPatient;
+import com.diagbot.yujian.response.InterfaceResponse;
+import com.diagbot.yujian.response.PatientInfoResponseBody;
+import com.diagbot.yujian.util.HttpApi;
 import com.diagbot.yujian.util.JaxbUtil;
-import com.diagbot.yujian.webservicetest.WebServicesPortTypeProxy;
+import com.diagbot.yujian.util.ReqBody;
+import com.diagbot.yujian.util.ReqHead;
+import com.diagbot.yujian.webservice.WebServicesPortTypeProxy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 import com.diagbot.dto.GetTopPatientInfoDTO;
@@ -104,7 +107,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      * @param patientInfoVO 病人各项信息
      * @return 病人信息
      */
-    public PatientInfoDTO getHisPatientInfo(@RequestBody PatientInfoVO patientInfoVO) throws ParseException, RemoteException {
+    public PatientInfoDTO getHisPatientInfo(@RequestBody PatientInfoVO patientInfoVO) throws Exception {
 
         //请求交易头head
         ReqHead head = new ReqHead();
@@ -127,22 +130,20 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
         String resXml=proxy.ICSS_GET_PATIENT(reqXml);
         System.out.println("返回 Xml : " + resXml);
 
-		/*try {
-			//接口调用信息记录
-			HttpApi<InterfaceResponse> api = new HttpApi<InterfaceResponse>();
-			InterfaceInfoWrapper interfaces = new InterfaceInfoWrapper();
-			interfaces.setHospitalId(patientInfoVO.getHospitalCode());
-			interfaces.setDoctorNo(patientInfoVO.getDoctorCode());
-			interfaces.setDeptId(patientInfoVO.getDeptNo());
-			interfaces.setName("寓健患者信息获取接口");
-			interfaces.setParamIn(reqXml);
-			interfaces.setParamOut(resXml);
-			interfaces.setTransTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-			interfaces.setRemark("江干寓健");
-			api.doPost("http://localhost:8082/note-web/interfaces/record", interfaces, InterfaceResponse.class);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}*/
+
+        //接口调用信息记录
+        HttpApi<InterfaceResponse> api = new HttpApi<InterfaceResponse>();
+        InterfaceInfoWrapper interfaces = new InterfaceInfoWrapper();
+        interfaces.setHospitalId(patientInfoVO.getHospitalCode());
+        interfaces.setDoctorNo(patientInfoVO.getDoctorCode());
+        interfaces.setDeptId(patientInfoVO.getHospitalDeptCode());
+        interfaces.setName("寓健患者信息获取接口");
+        interfaces.setParamIn(reqXml);
+        interfaces.setParamOut(resXml);
+        interfaces.setTransTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        interfaces.setRemark("江干寓健");
+        api.doPost("http://localhost:8082/note-web/interfaces/record", interfaces, InterfaceResponse.class);
+
 
         //将返回的xml格式的数据拆包
         PatientInfoResponseBody resBody = JaxbUtil.converyToJavaBean(resXml, PatientInfoResponseBody.class);

tran-service/src/main/java/com/diagbot/vo/PatientInfoVO.java

@@ -17,4 +17,49 @@ public class PatientInfoVO {
     private String patientCode;
     @NotNull(message = "请输入医院编码")
     private String hospitalCode;
+
+    private Long id;//主键
+
+    private String code;//医院患者编号
+
+    private String name;//患者姓名
+
+    private Integer sex;//性别
+
+    private String birthday;//出生日期
+
+    private String idType;//证件类型
+
+    private String idNo;//证件号码
+
+    private String address;//家庭住址
+
+    private String phone;//联系电话
+
+    private String identityNum;//身份证号
+
+    private String postcode;//家庭邮编
+
+    private String contacts;//联系人
+
+    private String contactPhone;//联系人电话
+
+    private String workUnit;//就职单位名称
+
+    private String operation;//职业
+
+    private String country;//国籍
+
+    private String nationality;//民族
+
+    private Integer matrimony;//婚姻状况：0未婚，1已婚，2未知
+
+    private String remark;
+
+    private String type;
+
+    private String doctorCode;
+
+    private String hospitalDeptCode;
+
 }

tran-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -1,34 +1,31 @@
 package com.diagbot.web;
 
-import javax.validation.Valid;
-
-import com.diagbot.dto.HisInquirysForDjDTO;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.HospitalInfoFacade;
+import com.diagbot.facade.InquiryInfoFacade;
 import com.diagbot.facade.TranDiseaseIcdFacade;
-import com.diagbot.vo.*;
-import com.diagbot.yujian.model.InterfaceResponse;
-import com.diagbot.yujian.model.ReqBody;
-import com.diagbot.yujian.model.ReqHead;
-import com.diagbot.yujian.model.inquiryInfo.request.InquiryInfoRequest;
-import com.diagbot.yujian.model.inquiryInfo.response.InquiryResponseBody;
+import com.diagbot.vo.GetDiseaseIcdVO;
+import com.diagbot.vo.HospitalInfoVO;
+import com.diagbot.vo.SaveInquiryToHisVO;
+import com.diagbot.yujian.entity.wrapper.InterfaceInfoWrapper;
+import com.diagbot.yujian.request.InquiryInfoRequest;
+import com.diagbot.yujian.response.InquiryResponseBody;
+import com.diagbot.yujian.response.InterfaceResponse;
+import com.diagbot.yujian.util.HttpApi;
 import com.diagbot.yujian.util.JaxbUtil;
-import com.diagbot.yujian.webservicetest.WebServicesPortTypeProxy;
+import com.diagbot.yujian.util.ReqBody;
+import com.diagbot.yujian.util.ReqHead;
+import com.diagbot.yujian.webservice.WebServicesPortTypeProxy;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.InquiryInfoFacade;
-
-import io.swagger.annotations.Api;
-
-import java.rmi.RemoteException;
+import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 /**
  * <p>
@@ -52,7 +49,7 @@ public class InquiryInfoController {
 	private TranDiseaseIcdFacade diseaseIcdFacade;
 	 @PostMapping("/saveInquiryToHis")
 	 @SysLogger("saveInquiryToHis")
-	 public RespDTO<Boolean> saveInquiryToHis(@Valid @RequestBody SaveInquiryToHisVO saveInquiryToHisVO) throws RemoteException {
+	 public RespDTO<Boolean> saveInquiryToHis(@Valid @RequestBody SaveInquiryToHisVO saveInquiryToHisVO) throws Exception {
 		 ReqHead head = new ReqHead();
 		 head.setTranKey("ICSS_POST_DIS_EMR_LIS_PACS");
 		 head.setTranType("ICSS_POST_DIS_EMR_LIS_PACS");
@@ -74,22 +71,20 @@ public class InquiryInfoController {
 		 String resXml = proxy.ICSS_POST_DIS_EMR_LIS_PACS(reqXml);
 		 System.out.println("返回 Xml : " + resXml);
 
-		 /*try {
-			 //接口调用信息记录
-			 HttpApi<InterfaceResponse> api = new HttpApi<InterfaceResponse>();
-			 InterfaceInfoWrapper interfaces = new InterfaceInfoWrapper();
-			 interfaces.setHospitalId(saveInquiryToHisVO.getHospitalId().toString());
-			 interfaces.setDoctorNo(saveInquiryToHisVO.getDoctorId().toString());
-			 interfaces.setDeptId(saveInquiryToHisVO.getHospitalDeptId().toString());
-			 interfaces.setName("创业保存接口");
-			 interfaces.setParamIn(reqXml);
-			 interfaces.setParamOut(resXml);
-			 interfaces.setTransTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-			 interfaces.setRemark("江干区中医院创业");
-			 api.doPost("http://127.0.0.1:8082/note-web/interfaces/record", interfaces, InterfaceResponse.class);
-		 } catch (Exception e) {
-			 e.printStackTrace();
-		 }*/
+
+		 //接口调用信息记录
+		 HttpApi<InterfaceResponse> api = new HttpApi<InterfaceResponse>();
+		 InterfaceInfoWrapper interfaces = new InterfaceInfoWrapper();
+		 interfaces.setHospitalId(saveInquiryToHisVO.getHospitalId().toString());
+		 interfaces.setDoctorNo(saveInquiryToHisVO.getDoctorId().toString());
+		 interfaces.setDeptId(saveInquiryToHisVO.getHospitalDeptId().toString());
+		 interfaces.setName("寓健保存接口");
+		 interfaces.setParamIn(reqXml);
+		 interfaces.setParamOut(resXml);
+		 interfaces.setTransTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+		 interfaces.setRemark("江干区中医院创业");
+		 api.doPost("http://127.0.0.1:8082/note-web/interfaces/record", interfaces, InterfaceResponse.class);
+
 
 		 /**
 		  * 添加webservice访问寓健接口

tran-service/src/main/java/com/diagbot/yujian/entity/InterfaceInfo.java

@@ -0,0 +1,29 @@
+package com.diagbot.yujian.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@SuppressWarnings("serial")
+public class InterfaceInfo implements Serializable {
+	private Long id;
+	//机构编码
+	private String hospitalId;
+	//医生编码
+	private String doctorNo;
+	//接口名称
+    private String name;
+    //接口入参
+    private String paramIn;
+    //接口出参
+    private String paramOut;
+    //交易发生时间
+    private String transTime;
+    //科室编码或ID
+    private String deptId;
+    //备注
+    private String remark;
+}

tran-service/src/main/java/com/diagbot/yujian/entity/PatientInfo.java

@@ -0,0 +1,51 @@
+package com.diagbot.yujian.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description:患者信息
+ * @author : luwg
+ * @time : 2016年12月15日 下午6:36:26
+ * 
+ */
+@Getter
+@Setter
+public class PatientInfo implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	private Long id;             //主键
+	private String hisCode;      //HIS编码
+	private String hospitalCode; //医院编号
+	private String name;         //姓名
+	private String sex;          //性别
+	private Date birthday;       //出生日期
+	private String idType;       //证件类型
+	private String idNo;         //证件号码
+	private String address;      //家庭住址
+	private String phone;        //联系手机
+	private String status;       //状态
+	private String remark;       //备注
+
+	private String identityNum;		// 身份证号
+	private String natureId;		//病人性质
+	private String postcode; 		//邮编
+	private String contactPhone;	//联系电话
+	private String contacts;		//联系人
+	private String workUnit;		//就职单位名称
+	private String operation;		//职业
+	private String country;			//国籍
+	private String nationality;		//名族
+	private String matrimony;		//婚姻状况
+	private String hisPrevious;		//既往史
+	private String hisAllergic;		//过敏史
+	private String hisFamily;		//家族史
+	private String recordDate;		//建档日期
+	private String memGrade;		//会员级别
+	private String cardNum;			//病人证号
+	private String feeId;			//费用类别
+	private String regVisitedState;	//就诊状态（0待接诊，1接诊中，2完成接诊）
+}

tran-service/src/main/java/com/diagbot/yujian/entity/wrapper/InterfaceInfoWrapper.java

@@ -0,0 +1,7 @@
+package com.diagbot.yujian.entity.wrapper;
+
+import com.diagbot.yujian.entity.InterfaceInfo;
+
+public class InterfaceInfoWrapper extends InterfaceInfo {
+	private static final long serialVersionUID = 1L;
+}

tran-service/src/main/java/com/diagbot/yujian/entity/wrapper/PatientInfoWrapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.yujian.entity.wrapper;
+
+import com.diagbot.yujian.entity.PatientInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PatientInfoWrapper extends PatientInfo {
+
+	private static final long serialVersionUID = 1L;
+
+	private String doctorCode;   //医生HIS编码
+	private String deptNo;   //部门编码
+	private String sexStr;   //性别名称
+}

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

@@ -1,60 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,70 +0,0 @@
-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/InquiryResult.java

@@ -1,33 +0,0 @@
-package com.diagbot.yujian.model.inquiryInfo;
-
-import java.io.Serializable;
-
-/**
- * @Description:问诊记录表
- * @author:ztg
- * @time:2017年3月29日 下午1:49:26
- */
-public class InquiryResult implements Serializable{
-
-	private static final long serialVersionUID = 1L;
-	
-	private Long SCJLID;
-
-	public Long getSCJLID() {
-		return SCJLID;
-	}
-
-	public void setSCJLID(Long sCJLID) {
-		SCJLID = sCJLID;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-	
-	
-	
-	
-	
-	
-}

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

@@ -1,153 +0,0 @@
-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

@@ -1,95 +0,0 @@
-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/inquiryMsg/response/LsData.java

@@ -1,37 +0,0 @@
-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/response/HISPatient.java

@@ -1,244 +0,0 @@
-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

@@ -1,198 +0,0 @@
-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

@@ -1,93 +0,0 @@
-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

@@ -1,95 +0,0 @@
-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/request/InquiryInfoRequest.java

@@ -0,0 +1,50 @@
+package com.diagbot.yujian.request;
+
+import lombok.Getter;
+import lombok.Setter;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "BODY")
+public class InquiryInfoRequest {
+
+	@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 = "";	//治疗
+
+
+}

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

@@ -1,4 +1,4 @@
-package com.diagbot.yujian.model.patientInfo.request;
+package com.diagbot.yujian.request;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

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

@@ -0,0 +1,40 @@
+package com.diagbot.yujian.response;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+@Getter
+@Setter
+@XmlRootElement(name = "data")
+
+public class HISPatient implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String patName;
+	private String patSex;
+	private String patBirthday;
+	private String natureId;
+	private String patIdentityNum;
+	private String patFamAddress;
+	private String patPostcode;
+	private String patContactPhone;
+	private String patContacts;
+	private String patPhone;
+	private String patWorkUnit;
+	private String patOperation;
+	private String patCountry;
+	private String patNationality;
+	private String patMatrimony;
+	private String patHisPrevious;
+	private String patHisAllergic;
+	private String patHisFamily;
+	private String patRecordDate;
+	private String patMemGrade;
+	private String patCardNum;
+	private String feeId;
+
+}

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

@@ -0,0 +1,39 @@
+package com.diagbot.yujian.response;
+
+import com.diagbot.yujian.util.Constants;
+import lombok.Getter;
+import lombok.Setter;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@Getter
+@Setter
+@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;
+
+	@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

@@ -1,4 +1,4 @@
-package com.diagbot.yujian.model.inquiryInfo.response;
+package com.diagbot.yujian.response;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

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

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

tran-service/src/main/java/com/diagbot/yujian/response/PatientInfo.java

@@ -0,0 +1,42 @@
+package com.diagbot.yujian.response;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @author:CSP
+ * @time:2017年6月6日上午12:17:43
+ */
+@Getter
+@Setter
+public class PatientInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	// 医院编号
+	private String patientId;	//患者ID
+	private String patName;	//姓名
+	private String patSex;	//性别
+	private String patBirthday;	//出生年月（年龄）
+	private String natureId;	//病人性质
+	private String patIdentityNum;	//身份证号
+	private String patFamAddress;	//家庭住址
+	private String patPostcode;	//家庭邮编
+	private String patContactPhone;	//联系人电话
+	private String patContacts;	//联系人
+	private String patPhone;	//联系电话
+	private String patWorkUnit;	//就职单位名称
+	private String patOperation;	//
+	private String patCountry;	//
+	private String patNationality;	//
+	private String patMatrimony;	//
+	private String patHisPrevious;	//既往史
+	private String patHisAllergic;	//过敏史
+	private String patHisFamily;	//家族史
+	private String patRecordDate;	//建档日期
+	private String patMemGrade;	//
+	private String patCardNum;	//
+	private String feeId;	//
+
+}

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

@@ -0,0 +1,39 @@
+package com.diagbot.yujian.response;
+
+import com.diagbot.yujian.util.Constants;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@Getter
+@Setter
+@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; // 消息
+
+	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

@@ -1,214 +0,0 @@
-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

@@ -1,112 +0,0 @@
-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/Constants.java

@@ -0,0 +1,47 @@
+package com.diagbot.yujian.util;
+
+public interface Constants {
+	String OP_NAME = "op";
+	String MESSAGE = "message";
+	String ERROR = "error";
+	String BACK_URL = "BackURL";
+	String IGNORE_BACK_URL = "ignoreBackURL";
+	String CURRENT_URL = "currentURL";
+	String NO_QUERYSTRING_CURRENT_URL = "noQueryStringCurrentURL";
+	String CONTEXT_PATH = "ctx";
+	String CURRENT_APPLICATION = "c_app";
+	String CURRENT_USER = "c_user";
+	String CURRENT_USERNAME = "username";
+	String USER_MENUS = "menus";
+	long ADMIN_APPLICATION = 0L;
+	int FIRST_MENU = 1;
+	int SECOND_MENU = 2;
+	int MENU_GRADE = 3;
+	int TOP_REC = 0;
+	String ENCODING = "UTF-8";
+	int USER_STATUS_UNLOCK = 1;
+	int USER_STATUS_LOCK = 0;
+	int COMMON_INT_0 = 0;
+	int COMMON_INT_1 = 1;
+	int COMMON_INT_NEG_1 = -1;
+	long COMMON_LONG_0 = 0L;
+	long COMMON_LONG_1 = 1L;
+	long COMMON_LONG_NEG_1 = -1L;
+	String COMMON_STRING_0 = "0";
+	String COMMON_STRING_1 = "1";
+	String COMMON_STRING_NEG_1 = "-1";
+	String COMMON_STRING_99 = "99";
+	String LOGIN_URL = "/login";
+	String UPLOAD_FOLDER_NAME = "upload";
+	String TEMP_FOLDER_NAME = "temp";
+	String DEFAULT_LOCALE = "zh_CN";
+	String DEFAULT_ENCODE = "UTF-8";
+	String MSG_SUCCESS = "操作成功";
+	String MSG_FALURE = "操作失败";
+	long INVALIDATE_VALUE = -1L;
+	int RET_SUCCESS = 0;
+	int RET_FAIL = 1;
+	int RET_ERROR_PARAM = -1;
+	int RET_NO_TOKEN = -2;
+	
+}

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

@@ -0,0 +1,152 @@
+package com.diagbot.yujian.util;
+
+import com.google.common.collect.Lists;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.util.EntityUtils;
+import org.codehaus.jackson.JsonParseException;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.ConnectException;
+import java.net.URLDecoder;
+import java.util.List;
+
+@Component
+public class HttpApi<T> {
+    private static Logger log = LoggerFactory.getLogger(HttpApi.class);
+
+    public HttpApi() {
+    }
+
+    public T doPost(String httpUrl, Object obj, Class<T> type) throws ConnectException, Exception {
+        JsonMapper mapper = JsonMapper.nonEmptyMapper();
+
+        try {
+            HttpPost httppost = new HttpPost(httpUrl);
+            if (obj != null) {
+                String post = mapper.toJson(obj);
+                log.info("开始发起远程请求Param String：" + post);
+                StringEntity se = new StringEntity(post, "UTF-8");
+                se.setContentType("application/json");
+                se.setContentEncoding("utf-8");
+                httppost.setEntity(se);
+            }
+
+            CloseableHttpResponse response = HttpConnectionManager.getHttpClient().execute(httppost, HttpClientContext.create());
+            int code = response.getStatusLine().getStatusCode();
+            HttpEntity entity = response.getEntity();
+            String receive = EntityUtils.toString(entity, "UTF-8").trim();
+            log.info("服务器返回Response String：" + receive);
+            return mapper.fromJson(receive, type);
+        } catch (ConnectException var10) {
+            throw var10;
+        } catch (JsonParseException var11) {
+            throw new Exception("Json映射对象错误！----" + var11.getMessage(), var11);
+        } catch (Exception var12) {
+            throw new Exception("远程服务器调用接口失败！----" + var12.getMessage(), var12);
+        }
+    }
+
+    public T doPostReplace(String httpUrl, Object obj, Class<T> type) throws ConnectException, Exception {
+        JsonMapper mapper = JsonMapper.nonEmptyMapper();
+
+        try {
+            HttpPost httppost = new HttpPost(httpUrl);
+            if (obj != null) {
+                String post = mapper.toJson(obj);
+                log.info("开始发起远程请求Param String：" + post);
+                StringEntity se = new StringEntity(post, "UTF-8");
+                se.setContentType("application/json");
+                se.setContentEncoding("utf-8");
+                httppost.setEntity(se);
+            }
+
+            CloseableHttpResponse response = HttpConnectionManager.getHttpClient().execute(httppost, HttpClientContext.create());
+            int code = response.getStatusLine().getStatusCode();
+            HttpEntity entity = response.getEntity();
+            String receive = EntityUtils.toString(entity, "UTF-8").trim();
+            log.info("服务器返回Response String：" + receive);
+            receive = receive.replace("\\\"", "\"").replace("\"[{", "[{").replace("}]\"", "}]").replace("\"{", "{").replace("}\"", "}").replace("\"data\":\"[]\"", "\"data\":null");
+            return mapper.fromJson(receive, type);
+        } catch (ConnectException var10) {
+            throw var10;
+        } catch (JsonParseException var11) {
+            throw new Exception("Json映射对象错误！----" + var11.getMessage(), var11);
+        } catch (Exception var12) {
+            throw new Exception("远程服务器调用接口失败！----" + var12.getMessage(), var12);
+        }
+    }
+
+    public List<T> doListPost(String httpUrl, String string, Class<T> type) throws ConnectException, Exception {
+        JsonMapper mapper = JsonMapper.nonEmptyMapper();
+
+        try {
+            HttpPost httppost = new HttpPost(httpUrl);
+            StringEntity se = new StringEntity(string, "UTF-8");
+            se.setContentType("text/html");
+            se.setContentEncoding("utf-8");
+            httppost.setEntity(se);
+            CloseableHttpResponse response = HttpConnectionManager.getHttpClient().execute(httppost, HttpClientContext.create());
+            int code = response.getStatusLine().getStatusCode();
+            HttpEntity entity = response.getEntity();
+            String receive = EntityUtils.toString(entity, "UTF-8").trim();
+            log.info("服务器返回Response String：" + receive);
+            JSONArray jsonArray = new JSONArray(receive);
+            List<T> returnObjList = Lists.newArrayList();
+
+            for(int i = 0; i < jsonArray.length(); ++i) {
+                JSONObject jsonObj = jsonArray.getJSONObject(i);
+                returnObjList.add(mapper.fromJson(jsonObj.toString(), type));
+            }
+
+            return returnObjList;
+        } catch (ConnectException var15) {
+            throw var15;
+        } catch (JsonParseException var16) {
+            throw new Exception("Json映射对象错误！----" + var16.getMessage(), var16);
+        } catch (Exception var17) {
+            throw new Exception("远程服务器调用接口失败！----" + var17.getMessage(), var17);
+        }
+    }
+
+    public String doPostXml(String httpUrl, String xmlString) throws Exception {
+        try {
+            HttpPost httppost = new HttpPost(httpUrl);
+            StringEntity se = new StringEntity(xmlString, "UTF-8");
+            se.setContentType("text/html");
+            se.setContentEncoding("utf-8");
+            httppost.setEntity(se);
+            CloseableHttpResponse response = HttpConnectionManager.getHttpClient().execute(httppost, HttpClientContext.create());
+            HttpEntity entity = response.getEntity();
+            String receiveXml = EntityUtils.toString(entity, "UTF-8").trim();
+            return receiveXml;
+        } catch (Exception var8) {
+            throw new Exception("远程服务器调用接口失败！----" + var8.getMessage(), var8);
+        }
+    }
+
+    public String receivePost(HttpServletRequest request) throws IOException, UnsupportedEncodingException {
+        BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream()));
+        String line = null;
+        StringBuilder sb = new StringBuilder();
+
+        while((line = br.readLine()) != null) {
+            sb.append(line);
+        }
+
+        String reqBody = sb.toString();
+        return URLDecoder.decode(reqBody, "UTF-8");
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.diagbot.yujian.util;
+
+import org.apache.http.HttpHost;
+import org.apache.http.conn.routing.HttpRoute;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class HttpConnectionManager {
+    private static Logger log = LoggerFactory.getLogger(HttpConnectionManager.class);
+    private static PoolingHttpClientConnectionManager cm;
+
+    public HttpConnectionManager() {
+    }
+
+    public static CloseableHttpClient getHttpClient() throws Exception {
+        try {
+            CloseableHttpClient httpClient = HttpClients.custom().setConnectionManager(cm).build();
+            return httpClient;
+        } catch (Exception var1) {
+            log.error("获取CloseableHttpClient出错", var1);
+            throw var1;
+        }
+    }
+
+    public static void closeHttpClient(CloseableHttpClient httpClient) throws IOException {
+        if (httpClient != null) {
+            try {
+                httpClient.close();
+            } catch (IOException var2) {
+                log.error("关闭HTTP连接出错", var2);
+                throw var2;
+            }
+        }
+
+    }
+
+    static {
+        try {
+            cm = new PoolingHttpClientConnectionManager();
+            cm.setMaxTotal(200);
+            cm.setDefaultMaxPerRoute(20);
+            HttpHost localhost = new HttpHost("http://115.28.138.12", 7070);
+            cm.setMaxPerRoute(new HttpRoute(localhost), 50);
+        } catch (Exception var1) {
+            log.error("初始化HTTP连接池出错", var1);
+        }
+
+    }
+}

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

@@ -1,10 +1,10 @@
 package com.diagbot.yujian.util;
 
-import java.io.StringReader;
-import java.io.StringWriter;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
+import java.io.StringReader;
+import java.io.StringWriter;
 
 public class JaxbUtil {
     public JaxbUtil() {

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

@@ -0,0 +1,110 @@
+package com.diagbot.yujian.util;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.util.JSONPObject;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class JsonMapper {
+    private static Logger logger = LoggerFactory.getLogger(JsonMapper.class);
+    private ObjectMapper mapper;
+
+    public JsonMapper() {
+        this((JsonInclude.Include)null);
+    }
+
+    public JsonMapper(JsonInclude.Include include) {
+        this.mapper = new ObjectMapper();
+        if (include != null) {
+            this.mapper.setSerializationInclusion(include);
+        }
+
+        this.mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    }
+
+    public static JsonMapper nonEmptyMapper() {
+        return new JsonMapper(JsonInclude.Include.NON_EMPTY);
+    }
+
+    public static JsonMapper nonDefaultMapper() {
+        return new JsonMapper(JsonInclude.Include.NON_DEFAULT);
+    }
+
+    public String toJson(Object object) {
+        try {
+            return this.mapper.writeValueAsString(object);
+        } catch (IOException var3) {
+            logger.warn("write to json string error:" + object, var3);
+            return null;
+        }
+    }
+
+    public <T> T fromJson(String jsonString, Class<T> clazz) {
+        if (StringUtils.isEmpty(jsonString)) {
+            return null;
+        } else {
+            try {
+                return this.mapper.readValue(jsonString, clazz);
+            } catch (IOException var4) {
+                logger.warn("parse json string error:" + jsonString, var4);
+                return null;
+            }
+        }
+    }
+
+    public <T> T fromJson(String jsonString, JavaType javaType) {
+        if (StringUtils.isEmpty(jsonString)) {
+            return null;
+        } else {
+            try {
+                return this.mapper.readValue(jsonString, javaType);
+            } catch (IOException var4) {
+                logger.warn("parse json string error:" + jsonString, var4);
+                return null;
+            }
+        }
+    }
+
+    public JavaType createCollectionType(Class<?> collectionClass, Class... elementClasses) {
+        return this.mapper.getTypeFactory().constructParametricType(collectionClass, elementClasses);
+    }
+
+    public <T> T update(String jsonString, T object) {
+        try {
+            return this.mapper.readerForUpdating(object).readValue(jsonString);
+        } catch (JsonProcessingException var4) {
+            logger.warn("update json string:" + jsonString + " to object:" + object + " error.", var4);
+        } catch (IOException var5) {
+            logger.warn("update json string:" + jsonString + " to object:" + object + " error.", var5);
+        }
+
+        return null;
+    }
+
+    public String toJsonP(String functionName, Object object) {
+        return this.toJson(new JSONPObject(functionName, object));
+    }
+
+    public void enableEnumUseToString() {
+        this.mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+        this.mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    }
+
+    public void enableJaxbAnnotation() {
+        JaxbAnnotationModule module = new JaxbAnnotationModule();
+        this.mapper.registerModule(module);
+    }
+
+    public ObjectMapper getMapper() {
+        return this.mapper;
+    }
+}

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

@@ -1,8 +1,7 @@
-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;
+package com.diagbot.yujian.util;
 
+import com.diagbot.yujian.request.InquiryInfoRequest;
+import com.diagbot.yujian.request.PatientInfoRequest;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;

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

@@ -0,0 +1,29 @@
+package com.diagbot.yujian.util;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@Getter
+@Setter
+@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 = "";
+
+}

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

@@ -0,0 +1,146 @@
+package com.diagbot.yujian.util;
+
+import java.io.Serializable;
+
+public class Response<T> implements Serializable {
+    private static final long serialVersionUID = 8206448610408409499L;
+    private Status status;
+    private long startTime;
+    private long endTime;
+    private String version;
+    private String msg;
+    private T data;
+    private int ret;
+    private String token;
+    private long timeConsum;
+
+    public int getRet() {
+        return this.ret;
+    }
+
+    public void setRet(int ret) {
+        this.ret = ret;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public long getTimeConsum() {
+        return this.timeConsum;
+    }
+
+    public void setTimeConsum(long timeConsum) {
+        this.timeConsum = timeConsum;
+    }
+
+    public Response() {
+        this.status = Status.PENDING;
+        this.startTime = -1L;
+        this.endTime = -1L;
+        this.version = "1.0";
+        this.msg = "操作成功";
+        this.data = null;
+        this.ret = 0;
+    }
+
+    public Status getStatus() {
+        return this.status;
+    }
+
+    public Response<T> setStatus(Status status) {
+        this.status = status;
+        return this;
+    }
+
+    public String getVersion() {
+        return this.version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public long getStartTime() {
+        return this.startTime;
+    }
+
+    public Response<T> setStartTime(long startTime) {
+        this.startTime = startTime;
+        return this;
+    }
+
+    public long getEndTime() {
+        return this.endTime;
+    }
+
+    public Response<T> setEndTime(long endTime) {
+        this.endTime = endTime;
+        return this;
+    }
+
+    public T getData() {
+        return this.data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public String getToken() {
+        return this.token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public Response<T> start() {
+        this.setStatus(Status.RUNNING);
+        this.setStartTime(System.currentTimeMillis());
+        return this;
+    }
+
+    public Response<T> end() {
+        this.setEndTime(System.currentTimeMillis());
+        this.setTimeConsum(this.endTime - this.startTime);
+        this.setStatus(Status.OK);
+        return this;
+    }
+
+    public Response<T> endAndFailed() {
+        this.setStatus(Status.FAIL);
+        this.setEndTime(System.currentTimeMillis());
+        return this;
+    }
+
+    public Response<T> failure(String msg) {
+        this.msg = msg;
+        this.ret = 1;
+        this.end();
+        return this;
+    }
+
+    public Response<T> paramFailure(String msg) {
+        this.msg = msg;
+        this.ret = -1;
+        this.end();
+        return this;
+    }
+
+    public Response<T> tokenFailure(String msg) {
+        this.msg = msg;
+        this.ret = -2;
+        this.end();
+        return this;
+    }
+
+    public Response<T> success() {
+        this.end();
+        return this;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.diagbot.yujian.util;
+
+public enum Status {
+    PENDING(1),
+    RUNNING(2),
+    OK(3),
+    WARN(4),
+    ERROR(5),
+    FAIL(6);
+
+    public static final int PENDING_VALUE = 1;
+    public static final int RUNNING_VALUE = 2;
+    public static final int OK_VALUE = 3;
+    public static final int WARN_VALUE = 4;
+    public static final int ERROR_VALUE = 5;
+    public static final int FAIL_VALUE = 6;
+    private final int value;
+
+    public final int getNumber() {
+        return this.value;
+    }
+
+    public static Status valueOf(int value) {
+        switch(value) {
+            case 1:
+                return PENDING;
+            case 2:
+                return RUNNING;
+            case 3:
+                return OK;
+            case 4:
+                return WARN;
+            case 5:
+                return ERROR;
+            case 6:
+                return FAIL;
+            default:
+                return null;
+        }
+    }
+
+    private Status(int value) {
+        this.value = value;
+    }
+}

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

@@ -1,21 +0,0 @@
-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

@@ -5,7 +5,7 @@
  * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  */
 
-package com.diagbot.yujian.webservicetest;
+package com.diagbot.yujian.webservice;
 
 public interface WebServices extends javax.xml.rpc.Service {
     public String getWebServicesHttpPortAddress();

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

@@ -5,7 +5,7 @@
  * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  */
 
-package com.diagbot.yujian.webservicetest;
+package com.diagbot.yujian.webservice;
 
 public class WebServicesHttpBindingStub extends org.apache.axis.client.Stub implements WebServicesPortType {
     private java.util.Vector cachedSerClasses = new java.util.Vector();

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

@@ -5,7 +5,7 @@
  * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  */
 
-package com.diagbot.yujian.webservicetest;
+package com.diagbot.yujian.webservice;
 
 public class WebServicesLocator extends org.apache.axis.client.Service implements WebServices {
 

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

@@ -5,7 +5,7 @@
  * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
  */
 
-package com.diagbot.yujian.webservicetest;
+package com.diagbot.yujian.webservice;
 
 public interface WebServicesPortType extends java.rmi.Remote {
     public String ICSS_GET_PATIENT(String in0) throws java.rmi.RemoteException;

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

@@ -1,4 +1,4 @@
-package com.diagbot.yujian.webservicetest;
+package com.diagbot.yujian.webservice;
 
 public class WebServicesPortTypeProxy implements WebServicesPortType {
   private String _endpoint = null;