统计

tran-service/src/main/java/com/diagbot/entity/InputInfo.java

@@ -16,47 +16,77 @@ public class InputInfo implements Serializable{
      */
     @TableId(value = "id", type = IdType.AUTO)
 	private Long id;
-	private String hospitalId;
-	private String deptId;
-	private String doctorId;
-	private String recordId;
-	private String patientId;
-	private String age;
-	private String sexType;
+
+    private String hospitalCode; //医院编码、ID
+    private String hosptialName;//医院名称
+    private String hosptialDeptCode;//科室编码、ID
+    private String hosptialDeptName;//科室名称
+    private String doctorCode;//医生编码、ID
+    private String doctorName;//医生名称
+    private String inquiryCode; //就诊ID
+    private String patientId;
+    private long age;//年龄
+	private String sexType;//性别，1：男，2：女
+	private String diseaseName;//疾病名称
+	
 	private String paramIn;
 	private String paramOut;
-	private Date transTime;
+	private String transTime;
 	private String remark;
 	
+	public long getAge() {
+		return age;
+	}
+	public void setAge(long age) {
+		this.age = age;
+	}
 	public Long getId() {
 		return id;
 	}
 	public void setId(Long id) {
 		this.id = id;
 	}
-	public String getHospitalId() {
-		return hospitalId;
+	public String getHospitalCode() {
+		return hospitalCode;
+	}
+	public void setHospitalCode(String hospitalCode) {
+		this.hospitalCode = hospitalCode;
+	}
+	public String getHosptialName() {
+		return hosptialName;
+	}
+	public void setHosptialName(String hosptialName) {
+		this.hosptialName = hosptialName;
+	}
+	public String getHosptialDeptCode() {
+		return hosptialDeptCode;
 	}
-	public void setHospitalId(String hospitalId) {
-		this.hospitalId = hospitalId;
+	public void setHosptialDeptCode(String hosptialDeptCode) {
+		this.hosptialDeptCode = hosptialDeptCode;
 	}
-	public String getDeptId() {
-		return deptId;
+	public String getHosptialDeptName() {
+		return hosptialDeptName;
 	}
-	public void setDeptId(String deptId) {
-		this.deptId = deptId;
+	public void setHosptialDeptName(String hosptialDeptName) {
+		this.hosptialDeptName = hosptialDeptName;
 	}
-	public String getDoctorId() {
-		return doctorId;
+	public String getDoctorCode() {
+		return doctorCode;
 	}
-	public void setDoctorId(String doctorId) {
-		this.doctorId = doctorId;
+	public void setDoctorCode(String doctorCode) {
+		this.doctorCode = doctorCode;
 	}
-	public String getRecordId() {
-		return recordId;
+	public String getDoctorName() {
+		return doctorName;
 	}
-	public void setRecordId(String recordId) {
-		this.recordId = recordId;
+	public void setDoctorName(String doctorName) {
+		this.doctorName = doctorName;
+	}
+	public String getInquiryCode() {
+		return inquiryCode;
+	}
+	public void setInquiryCode(String inquiryCode) {
+		this.inquiryCode = inquiryCode;
 	}
 	public String getPatientId() {
 		return patientId;
@@ -64,18 +94,18 @@ public class InputInfo implements Serializable{
 	public void setPatientId(String patientId) {
 		this.patientId = patientId;
 	}
-	public String getAge() {
-		return age;
-	}
-	public void setAge(String age) {
-		this.age = age;
-	}
 	public String getSexType() {
 		return sexType;
 	}
 	public void setSexType(String sexType) {
 		this.sexType = sexType;
 	}
+	public String getDiseaseName() {
+		return diseaseName;
+	}
+	public void setDiseaseName(String diseaseName) {
+		this.diseaseName = diseaseName;
+	}
 	public String getParamIn() {
 		return paramIn;
 	}
@@ -88,12 +118,10 @@ public class InputInfo implements Serializable{
 	public void setParamOut(String paramOut) {
 		this.paramOut = paramOut;
 	}
-	
-	
-	public Date getTransTime() {
+	public String getTransTime() {
 		return transTime;
 	}
-	public void setTransTime(Date transTime) {
+	public void setTransTime(String transTime) {
 		this.transTime = transTime;
 	}
 	public String getRemark() {

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

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -9,10 +10,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import com.alibaba.fastjson.JSONObject;
 import com.diagbot.client.IcssServiceClient;
 import com.diagbot.client.utils.ReadProperties;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.InputInfo;
+import com.diagbot.util.DateUtil;
 import com.diagbot.vo.PushDiseaseVO;
 import com.diagbot.vo.PushInquiryVO;
 import com.diagbot.vo.PushVO;
@@ -25,6 +29,9 @@ public class PushFacade {
 	@Autowired
 	private IcssServiceClient icssServiceClient;
 	
+	@Autowired
+	private InputInfoFacade inputInfoFacade;
+	
 	public RespDTO<PushDTO> pushData(PushVO pushVO){
 		pushVO.setFeatureType("1,4,5,6,7,8,22");
 		RespDTO<PushDTO> responseData=icssServiceClient.pushInner(pushVO);
@@ -40,20 +47,59 @@ public class PushFacade {
 		String url=readProperties.getRemoteAddress()+"index.html?"+pushInquiryVO.toString();
 		
 		Map<String, String> map=new HashMap<String, String>();
-		map.put(url, url);
+		map.put("url", url);
+		
+		
+		//增加统计功能
+		InputInfo inputInfo=new InputInfo();
+		inputInfo.setHospitalCode(pushInquiryVO.getHospitalCode());
+		inputInfo.setHosptialName(pushInquiryVO.getHosptialName());
+		inputInfo.setHosptialDeptCode(pushInquiryVO.getHosptialDeptCode());
+		inputInfo.setHosptialDeptName(pushInquiryVO.getHosptialDeptName());
+		inputInfo.setDoctorCode(pushInquiryVO.getDoctorCode());
+		inputInfo.setDoctorName(pushInquiryVO.getDoctorName());
+		inputInfo.setInquiryCode(pushInquiryVO.getInquiryCode());
+		inputInfo.setDiseaseName(pushInquiryVO.getDiagJson());
+		inputInfo.setAge(pushInquiryVO.getAge());
+		inputInfo.setSexType(pushInquiryVO.getSexType());
+		inputInfo.setTransTime(DateUtil.format(new Date(), DateUtil.DATE_TIME_FORMAT));
+		inputInfo.setRemark("病历");
+		inputInfo.setParamIn(JSONObject.toJSONString(pushInquiryVO));
+		inputInfo.setParamOut(url);
+		
+		inputInfoFacade.saveInputInfo(inputInfo);
 		return map;
 	}
 	
 	/**
-	 * HIS医嘱界面——智能推送
+	 * HIS医嘱界面——页面推送-横版
 	 * @param pushDiseaseVO
 	 * @return
 	 */
 	public Map<String, String> pushDisease(@Valid @RequestBody PushDiseaseVO pushDiseaseVO){
-		String url=readProperties.getRemoteAddress()+"index.html?"+pushDiseaseVO.toString();
+		String url=readProperties.getRemoteAddress()+"landscapeMedical.html?"+pushDiseaseVO.toString();
 		
 		Map<String, String> map=new HashMap<String, String>();
-		map.put(url, url);
+		map.put("url", url);
+		
+		//增加统计功能
+		InputInfo inputInfo=new InputInfo();
+		inputInfo.setHospitalCode(pushDiseaseVO.getHospitalCode());
+		inputInfo.setHosptialName(pushDiseaseVO.getHosptialName());
+		inputInfo.setHosptialDeptCode(pushDiseaseVO.getHosptialDeptCode());
+		inputInfo.setHosptialDeptName(pushDiseaseVO.getHosptialDeptName());
+		inputInfo.setDoctorCode(pushDiseaseVO.getDoctorCode());
+		inputInfo.setDoctorName(pushDiseaseVO.getDoctorName());
+		inputInfo.setInquiryCode(pushDiseaseVO.getInquiryCode());
+		inputInfo.setDiseaseName(pushDiseaseVO.getDiagJson());
+		inputInfo.setAge(pushDiseaseVO.getAge());
+		inputInfo.setSexType(pushDiseaseVO.getSexType());
+		inputInfo.setTransTime(DateUtil.format(new Date(), DateUtil.DATE_TIME_FORMAT));
+		inputInfo.setParamIn(JSONObject.toJSONString(pushDiseaseVO));
+		inputInfo.setParamOut(url);
+		inputInfo.setRemark("医嘱");
+		
+		inputInfoFacade.saveInputInfo(inputInfo);
 		return map;
 	}
 }

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

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,15 +9,21 @@ import lombok.Setter;
 @Setter
 public class InputInfoVO {
 
-	private String hospitalId;
-	private String deptId;
-	private String doctorId;
-	private String recordId;
-	private String patientId;
-	private String age;
-	private String sexType;
+	private Long id;
+	private String hospitalCode; //医院编码、ID
+    private String hosptialName;//医院名称
+    private String hosptialDeptCode;//科室编码、ID
+    private String hosptialDeptName;//科室名称
+    private String doctorCode;//医生编码、ID
+    private String doctorName;//医生名称
+    private String inquiryCode; //就诊ID
+    private String patientId;
+    private long age;//年龄
+	private String sexType;//性别，1：男，2：女
+	private String diseaseName;//疾病名称
+	
 	private String paramIn;
 	private String paramOut;
-	private String transTime;
+	private Date transTime;
 	private String remark;
 }

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

@@ -11,7 +11,7 @@ import lombok.Setter;
 public class PushDiseaseVO {
     
 	@NotBlank(message = "请输入疾病名称")
-	private String disJson;//疾病名称
+	private String diagJson;//疾病名称
 	
 	@NotNull(message = "请输入年龄")
 	private Long age;//年龄
@@ -19,13 +19,17 @@ public class PushDiseaseVO {
 	@NotBlank(message = "请输入性别")
     private String sexType;//性别
 	
-    private String hospitalId; //医院编码、ID
-    private String deptId;//科室ID
-    private String doctorId;//医生ID
-    private String recordId; //就诊ID
+	//统计用
+    private String hospitalCode; //医院编码、ID
+    private String hosptialName;//医院名称
+    private String hosptialDeptCode;//科室编码、ID
+    private String hosptialDeptName;//科室名称
+    private String doctorCode;//医生编码、ID
+    private String doctorName;//医生名称
+    private String inquiryCode; //就诊ID
     
     public String toString(){
-    	return "age="+this.age+"&sexType="+this.sexType+"&disJson="+this.disJson;
+    	return "age="+this.age+"&sexType="+this.sexType+"&diagJson="+this.diagJson+"&hospitalCode="+this.hospitalCode;
     }
     
 }

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

@@ -18,19 +18,22 @@ public class PushInquiryVO {
 	@NotBlank(message = "请输入主诉")
 	private String symptomJson;
 	
-	
     private String pastJson;
     private String otherJson;
     private String vitalsJson;
     private String labsJson;
     private String pacsJson;
-    private String disJson;
+    private String diagJson;
     private String drugJson;
     
-    private String type;
-    private String hospitalCode; //医院编码
-    private String patientId;  //病人id
-    private String recordId; //就诊序号
+    //统计用
+    private String hospitalCode; //医院编码、ID
+    private String hosptialName;//医院名称
+    private String hosptialDeptCode;//科室编码、ID
+    private String hosptialDeptName;//科室名称
+    private String doctorCode;//医生编码、ID
+    private String doctorName;//医生名称
+    private String inquiryCode; //就诊ID
     
     @Override
 	public String toString() {

tran-service/src/main/resources/mapper/InputInfoMapper.xml

@@ -6,10 +6,14 @@
 	<!-- 通用查询映射结果 -->
 	<resultMap type="com.diagbot.entity.InputInfo" id="BaseResultMap">
 		<id property="id" column="id"/>
-		<result property="hospitalId" column="hospital_id"/>
-		<result property="deptId" column="dept_id"/>
-		<result property="doctorId" column="doctor_id"/>
-		<result property="recordId" column="record_id"/>
+		<result property="hospitalCode" column="hospital_code"/>
+		<result property="hosptialName" column="hosptial_name"/>
+		<result property="hosptialDeptCode" column="hosptial_dept_code"/>
+		<result property="hosptialDeptName" column="hosptial_dept_name"/>
+		<result property="doctorCode" column="doctor_code"/>
+		<result property="doctorName" column="doctor_name"/>
+		<result property="inquiryCode" column="inquiry_code"/>
+		<result property="diseaseName" column="disease_name"/>
 		<result property="patientId" column="patient_id"/>
 		<result property="age" column="age"/>
 		<result property="sexType" column="sex_type"/>