Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/PrescriptionDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionDao extends PagingAndSortingRepository<WlyyPrescriptionDO, String>, JpaSpecificationExecutor<WlyyPrescriptionDO> {
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/PrescriptionDiagnosisDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDiagnosisDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionDiagnosisDao extends PagingAndSortingRepository<WlyyPrescriptionDiagnosisDO, String>, JpaSpecificationExecutor<WlyyPrescriptionDiagnosisDO> {
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/PrescriptionExpressageDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionExpressageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionExpressageDao extends PagingAndSortingRepository<WlyyPrescriptionExpressageDO, String>, JpaSpecificationExecutor<WlyyPrescriptionExpressageDO> {
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/PrescriptionExpressageLogDao.java

@@ -0,0 +1,7 @@
package com.yihu.jw.hospital.prescription.dao;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionExpressageLogDao {
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/PrescriptionInfoDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionInfoDao extends PagingAndSortingRepository<WlyyPrescriptionInfoDO, String>, JpaSpecificationExecutor<WlyyPrescriptionInfoDO> {
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/PrescriptionInfoLogDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionInfoLogDao extends PagingAndSortingRepository<WlyyPrescriptionLogDO, String>, JpaSpecificationExecutor<WlyyPrescriptionLogDO> {
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -0,0 +1,7 @@
package com.yihu.jw.hospital.prescription.service;
/**
 * Created by Trick on 2019/5/17.
 */
public class PrescriptionService {
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyDoctorClinicRoomDO.java

@@ -0,0 +1,168 @@
package com.yihu.jw.entity.hospital.consult;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 医生诊室实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_doctor_clinic_room")
public class WlyyDoctorClinicRoomDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 医院CODE
	 */
	private String hospital;
    /**
	 * 医院名称
	 */
	private String hospitalName;
    /**
	 * 科室CODE
	 */
	private String dept;
    /**
	 * 科室名称
	 */
	private String deptName;
    /**
	 * 医生CODE
	 */
	private String doctor;
    /**
	 * 医生名称
	 */
	private String doctorName;
    /**
	 * 
	 */
	private String clinicName;
    /**
	 * -1离线 0在线 1空闲 2接诊中
	 */
	private Integer clinicStatus;
    /**
	 * 日期 YYMMDD
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date date;
    /**
	 * 0删除 1有效
	 */
	private Integer status;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "hospital")
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
	@Column(name = "hospital_name")
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
	@Column(name = "dept")
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
	@Column(name = "dept_name")
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
	@Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
	@Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
	@Column(name = "clinic_name")
    public String getClinicName() {
        return clinicName;
    }
    public void setClinicName(String clinicName) {
        this.clinicName = clinicName;
    }
	@Column(name = "clinic_status")
    public Integer getClinicStatus() {
        return clinicStatus;
    }
    public void setClinicStatus(Integer clinicStatus) {
        this.clinicStatus = clinicStatus;
    }
	@Column(name = "date")
    public Date getDate() {
        return date;
    }
    public void setDate(Date date) {
        this.date = date;
    }
	@Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalConsultPriceDO.java

@@ -0,0 +1,113 @@
package com.yihu.jw.entity.hospital.consult;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 医院咨询计费价目表实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_hospital_consult_price")
public class WlyyHospitalConsultPriceDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 0图文 1视频
	 */
	private Integer type;
    /**
	 * 0按次收费 1计时收费 3固定时长收费 4
	 */
	private Integer payType;
    /**
	 * 服务科室
	 */
	private String dept;
    /**
	 * 0专家 1主任 2医师
	 */
	private String doctorJob;
    /**
	 * 0帮扶医院、社区  1普通患者
	 */
	private String serviceRange;
    /**
	 * 价格
	 */
	private Integer price;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
	@Column(name = "pay_type")
    public Integer getPayType() {
        return payType;
    }
    public void setPayType(Integer payType) {
        this.payType = payType;
    }
	@Column(name = "dept")
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
	@Column(name = "doctor_job")
    public String getDoctorJob() {
        return doctorJob;
    }
    public void setDoctorJob(String doctorJob) {
        this.doctorJob = doctorJob;
    }
	@Column(name = "service_range")
    public String getServiceRange() {
        return serviceRange;
    }
    public void setServiceRange(String serviceRange) {
        this.serviceRange = serviceRange;
    }
	@Column(name = "price")
    public Integer getPrice() {
        return price;
    }
    public void setPrice(Integer price) {
        this.price = price;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalReservationSettingDO.java

@@ -0,0 +1,243 @@
package com.yihu.jw.entity.hospital.consult;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_hospital_reservation_setting")
public class WlyyHospitalReservationSettingDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 城市id
	 */
	private String city;
    /**
	 * 城市名称
	 */
	private String cityName;
    /**
	 * 行政区id
	 */
	private String town;
    /**
	 * 行政区名称
	 */
	private String townName;
    /**
	 * 医院
	 */
	private String hospital;
    /**
	 * 医院名称
	 */
	private String hospitalName;
    /**
	 * 科室
	 */
	private String dept;
    /**
	 * 科室名称
	 */
	private String deptName;
    /**
	 * 复诊疾病范围
	 */
	private String diseaseRange;
    /**
	 * 1图文 2视频 3图文+视频
	 */
	private Integer consultType;
    /**
	 * 医生
	 */
	private String doctor;
    /**
	 * 医生姓名
	 */
	private String doctorName;
    /**
	 * 0不可以预约 1可预约
	 */
	private Integer reservationStatus;
    /**
	 * 备注
	 */
	private String remark;
    /**
	 * 医生职称CODE
	 */
	private String job;
    /**
	 * 医生职称名字
	 */
	private String jobName;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
	@Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
	@Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
	@Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
	@Column(name = "hospital")
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
	@Column(name = "hospital_name")
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
	@Column(name = "dept")
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
	@Column(name = "dept_name")
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
	@Column(name = "disease_range")
    public String getDiseaseRange() {
        return diseaseRange;
    }
    public void setDiseaseRange(String diseaseRange) {
        this.diseaseRange = diseaseRange;
    }
	@Column(name = "consult_type")
    public Integer getConsultType() {
        return consultType;
    }
    public void setConsultType(Integer consultType) {
        this.consultType = consultType;
    }
	@Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
	@Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
	@Column(name = "reservation_status")
    public Integer getReservationStatus() {
        return reservationStatus;
    }
    public void setReservationStatus(Integer reservationStatus) {
        this.reservationStatus = reservationStatus;
    }
	@Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
	@Column(name = "job")
    public String getJob() {
        return job;
    }
    public void setJob(String job) {
        this.job = job;
    }
	@Column(name = "job_name")
    public String getJobName() {
        return jobName;
    }
    public void setJobName(String jobName) {
        this.jobName = jobName;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalSysDictDO.java

@@ -0,0 +1,113 @@
package com.yihu.jw.entity.hospital.consult;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 互联网医院功能业务字典及开关设置表实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_hospital_sys_dict")
public class WlyyHospitalSysDictDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 所属字典
	 */
	private String dictName;
    /**
	 * 字典项代码
	 */
	private String dictCode;
    /**
	 * 字典项所属值
	 */
	private String dictValue;
    /**
	 * 拼音缩写码
	 */
	private String pyCode;
    /**
	 * 排序
	 */
	private Integer sort;
    /**
	 * 归属社区CODE
	 */
	private String hospital;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "dict_name")
    public String getDictName() {
        return dictName;
    }
    public void setDictName(String dictName) {
        this.dictName = dictName;
    }
	@Column(name = "dict_code")
    public String getDictCode() {
        return dictCode;
    }
    public void setDictCode(String dictCode) {
        this.dictCode = dictCode;
    }
	@Column(name = "dict_value")
    public String getDictValue() {
        return dictValue;
    }
    public void setDictValue(String dictValue) {
        this.dictValue = dictValue;
    }
	@Column(name = "py_code")
    public String getPyCode() {
        return pyCode;
    }
    public void setPyCode(String pyCode) {
        this.pyCode = pyCode;
    }
	@Column(name = "sort")
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
	@Column(name = "hospital")
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalWaitingRoomDO.java

@@ -0,0 +1,142 @@
package com.yihu.jw.entity.hospital.consult;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 候诊室实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_hospital_waiting_room")
public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 诊室ID
	 */
	private String clinicroomId;
    /**
	 * 居民ID
	 */
	private String patientId;
    /**
	 * 居民姓名
	 */
	private String patientName;
    /**
	 * 0离线 1在线(候诊) 2已诊
	 */
	private Integer visitStatus;
    /**
	 * 预约时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date reservationTime;
    /**
	 * 排序
	 */
	private Integer sort;
    /**
	 * 门诊类型: 1续方复诊 2协同门诊
	 */
	private Integer reservationType;
    /**
	 * 咨询类型: 1图文 2视频 3图文+视频
	 */
	private Integer consultTpye;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "clinicroom_id")
    public String getClinicroomId() {
        return clinicroomId;
    }
    public void setClinicroomId(String clinicroomId) {
        this.clinicroomId = clinicroomId;
    }
	@Column(name = "patient_id")
    public String getPatientId() {
        return patientId;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    }
	@Column(name = "patient_name")
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
	@Column(name = "visit_status")
    public Integer getVisitStatus() {
        return visitStatus;
    }
    public void setVisitStatus(Integer visitStatus) {
        this.visitStatus = visitStatus;
    }
	@Column(name = "reservation_time")
    public Date getReservationTime() {
        return reservationTime;
    }
    public void setReservationTime(Date reservationTime) {
        this.reservationTime = reservationTime;
    }
	@Column(name = "sort")
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
	@Column(name = "reservation_type")
    public Integer getReservationType() {
        return reservationType;
    }
    public void setReservationType(Integer reservationType) {
        this.reservationType = reservationType;
    }
	@Column(name = "consult_tpye")
    public Integer getConsultTpye() {
        return consultTpye;
    }
    public void setConsultTpye(Integer consultTpye) {
        this.consultTpye = consultTpye;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionDiagnosisDO.java

@@ -0,0 +1,116 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 处方诊断表实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_prescription_diagnosis")
public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 关联处方
	 */
	private String prescriptionId;
    /**
	 * 诊断结果名称
	 */
	private String name;
    /**
	 * 健康问题名称
	 */
	private String healthProblemName;
    /**
	 * 健康问题编码
	 */
	private String healthProblem;
    /**
	 * 1主诊断 2次诊断
	 */
	private Integer type;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "prescription_id")
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "health_problem_name")
    public String getHealthProblemName() {
        return healthProblemName;
    }
    public void setHealthProblemName(String healthProblemName) {
        this.healthProblemName = healthProblemName;
    }
	@Column(name = "health_problem")
    public String getHealthProblem() {
        return healthProblem;
    }
    public void setHealthProblem(String healthProblem) {
        this.healthProblem = healthProblem;
    }
	@Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageDO.java

@@ -0,0 +1,614 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 处方物流表实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_prescription_expressage")
public class WlyyPrescriptionExpressageDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 关联wlyy_wlyy_prescription id
	 */
	private String prescriptionId;
    /**
	 * 快递单号
	 */
	private String mailno;
    /**
	 * 收货人名称
	 */
	private String name;
    /**
	 * 收货人手机号码 13606078123
	 */
	private String mobile;
    /**
	 * 收货人座机号 0592-1111111
	 */
	private String phone;
    /**
	 * 收货人详细地址
	 */
	private String address;
    /**
	 * 省代码
	 */
	private String provinceCode;
    /**
	 * 省名称
	 */
	private String provinceName;
    /**
	 * 市代码
	 */
	private String cityCode;
    /**
	 * 市名称
	 */
	private String cityName;
    /**
	 * 
	 */
	private String townCode;
    /**
	 * 区名称
	 */
	private String townName;
    /**
	 * 街道code
	 */
	private String streetCode;
    /**
	 * 街道名称
	 */
	private String streetName;
    /**
	 * 配药机构code
	 */
	private String hospitalCode;
    /**
	 * 配药机构名称
	 */
	private String hospitalName;
    /**
	 * 配药机构地址
	 */
	private String hospitalAddress;
    /**
	 * 重量   单位是克
	 */
	private Integer weight;
    /**
	 * 快递的配送费用
	 */
	private Integer price;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
    /**
	 * 是否自取 1是 0否
	 */
	private Integer oneselfPickupFlg;
    /**
	 * 备注
	 */
	private String remark;
    /**
	 * 配送机构地址
	 */
	private String expressageHospitalAddress;
    /**
	 * 配送机构code
	 */
	private String expressageHospitalCode;
    /**
	 * 如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称
	 */
	private String expressageHospitalName;
    /**
	 * 配送人名称
	 */
	private String expressageName;
    /**
	 * 配送人code
	 */
	private String expressageCode;
    /**
	 * 开始配送时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date expressageTime;
    /**
	 * 配送人电话
	 */
	private String expressageMobile;
    /**
	 * 1可用 0删除
	 */
	private Integer del;
    /**
	 * 接收人电话
	 */
	private String acceptMobile;
    /**
	 * 接收人code
	 */
	private String acceptCode;
    /**
	 * 接收人名称
	 */
	private String acceptName;
    /**
	 * 接收人所属的机构code
	 */
	private String acceptHospital;
    /**
	 * 接收人所属机构名称
	 */
	private String acceptHospitalName;
    /**
	 * 接受时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date acceptTime;
    /**
	 * 患者填写的需要送达的机构地址
	 */
	private String patientHospitalAddress;
    /**
	 * 患者填写的需要送达的机构名称
	 */
	private String patientHospitalName;
    /**
	 * 患者填写的需要送达的机构code
	 */
	private String patientHospitalCode;
    /**
	 * 接收机构地址
	 */
	private String acceptHospitalAddress;
    /**
	 * 配药机构出药人（健管师或者称工作人员）
	 */
	private String hospitalDoctor;
    /**
	 * 配药机构出药人code
	 */
	private String hospitalDoctorCode;
    /**
	 * 配药机构出药时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date fetchingMedicineTime;
    /**
	 * 
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date deliveryTime;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "prescription_id")
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
	@Column(name = "mailno")
    public String getMailno() {
        return mailno;
    }
    public void setMailno(String mailno) {
        this.mailno = mailno;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
	@Column(name = "phone")
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
	@Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
	@Column(name = "province_code")
    public String getProvinceCode() {
        return provinceCode;
    }
    public void setProvinceCode(String provinceCode) {
        this.provinceCode = provinceCode;
    }
	@Column(name = "province_name")
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
	@Column(name = "city_code")
    public String getCityCode() {
        return cityCode;
    }
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
	@Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
	@Column(name = "town_code")
    public String getTownCode() {
        return townCode;
    }
    public void setTownCode(String townCode) {
        this.townCode = townCode;
    }
	@Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
	@Column(name = "street_code")
    public String getStreetCode() {
        return streetCode;
    }
    public void setStreetCode(String streetCode) {
        this.streetCode = streetCode;
    }
	@Column(name = "street_name")
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
	@Column(name = "hospital_code")
    public String getHospitalCode() {
        return hospitalCode;
    }
    public void setHospitalCode(String hospitalCode) {
        this.hospitalCode = hospitalCode;
    }
	@Column(name = "hospital_name")
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
	@Column(name = "hospital_address")
    public String getHospitalAddress() {
        return hospitalAddress;
    }
    public void setHospitalAddress(String hospitalAddress) {
        this.hospitalAddress = hospitalAddress;
    }
	@Column(name = "weight")
    public Integer getWeight() {
        return weight;
    }
    public void setWeight(Integer weight) {
        this.weight = weight;
    }
	@Column(name = "price")
    public Integer getPrice() {
        return price;
    }
    public void setPrice(Integer price) {
        this.price = price;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
	@Column(name = "oneself_pickup_flg")
    public Integer getOneselfPickupFlg() {
        return oneselfPickupFlg;
    }
    public void setOneselfPickupFlg(Integer oneselfPickupFlg) {
        this.oneselfPickupFlg = oneselfPickupFlg;
    }
	@Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
	@Column(name = "expressage_hospital_address")
    public String getExpressageHospitalAddress() {
        return expressageHospitalAddress;
    }
    public void setExpressageHospitalAddress(String expressageHospitalAddress) {
        this.expressageHospitalAddress = expressageHospitalAddress;
    }
	@Column(name = "expressage_hospital_code")
    public String getExpressageHospitalCode() {
        return expressageHospitalCode;
    }
    public void setExpressageHospitalCode(String expressageHospitalCode) {
        this.expressageHospitalCode = expressageHospitalCode;
    }
	@Column(name = "expressage_hospital_name")
    public String getExpressageHospitalName() {
        return expressageHospitalName;
    }
    public void setExpressageHospitalName(String expressageHospitalName) {
        this.expressageHospitalName = expressageHospitalName;
    }
	@Column(name = "expressage_name")
    public String getExpressageName() {
        return expressageName;
    }
    public void setExpressageName(String expressageName) {
        this.expressageName = expressageName;
    }
	@Column(name = "expressage_code")
    public String getExpressageCode() {
        return expressageCode;
    }
    public void setExpressageCode(String expressageCode) {
        this.expressageCode = expressageCode;
    }
	@Column(name = "expressage_time")
    public Date getExpressageTime() {
        return expressageTime;
    }
    public void setExpressageTime(Date expressageTime) {
        this.expressageTime = expressageTime;
    }
	@Column(name = "expressage_mobile")
    public String getExpressageMobile() {
        return expressageMobile;
    }
    public void setExpressageMobile(String expressageMobile) {
        this.expressageMobile = expressageMobile;
    }
	@Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
	@Column(name = "accept_mobile")
    public String getAcceptMobile() {
        return acceptMobile;
    }
    public void setAcceptMobile(String acceptMobile) {
        this.acceptMobile = acceptMobile;
    }
	@Column(name = "accept_code")
    public String getAcceptCode() {
        return acceptCode;
    }
    public void setAcceptCode(String acceptCode) {
        this.acceptCode = acceptCode;
    }
	@Column(name = "accept_name")
    public String getAcceptName() {
        return acceptName;
    }
    public void setAcceptName(String acceptName) {
        this.acceptName = acceptName;
    }
	@Column(name = "accept_hospital")
    public String getAcceptHospital() {
        return acceptHospital;
    }
    public void setAcceptHospital(String acceptHospital) {
        this.acceptHospital = acceptHospital;
    }
	@Column(name = "accept_hospital_name")
    public String getAcceptHospitalName() {
        return acceptHospitalName;
    }
    public void setAcceptHospitalName(String acceptHospitalName) {
        this.acceptHospitalName = acceptHospitalName;
    }
	@Column(name = "accept_time")
    public Date getAcceptTime() {
        return acceptTime;
    }
    public void setAcceptTime(Date acceptTime) {
        this.acceptTime = acceptTime;
    }
	@Column(name = "patient_hospital_address")
    public String getPatientHospitalAddress() {
        return patientHospitalAddress;
    }
    public void setPatientHospitalAddress(String patientHospitalAddress) {
        this.patientHospitalAddress = patientHospitalAddress;
    }
	@Column(name = "patient_hospital_name")
    public String getPatientHospitalName() {
        return patientHospitalName;
    }
    public void setPatientHospitalName(String patientHospitalName) {
        this.patientHospitalName = patientHospitalName;
    }
	@Column(name = "patient_hospital_code")
    public String getPatientHospitalCode() {
        return patientHospitalCode;
    }
    public void setPatientHospitalCode(String patientHospitalCode) {
        this.patientHospitalCode = patientHospitalCode;
    }
	@Column(name = "accept_hospital_address")
    public String getAcceptHospitalAddress() {
        return acceptHospitalAddress;
    }
    public void setAcceptHospitalAddress(String acceptHospitalAddress) {
        this.acceptHospitalAddress = acceptHospitalAddress;
    }
	@Column(name = "hospital_doctor")
    public String getHospitalDoctor() {
        return hospitalDoctor;
    }
    public void setHospitalDoctor(String hospitalDoctor) {
        this.hospitalDoctor = hospitalDoctor;
    }
	@Column(name = "hospital_doctor_code")
    public String getHospitalDoctorCode() {
        return hospitalDoctorCode;
    }
    public void setHospitalDoctorCode(String hospitalDoctorCode) {
        this.hospitalDoctorCode = hospitalDoctorCode;
    }
	@Column(name = "fetching_medicine_time")
    public Date getFetchingMedicineTime() {
        return fetchingMedicineTime;
    }
    public void setFetchingMedicineTime(Date fetchingMedicineTime) {
        this.fetchingMedicineTime = fetchingMedicineTime;
    }
	@Column(name = "delivery_time")
    public Date getDeliveryTime() {
        return deliveryTime;
    }
    public void setDeliveryTime(Date deliveryTime) {
        this.deliveryTime = deliveryTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java

@@ -0,0 +1,313 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 处方配送详情表实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_prescription_expressage_log")
public class WlyyPrescriptionExpressageLogDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 关联表wlyy_prescription id
	 */
	private String prescriptionId;
    /**
	 * 关联wlyy_prescription_expressage id
	 */
	private String expressageId;
    /**
	 * 路由节点产生的时间，格式：YYYY-MM-DD HH24:MM:SS，示例：2012-7-30 09:30:00。
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date acceptTime;
    /**
	 * 路由节点发生的城市
	 */
	private String acceptAddress;
    /**
	 * 路由节点操作码
	 */
	private String opCode;
    /**
	 * 路由节点具体描述
	 */
	private String acceptRemark;
    /**
	 * 备注
	 */
	private String remark;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
    /**
	 * 接收机构
	 */
	private String acceptHospital;
    /**
	 * 接收机构地址
	 */
	private String acceptHospitalAddress;
    /**
	 * 接收机构名称
	 */
	private String acceptHospitalName;
    /**
	 * 接收人
	 */
	private String acceptUser;
    /**
	 * 接收人名称
	 */
	private String acceptUserName;
    /**
	 * 接收人电话
	 */
	private String acceptUserMobile;
    /**
	 * 配送机构地址
	 */
	private String expressageHospitalAddress;
    /**
	 * 配送机构code
	 */
	private String expressageHospitalCode;
    /**
	 * 如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称
	 */
	private String expressageHospitalName;
    /**
	 * 配送人名称
	 */
	private String expressageUserName;
    /**
	 * 配送人code
	 */
	private String expressageUserCode;
    /**
	 * 开始配送时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date expressageTime;
    /**
	 * 配送人电话
	 */
	private String expressageUserMobile;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "prescription_id")
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
	@Column(name = "expressage_id")
    public String getExpressageId() {
        return expressageId;
    }
    public void setExpressageId(String expressageId) {
        this.expressageId = expressageId;
    }
	@Column(name = "accept_time")
    public Date getAcceptTime() {
        return acceptTime;
    }
    public void setAcceptTime(Date acceptTime) {
        this.acceptTime = acceptTime;
    }
	@Column(name = "accept_address")
    public String getAcceptAddress() {
        return acceptAddress;
    }
    public void setAcceptAddress(String acceptAddress) {
        this.acceptAddress = acceptAddress;
    }
	@Column(name = "op_code")
    public String getOpCode() {
        return opCode;
    }
    public void setOpCode(String opCode) {
        this.opCode = opCode;
    }
	@Column(name = "accept_remark")
    public String getAcceptRemark() {
        return acceptRemark;
    }
    public void setAcceptRemark(String acceptRemark) {
        this.acceptRemark = acceptRemark;
    }
	@Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
	@Column(name = "accept_hospital")
    public String getAcceptHospital() {
        return acceptHospital;
    }
    public void setAcceptHospital(String acceptHospital) {
        this.acceptHospital = acceptHospital;
    }
	@Column(name = "accept_hospital_address")
    public String getAcceptHospitalAddress() {
        return acceptHospitalAddress;
    }
    public void setAcceptHospitalAddress(String acceptHospitalAddress) {
        this.acceptHospitalAddress = acceptHospitalAddress;
    }
	@Column(name = "accept_hospital_name")
    public String getAcceptHospitalName() {
        return acceptHospitalName;
    }
    public void setAcceptHospitalName(String acceptHospitalName) {
        this.acceptHospitalName = acceptHospitalName;
    }
	@Column(name = "accept_user")
    public String getAcceptUser() {
        return acceptUser;
    }
    public void setAcceptUser(String acceptUser) {
        this.acceptUser = acceptUser;
    }
	@Column(name = "accept_user_name")
    public String getAcceptUserName() {
        return acceptUserName;
    }
    public void setAcceptUserName(String acceptUserName) {
        this.acceptUserName = acceptUserName;
    }
	@Column(name = "accept_user_mobile")
    public String getAcceptUserMobile() {
        return acceptUserMobile;
    }
    public void setAcceptUserMobile(String acceptUserMobile) {
        this.acceptUserMobile = acceptUserMobile;
    }
	@Column(name = "expressage_hospital_address")
    public String getExpressageHospitalAddress() {
        return expressageHospitalAddress;
    }
    public void setExpressageHospitalAddress(String expressageHospitalAddress) {
        this.expressageHospitalAddress = expressageHospitalAddress;
    }
	@Column(name = "expressage_hospital_code")
    public String getExpressageHospitalCode() {
        return expressageHospitalCode;
    }
    public void setExpressageHospitalCode(String expressageHospitalCode) {
        this.expressageHospitalCode = expressageHospitalCode;
    }
	@Column(name = "expressage_hospital_name")
    public String getExpressageHospitalName() {
        return expressageHospitalName;
    }
    public void setExpressageHospitalName(String expressageHospitalName) {
        this.expressageHospitalName = expressageHospitalName;
    }
	@Column(name = "expressage_user_name")
    public String getExpressageUserName() {
        return expressageUserName;
    }
    public void setExpressageUserName(String expressageUserName) {
        this.expressageUserName = expressageUserName;
    }
	@Column(name = "expressage_user_code")
    public String getExpressageUserCode() {
        return expressageUserCode;
    }
    public void setExpressageUserCode(String expressageUserCode) {
        this.expressageUserCode = expressageUserCode;
    }
	@Column(name = "expressage_time")
    public Date getExpressageTime() {
        return expressageTime;
    }
    public void setExpressageTime(Date expressageTime) {
        this.expressageTime = expressageTime;
    }
	@Column(name = "expressage_user_mobile")
    public String getExpressageUserMobile() {
        return expressageUserMobile;
    }
    public void setExpressageUserMobile(String expressageUserMobile) {
        this.expressageUserMobile = expressageUserMobile;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionInfoDO.java

@@ -0,0 +1,451 @@
package com.yihu.jw.entity.hospital.prescription;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 处方药品表实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_prescription_info")
public class WlyyPrescriptionInfoDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 处方code 关联表wlyy_prescription code
	 */
	private String prescriptionId;
    /**
	 * 药品code
	 */
	private String drugCode;
    /**
	 * 药品名称
	 */
	private String drugName;
    /**
	 * 科目类别编码
	 */
	private String subjectClass;
    /**
	 * 吃药频率
	 */
	private String drugRate;
    /**
	 * 药品规格
	 */
	private String drugFormat;
    /**
	 * 药品数目
	 */
	private Integer num;
    /**
	 * 是否冷藏 1是 0否
	 */
	private Integer isRefrigerate;
    /**
	 * 药品用法
	 */
	private String direction;
    /**
	 * 药品价格 单位是分
	 */
	private Integer price;
    /**
	 * 用药频次名称
	 */
	private String drugRateName;
    /**
	 * 备注
	 */
	private String remark;
    /**
	 * 皮试类型名称
	 */
	private String physicSkinTestName;
    /**
	 * 注射地点名称
	 */
	private String physicSkinTest;
    /**
	 * 注射地点名称
	 */
	private String physicInjectPlaceName;
    /**
	 * 注射地点编码
	 */
	private String physicInjectPlace;
    /**
	 * 总量单位名称
	 */
	private String physicAmountUnitName;
    /**
	 * 总量单位编码
	 */
	private String physicAmountUnit;
    /**
	 * 用药总量
	 */
	private String physicAmount;
    /**
	 * 剂量单位名称
	 */
	private String physicDoseUnitName;
    /**
	 * 剂量单位编码
	 */
	private String physicDoseUnit;
    /**
	 * 用药剂量
	 */
	private String physicDose;
    /**
	 * 用药方法名称
	 */
	private String usageName;
    /**
	 * 
	 */
	private String drugUsage;
    /**
	 * 用药天数
	 */
	private Integer dayCount;
    /**
	 * 成组标志, 0.非成组,1.成组
	 */
	private String bindFlag;
    /**
	 * 自付
	 */
	private Integer charge;
    /**
	 * 金额
	 */
	private Integer cost;
    /**
	 * 数量单位名称
	 */
	private String drugNumUnitName;
    /**
	 * 数量单位编码
	 */
	private String drugNumUnit;
    /**
	 * HIS子处方号
	 */
	private String jwSubCode;
    /**
	 * 1可用 0删除
	 */
	private Integer del;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "prescription_id")
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
	@Column(name = "drug_code")
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
	@Column(name = "drug_name")
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
	@Column(name = "subject_class")
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
	@Column(name = "drug_rate")
    public String getDrugRate() {
        return drugRate;
    }
    public void setDrugRate(String drugRate) {
        this.drugRate = drugRate;
    }
	@Column(name = "drug_format")
    public String getDrugFormat() {
        return drugFormat;
    }
    public void setDrugFormat(String drugFormat) {
        this.drugFormat = drugFormat;
    }
	@Column(name = "num")
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
	@Column(name = "is_refrigerate")
    public Integer getIsRefrigerate() {
        return isRefrigerate;
    }
    public void setIsRefrigerate(Integer isRefrigerate) {
        this.isRefrigerate = isRefrigerate;
    }
	@Column(name = "direction")
    public String getDirection() {
        return direction;
    }
    public void setDirection(String direction) {
        this.direction = direction;
    }
	@Column(name = "price")
    public Integer getPrice() {
        return price;
    }
    public void setPrice(Integer price) {
        this.price = price;
    }
	@Column(name = "drug_rate_name")
    public String getDrugRateName() {
        return drugRateName;
    }
    public void setDrugRateName(String drugRateName) {
        this.drugRateName = drugRateName;
    }
	@Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
	@Column(name = "physic_skin_test_name")
    public String getPhysicSkinTestName() {
        return physicSkinTestName;
    }
    public void setPhysicSkinTestName(String physicSkinTestName) {
        this.physicSkinTestName = physicSkinTestName;
    }
	@Column(name = "physic_skin_test")
    public String getPhysicSkinTest() {
        return physicSkinTest;
    }
    public void setPhysicSkinTest(String physicSkinTest) {
        this.physicSkinTest = physicSkinTest;
    }
	@Column(name = "physic_inject_place_name")
    public String getPhysicInjectPlaceName() {
        return physicInjectPlaceName;
    }
    public void setPhysicInjectPlaceName(String physicInjectPlaceName) {
        this.physicInjectPlaceName = physicInjectPlaceName;
    }
	@Column(name = "physic_inject_place")
    public String getPhysicInjectPlace() {
        return physicInjectPlace;
    }
    public void setPhysicInjectPlace(String physicInjectPlace) {
        this.physicInjectPlace = physicInjectPlace;
    }
	@Column(name = "physic_amount_unit_name")
    public String getPhysicAmountUnitName() {
        return physicAmountUnitName;
    }
    public void setPhysicAmountUnitName(String physicAmountUnitName) {
        this.physicAmountUnitName = physicAmountUnitName;
    }
	@Column(name = "physic_amount_unit")
    public String getPhysicAmountUnit() {
        return physicAmountUnit;
    }
    public void setPhysicAmountUnit(String physicAmountUnit) {
        this.physicAmountUnit = physicAmountUnit;
    }
	@Column(name = "physic_amount")
    public String getPhysicAmount() {
        return physicAmount;
    }
    public void setPhysicAmount(String physicAmount) {
        this.physicAmount = physicAmount;
    }
	@Column(name = "physic_dose_unit_name")
    public String getPhysicDoseUnitName() {
        return physicDoseUnitName;
    }
    public void setPhysicDoseUnitName(String physicDoseUnitName) {
        this.physicDoseUnitName = physicDoseUnitName;
    }
	@Column(name = "physic_dose_unit")
    public String getPhysicDoseUnit() {
        return physicDoseUnit;
    }
    public void setPhysicDoseUnit(String physicDoseUnit) {
        this.physicDoseUnit = physicDoseUnit;
    }
	@Column(name = "physic_dose")
    public String getPhysicDose() {
        return physicDose;
    }
    public void setPhysicDose(String physicDose) {
        this.physicDose = physicDose;
    }
	@Column(name = "usage_name")
    public String getUsageName() {
        return usageName;
    }
    public void setUsageName(String usageName) {
        this.usageName = usageName;
    }
	@Column(name = "drug_usage")
    public String getDrugUsage() {
        return drugUsage;
    }
    public void setDrugUsage(String drugUsage) {
        this.drugUsage = drugUsage;
    }
	@Column(name = "day_count")
    public Integer getDayCount() {
        return dayCount;
    }
    public void setDayCount(Integer dayCount) {
        this.dayCount = dayCount;
    }
	@Column(name = "bind_flag")
    public String getBindFlag() {
        return bindFlag;
    }
    public void setBindFlag(String bindFlag) {
        this.bindFlag = bindFlag;
    }
	@Column(name = "charge")
    public Integer getCharge() {
        return charge;
    }
    public void setCharge(Integer charge) {
        this.charge = charge;
    }
	@Column(name = "cost")
    public Integer getCost() {
        return cost;
    }
    public void setCost(Integer cost) {
        this.cost = cost;
    }
	@Column(name = "drug_num_unit_name")
    public String getDrugNumUnitName() {
        return drugNumUnitName;
    }
    public void setDrugNumUnitName(String drugNumUnitName) {
        this.drugNumUnitName = drugNumUnitName;
    }
	@Column(name = "drug_num_unit")
    public String getDrugNumUnit() {
        return drugNumUnit;
    }
    public void setDrugNumUnit(String drugNumUnit) {
        this.drugNumUnit = drugNumUnit;
    }
	@Column(name = "jw_sub_code")
    public String getJwSubCode() {
        return jwSubCode;
    }
    public void setJwSubCode(String jwSubCode) {
        this.jwSubCode = jwSubCode;
    }
	@Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionLogDO.java

@@ -0,0 +1,181 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 处方流程步骤记录表实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_prescription_log")
public class WlyyPrescriptionLogDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 处方code 关联表wlyy_prescription id
	 */
	private String prescriptionCode;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
    /**
	 * 类型: -1 失效 1HIS对接 2易联众对接  3创建处方 4 审核  5付款 6 配送 7完成 8物流对接
	 */
	private Integer type;
    /**
	 * (-2 患者自己取消 -1 审核不通过 , 0 审核中, 10 审核通过/待支付 ,21支付失败  20 配药中/支付成功, 21 等待领药 ,30 配送中 ,100配送成功/已完成)
	 */
	private Integer status;
    /**
	 * 医生或者患者code
	 */
	private String userCode;
    /**
	 * 医生或者患者name
	 */
	private String userName;
    /**
	 * 1 患者 2医生
	 */
	private Integer userType;
    /**
	 * 医院id
	 */
	private String hospital;
    /**
	 * 医院名称
	 */
	private String hospitalName;
    /**
	 * 操作是否成功 1成功 0失败
	 */
	private Integer flag;
    /**
	 * 备注信息
	 */
	private String remark;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "prescription_code")
    public String getPrescriptionCode() {
        return prescriptionCode;
    }
    public void setPrescriptionCode(String prescriptionCode) {
        this.prescriptionCode = prescriptionCode;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
	@Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
	@Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
	@Column(name = "user_code")
    public String getUserCode() {
        return userCode;
    }
    public void setUserCode(String userCode) {
        this.userCode = userCode;
    }
	@Column(name = "user_name")
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
	@Column(name = "user_type")
    public Integer getUserType() {
        return userType;
    }
    public void setUserType(Integer userType) {
        this.userType = userType;
    }
	@Column(name = "hospital")
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
	@Column(name = "hospital_name")
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
	@Column(name = "flag")
    public Integer getFlag() {
        return flag;
    }
    public void setFlag(Integer flag) {
        this.flag = flag;
    }
	@Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionReviewedDO.java

@@ -0,0 +1,195 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 处方审核记录表实体
*
* @author Administrator on  2019年05月16日
*
*/
@Entity
@Table(name = "wlyy_prescription_reviewed")
public class WlyyPrescriptionReviewedDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 处方id
	 */
	private String prescriptionId;
    /**
	 * 审核医院
	 */
	private String hospital;
    /**
	 * 审核医院名称
	 */
	private String hospitalName;
    /**
	 * 审核科室
	 */
	private String dept;
    /**
	 * 审核科室名称
	 */
	private String deptName;
    /**
	 * 审核医生
	 */
	private String doctor;
    /**
	 * 审核医生
	 */
	private String doctorName;
    /**
	 * 审核原因
	 */
	private String reason;
    /**
	 * 处方创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
    /**
	 * 1审核通过1 0待审核  -1  审核不通过   -2无效审核
	 */
	private Integer status;
    /**
	 * 备注
	 */
	private String remark;
    /**
	 * 审核时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date reviewedTime;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "prescription_id")
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
	@Column(name = "hospital")
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
	@Column(name = "hospital_name")
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
	@Column(name = "dept")
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
	@Column(name = "dept_name")
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
	@Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
	@Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
	@Column(name = "reason")
    public String getReason() {
        return reason;
    }
    public void setReason(String reason) {
        this.reason = reason;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
	@Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
	@Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
	@Column(name = "reviewed_time")
    public Date getReviewedTime() {
        return reviewedTime;
    }
    public void setReviewedTime(Date reviewedTime) {
        this.reviewedTime = reviewedTime;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -0,0 +1,91 @@
package com.yihu.jw.rm.hospital;
import com.yihu.jw.rm.base.BaseRequestMapping;
/**
 * Created by Trick on 2019/5/16.
 */
public class BaseHospitalRequestMapping {
    /**
     * 基础请求地址
     */
    private abstract static class Basic {
        public static final String CREATE =  "/create";
        public static final String DELETE = "/delete";
        public static final String UPDATE = "/update";
        public static final String PAGE = "/page";
        public static final String LIST = "/list";
        public static final String FINDBYID = "/findById";
        public static final String FIND_MODULE_BY_SAASID = "/findModuleBySaasId";
        public static final String STATUS = "/status";
    }
    public static class Prescription extends BaseHospitalRequestMapping.Basic {
        public static final String PREFIX  = "/prescription";
        /**
         * 原处方记录
         */
        public static final String findOriginPrescriptionList = "/getOriginPrescriptionList";
        /**
         * 获取原来处方详情
         */
        public static final String findOriginPrescription = "/getOriginPrescriptionInfo";
        /**
         * 续方记录
         */
        public static final String findPrescriptionList = "/findPrescriptionList";
        /**
         * 获取所有居民相关信息，续方信息，物流信息，药品信息
         */
        public static final String findPrescriptionInfo ="/findPrescriptionInfo";
        /**
         * 判断是否可续方
         */
        public static final String checkPrescription = "/checkPrescription";
        /**
         * 获取医生及号员信息
         */
        public static final String findDoctorList = "/findDoctorList";
        //支付+预约
        public static final String appointmentRevisit = "/appointmentRevisit";
        /**
         * 进入候诊室
         */
        public static final String enterWaitingRoom = "/enterWaitingRoom";
        /**
         * 进入诊疗室
         */
        public static final String enterConsultingRoom = "/enterConsultingRoom";
        /**
         * 居民取消续方
         */
        public static final String cancelPrescription ="/cancelPrescription";
        /**
         * 支付续方
         */
        public static final String payOrder = "/payOrder";
        /**
         * 转物流
         */
        public static final String switchExpress ="/switchExpress";
        /**
         * 评价医生
         */
        public static final String evaluateDoctor = "/evaluateDoctor";
        //确认收货
        public static final String confirmReceipt ="/confirmReceipt";
        //医生下诊断
        public static final String diagnose ="/diagnose";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/consult/WlyyDoctorClinicRoomVO.java

@@ -0,0 +1,171 @@
package com.yihu.jw.restmodel.hospital.consult;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 
 * 医生诊室vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyDoctorClinicRoomVO", description = "医生诊室")
public class WlyyDoctorClinicRoomVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 医院CODE
	 */
	@ApiModelProperty(value = "医院CODE", example = "模块1")
    private String hospital;
    /**
	 * 医院名称
	 */
	@ApiModelProperty(value = "医院名称", example = "模块1")
    private String hospitalName;
    /**
	 * 科室CODE
	 */
	@ApiModelProperty(value = "科室CODE", example = "模块1")
    private String dept;
    /**
	 * 科室名称
	 */
	@ApiModelProperty(value = "科室名称", example = "模块1")
    private String deptName;
    /**
	 * 医生CODE
	 */
	@ApiModelProperty(value = "医生CODE", example = "模块1")
    private String doctor;
    /**
	 * 医生名称
	 */
	@ApiModelProperty(value = "医生名称", example = "模块1")
    private String doctorName;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String clinicName;
    /**
	 * -1离线 0在线 1空闲 2接诊中
	 */
	@ApiModelProperty(value = "-1离线 0在线 1空闲 2接诊中", example = "模块1")
    private Integer clinicStatus;
    /**
	 * 日期 YYMMDD
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "日期 YYMMDD", example = "模块1")
    private Date date;
    /**
	 * 0删除 1有效
	 */
	@ApiModelProperty(value = "0删除 1有效", example = "模块1")
    private Integer status;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public String getClinicName() {
        return clinicName;
    }
    public void setClinicName(String clinicName) {
        this.clinicName = clinicName;
    }
    public Integer getClinicStatus() {
        return clinicStatus;
    }
    public void setClinicStatus(Integer clinicStatus) {
        this.clinicStatus = clinicStatus;
    }
    public Date getDate() {
        return date;
    }
    public void setDate(Date date) {
        this.date = date;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/consult/WlyyHospitalConsultPriceVO.java

@@ -0,0 +1,117 @@
package com.yihu.jw.restmodel.hospital.consult;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 
 * 医院咨询计费价目表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyHospitalConsultPriceVO", description = "医院咨询计费价目表")
public class WlyyHospitalConsultPriceVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 0图文 1视频
	 */
	@ApiModelProperty(value = "0图文 1视频", example = "模块1")
    private Integer type;
    /**
	 * 0按次收费 1计时收费 3固定时长收费 4
	 */
	@ApiModelProperty(value = "0按次收费 1计时收费 3固定时长收费 4", example = "模块1")
    private Integer payType;
    /**
	 * 服务科室
	 */
	@ApiModelProperty(value = "服务科室", example = "模块1")
    private String dept;
    /**
	 * 0专家 1主任 2医师
	 */
	@ApiModelProperty(value = "0专家 1主任 2医师", example = "模块1")
    private String doctorJob;
    /**
	 * 0帮扶医院、社区  1普通患者
	 */
	@ApiModelProperty(value = "0帮扶医院、社区  1普通患者", example = "模块1")
    private String serviceRange;
    /**
	 * 价格
	 */
	@ApiModelProperty(value = "价格", example = "模块1")
    private Integer price;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getPayType() {
        return payType;
    }
    public void setPayType(Integer payType) {
        this.payType = payType;
    }
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    public String getDoctorJob() {
        return doctorJob;
    }
    public void setDoctorJob(String doctorJob) {
        this.doctorJob = doctorJob;
    }
    public String getServiceRange() {
        return serviceRange;
    }
    public void setServiceRange(String serviceRange) {
        this.serviceRange = serviceRange;
    }
    public Integer getPrice() {
        return price;
    }
    public void setPrice(Integer price) {
        this.price = price;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/consult/WlyyHospitalReservationSettingVO.java

@@ -0,0 +1,247 @@
package com.yihu.jw.restmodel.hospital.consult;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 
 * vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyHospitalReservationSettingVO", description = "")
public class WlyyHospitalReservationSettingVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 城市id
	 */
	@ApiModelProperty(value = "城市id", example = "模块1")
    private String city;
    /**
	 * 城市名称
	 */
	@ApiModelProperty(value = "城市名称", example = "模块1")
    private String cityName;
    /**
	 * 行政区id
	 */
	@ApiModelProperty(value = "行政区id", example = "模块1")
    private String town;
    /**
	 * 行政区名称
	 */
	@ApiModelProperty(value = "行政区名称", example = "模块1")
    private String townName;
    /**
	 * 医院
	 */
	@ApiModelProperty(value = "医院", example = "模块1")
    private String hospital;
    /**
	 * 医院名称
	 */
	@ApiModelProperty(value = "医院名称", example = "模块1")
    private String hospitalName;
    /**
	 * 科室
	 */
	@ApiModelProperty(value = "科室", example = "模块1")
    private String dept;
    /**
	 * 科室名称
	 */
	@ApiModelProperty(value = "科室名称", example = "模块1")
    private String deptName;
    /**
	 * 复诊疾病范围
	 */
	@ApiModelProperty(value = "复诊疾病范围", example = "模块1")
    private String diseaseRange;
    /**
	 * 1图文 2视频 3图文+视频
	 */
	@ApiModelProperty(value = "1图文 2视频 3图文+视频", example = "模块1")
    private Integer consultType;
    /**
	 * 医生
	 */
	@ApiModelProperty(value = "医生", example = "模块1")
    private String doctor;
    /**
	 * 医生姓名
	 */
	@ApiModelProperty(value = "医生姓名", example = "模块1")
    private String doctorName;
    /**
	 * 0不可以预约 1可预约
	 */
	@ApiModelProperty(value = "0不可以预约 1可预约", example = "模块1")
    private Integer reservationStatus;
    /**
	 * 备注
	 */
	@ApiModelProperty(value = "备注", example = "模块1")
    private String remark;
    /**
	 * 医生职称CODE
	 */
	@ApiModelProperty(value = "医生职称CODE", example = "模块1")
    private String job;
    /**
	 * 医生职称名字
	 */
	@ApiModelProperty(value = "医生职称名字", example = "模块1")
    private String jobName;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getDiseaseRange() {
        return diseaseRange;
    }
    public void setDiseaseRange(String diseaseRange) {
        this.diseaseRange = diseaseRange;
    }
    public Integer getConsultType() {
        return consultType;
    }
    public void setConsultType(Integer consultType) {
        this.consultType = consultType;
    }
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public Integer getReservationStatus() {
        return reservationStatus;
    }
    public void setReservationStatus(Integer reservationStatus) {
        this.reservationStatus = reservationStatus;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getJob() {
        return job;
    }
    public void setJob(String job) {
        this.job = job;
    }
    public String getJobName() {
        return jobName;
    }
    public void setJobName(String jobName) {
        this.jobName = jobName;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/consult/WlyyHospitalSysDictVO.java

@@ -0,0 +1,117 @@
package com.yihu.jw.restmodel.hospital.consult;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 
 * 互联网医院功能业务字典及开关设置表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyHospitalSysDictVO", description = "互联网医院功能业务字典及开关设置表")
public class WlyyHospitalSysDictVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 所属字典
	 */
	@ApiModelProperty(value = "所属字典", example = "模块1")
    private String dictName;
    /**
	 * 字典项代码
	 */
	@ApiModelProperty(value = "字典项代码", example = "模块1")
    private String dictCode;
    /**
	 * 字典项所属值
	 */
	@ApiModelProperty(value = "字典项所属值", example = "模块1")
    private String dictValue;
    /**
	 * 拼音缩写码
	 */
	@ApiModelProperty(value = "拼音缩写码", example = "模块1")
    private String pyCode;
    /**
	 * 排序
	 */
	@ApiModelProperty(value = "排序", example = "模块1")
    private Integer sort;
    /**
	 * 归属社区CODE
	 */
	@ApiModelProperty(value = "归属社区CODE", example = "模块1")
    private String hospital;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getDictName() {
        return dictName;
    }
    public void setDictName(String dictName) {
        this.dictName = dictName;
    }
    public String getDictCode() {
        return dictCode;
    }
    public void setDictCode(String dictCode) {
        this.dictCode = dictCode;
    }
    public String getDictValue() {
        return dictValue;
    }
    public void setDictValue(String dictValue) {
        this.dictValue = dictValue;
    }
    public String getPyCode() {
        return pyCode;
    }
    public void setPyCode(String pyCode) {
        this.pyCode = pyCode;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/consult/WlyyHospitalWaitingRoomVO.java

@@ -0,0 +1,145 @@
package com.yihu.jw.restmodel.hospital.consult;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 
 * 候诊室vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyHospitalWaitingRoomVO", description = "候诊室")
public class WlyyHospitalWaitingRoomVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 诊室ID
	 */
	@ApiModelProperty(value = "诊室ID", example = "模块1")
    private String clinicroomId;
    /**
	 * 居民ID
	 */
	@ApiModelProperty(value = "居民ID", example = "模块1")
    private String patientId;
    /**
	 * 居民姓名
	 */
	@ApiModelProperty(value = "居民姓名", example = "模块1")
    private String patientName;
    /**
	 * 0离线 1在线(候诊) 2已诊
	 */
	@ApiModelProperty(value = "0离线 1在线(候诊) 2已诊", example = "模块1")
    private Integer visitStatus;
    /**
	 * 预约时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "预约时间", example = "模块1")
    private Date reservationTime;
    /**
	 * 排序
	 */
	@ApiModelProperty(value = "排序", example = "模块1")
    private Integer sort;
    /**
	 * 门诊类型: 1续方复诊 2协同门诊
	 */
	@ApiModelProperty(value = "门诊类型: 1续方复诊 2协同门诊", example = "模块1")
    private Integer reservationType;
    /**
	 * 咨询类型: 1图文 2视频 3图文+视频
	 */
	@ApiModelProperty(value = "咨询类型: 1图文 2视频 3图文+视频", example = "模块1")
    private Integer consultTpye;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getClinicroomId() {
        return clinicroomId;
    }
    public void setClinicroomId(String clinicroomId) {
        this.clinicroomId = clinicroomId;
    }
    public String getPatientId() {
        return patientId;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    }
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    public Integer getVisitStatus() {
        return visitStatus;
    }
    public void setVisitStatus(Integer visitStatus) {
        this.visitStatus = visitStatus;
    }
    public Date getReservationTime() {
        return reservationTime;
    }
    public void setReservationTime(Date reservationTime) {
        this.reservationTime = reservationTime;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public Integer getReservationType() {
        return reservationType;
    }
    public void setReservationType(Integer reservationType) {
        this.reservationType = reservationType;
    }
    public Integer getConsultTpye() {
        return consultTpye;
    }
    public void setConsultTpye(Integer consultTpye) {
        this.consultTpye = consultTpye;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionDiagnosisVO.java

@@ -0,0 +1,119 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 
 * 处方诊断表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyPrescriptionDiagnosisVO", description = "处方诊断表")
public class WlyyPrescriptionDiagnosisVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 关联处方
	 */
	@ApiModelProperty(value = "关联处方", example = "模块1")
    private String prescriptionId;
    /**
	 * 诊断结果名称
	 */
	@ApiModelProperty(value = "诊断结果名称", example = "模块1")
    private String name;
    /**
	 * 健康问题名称
	 */
	@ApiModelProperty(value = "健康问题名称", example = "模块1")
    private String healthProblemName;
    /**
	 * 健康问题编码
	 */
	@ApiModelProperty(value = "健康问题编码", example = "模块1")
    private String healthProblem;
    /**
	 * 1主诊断 2次诊断
	 */
	@ApiModelProperty(value = "1主诊断 2次诊断", example = "模块1")
    private Integer type;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getHealthProblemName() {
        return healthProblemName;
    }
    public void setHealthProblemName(String healthProblemName) {
        this.healthProblemName = healthProblemName;
    }
    public String getHealthProblem() {
        return healthProblem;
    }
    public void setHealthProblem(String healthProblem) {
        this.healthProblem = healthProblem;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionExpressageLogVO.java

@@ -0,0 +1,316 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 
 * 处方配送详情表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyPrescriptionExpressageLogVO", description = "处方配送详情表")
public class WlyyPrescriptionExpressageLogVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 关联表wlyy_prescription id
	 */
	@ApiModelProperty(value = "关联表wlyy_prescription id", example = "模块1")
    private String prescriptionId;
    /**
	 * 关联wlyy_prescription_expressage id
	 */
	@ApiModelProperty(value = "关联wlyy_prescription_expressage id", example = "模块1")
    private String expressageId;
    /**
	 * 路由节点产生的时间，格式：YYYY-MM-DD HH24:MM:SS，示例：2012-7-30 09:30:00。
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "路由节点产生的时间，格式：YYYY-MM-DD HH24:MM:SS，示例：2012-7-30 09:30:00。", example = "模块1")
    private Date acceptTime;
    /**
	 * 路由节点发生的城市
	 */
	@ApiModelProperty(value = "路由节点发生的城市", example = "模块1")
    private String acceptAddress;
    /**
	 * 路由节点操作码
	 */
	@ApiModelProperty(value = "路由节点操作码", example = "模块1")
    private String opCode;
    /**
	 * 路由节点具体描述
	 */
	@ApiModelProperty(value = "路由节点具体描述", example = "模块1")
    private String acceptRemark;
    /**
	 * 备注
	 */
	@ApiModelProperty(value = "备注", example = "模块1")
    private String remark;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
    /**
	 * 接收机构
	 */
	@ApiModelProperty(value = "接收机构", example = "模块1")
    private String acceptHospital;
    /**
	 * 接收机构地址
	 */
	@ApiModelProperty(value = "接收机构地址", example = "模块1")
    private String acceptHospitalAddress;
    /**
	 * 接收机构名称
	 */
	@ApiModelProperty(value = "接收机构名称", example = "模块1")
    private String acceptHospitalName;
    /**
	 * 接收人
	 */
	@ApiModelProperty(value = "接收人", example = "模块1")
    private String acceptUser;
    /**
	 * 接收人名称
	 */
	@ApiModelProperty(value = "接收人名称", example = "模块1")
    private String acceptUserName;
    /**
	 * 接收人电话
	 */
	@ApiModelProperty(value = "接收人电话", example = "模块1")
    private String acceptUserMobile;
    /**
	 * 配送机构地址
	 */
	@ApiModelProperty(value = "配送机构地址", example = "模块1")
    private String expressageHospitalAddress;
    /**
	 * 配送机构code
	 */
	@ApiModelProperty(value = "配送机构code", example = "模块1")
    private String expressageHospitalCode;
    /**
	 * 如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称
	 */
	@ApiModelProperty(value = "如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称", example = "模块1")
    private String expressageHospitalName;
    /**
	 * 配送人名称
	 */
	@ApiModelProperty(value = "配送人名称", example = "模块1")
    private String expressageUserName;
    /**
	 * 配送人code
	 */
	@ApiModelProperty(value = "配送人code", example = "模块1")
    private String expressageUserCode;
    /**
	 * 开始配送时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "开始配送时间", example = "模块1")
    private Date expressageTime;
    /**
	 * 配送人电话
	 */
	@ApiModelProperty(value = "配送人电话", example = "模块1")
    private String expressageUserMobile;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
    public String getExpressageId() {
        return expressageId;
    }
    public void setExpressageId(String expressageId) {
        this.expressageId = expressageId;
    }
    public Date getAcceptTime() {
        return acceptTime;
    }
    public void setAcceptTime(Date acceptTime) {
        this.acceptTime = acceptTime;
    }
    public String getAcceptAddress() {
        return acceptAddress;
    }
    public void setAcceptAddress(String acceptAddress) {
        this.acceptAddress = acceptAddress;
    }
    public String getOpCode() {
        return opCode;
    }
    public void setOpCode(String opCode) {
        this.opCode = opCode;
    }
    public String getAcceptRemark() {
        return acceptRemark;
    }
    public void setAcceptRemark(String acceptRemark) {
        this.acceptRemark = acceptRemark;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getAcceptHospital() {
        return acceptHospital;
    }
    public void setAcceptHospital(String acceptHospital) {
        this.acceptHospital = acceptHospital;
    }
    public String getAcceptHospitalAddress() {
        return acceptHospitalAddress;
    }
    public void setAcceptHospitalAddress(String acceptHospitalAddress) {
        this.acceptHospitalAddress = acceptHospitalAddress;
    }
    public String getAcceptHospitalName() {
        return acceptHospitalName;
    }
    public void setAcceptHospitalName(String acceptHospitalName) {
        this.acceptHospitalName = acceptHospitalName;
    }
    public String getAcceptUser() {
        return acceptUser;
    }
    public void setAcceptUser(String acceptUser) {
        this.acceptUser = acceptUser;
    }
    public String getAcceptUserName() {
        return acceptUserName;
    }
    public void setAcceptUserName(String acceptUserName) {
        this.acceptUserName = acceptUserName;
    }
    public String getAcceptUserMobile() {
        return acceptUserMobile;
    }
    public void setAcceptUserMobile(String acceptUserMobile) {
        this.acceptUserMobile = acceptUserMobile;
    }
    public String getExpressageHospitalAddress() {
        return expressageHospitalAddress;
    }
    public void setExpressageHospitalAddress(String expressageHospitalAddress) {
        this.expressageHospitalAddress = expressageHospitalAddress;
    }
    public String getExpressageHospitalCode() {
        return expressageHospitalCode;
    }
    public void setExpressageHospitalCode(String expressageHospitalCode) {
        this.expressageHospitalCode = expressageHospitalCode;
    }
    public String getExpressageHospitalName() {
        return expressageHospitalName;
    }
    public void setExpressageHospitalName(String expressageHospitalName) {
        this.expressageHospitalName = expressageHospitalName;
    }
    public String getExpressageUserName() {
        return expressageUserName;
    }
    public void setExpressageUserName(String expressageUserName) {
        this.expressageUserName = expressageUserName;
    }
    public String getExpressageUserCode() {
        return expressageUserCode;
    }
    public void setExpressageUserCode(String expressageUserCode) {
        this.expressageUserCode = expressageUserCode;
    }
    public Date getExpressageTime() {
        return expressageTime;
    }
    public void setExpressageTime(Date expressageTime) {
        this.expressageTime = expressageTime;
    }
    public String getExpressageUserMobile() {
        return expressageUserMobile;
    }
    public void setExpressageUserMobile(String expressageUserMobile) {
        this.expressageUserMobile = expressageUserMobile;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionExpressageVO.java

@@ -0,0 +1,617 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 
 * 处方物流表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyPrescriptionExpressageVO", description = "处方物流表")
public class WlyyPrescriptionExpressageVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 关联wlyy_wlyy_prescription id
	 */
	@ApiModelProperty(value = "关联wlyy_wlyy_prescription id", example = "模块1")
    private String prescriptionId;
    /**
	 * 快递单号
	 */
	@ApiModelProperty(value = "快递单号", example = "模块1")
    private String mailno;
    /**
	 * 收货人名称
	 */
	@ApiModelProperty(value = "收货人名称", example = "模块1")
    private String name;
    /**
	 * 收货人手机号码 13606078123
	 */
	@ApiModelProperty(value = "收货人手机号码 13606078123", example = "模块1")
    private String mobile;
    /**
	 * 收货人座机号 0592-1111111
	 */
	@ApiModelProperty(value = "收货人座机号 0592-1111111", example = "模块1")
    private String phone;
    /**
	 * 收货人详细地址
	 */
	@ApiModelProperty(value = "收货人详细地址", example = "模块1")
    private String address;
    /**
	 * 省代码
	 */
	@ApiModelProperty(value = "省代码", example = "模块1")
    private String provinceCode;
    /**
	 * 省名称
	 */
	@ApiModelProperty(value = "省名称", example = "模块1")
    private String provinceName;
    /**
	 * 市代码
	 */
	@ApiModelProperty(value = "市代码", example = "模块1")
    private String cityCode;
    /**
	 * 市名称
	 */
	@ApiModelProperty(value = "市名称", example = "模块1")
    private String cityName;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String townCode;
    /**
	 * 区名称
	 */
	@ApiModelProperty(value = "区名称", example = "模块1")
    private String townName;
    /**
	 * 街道code
	 */
	@ApiModelProperty(value = "街道code", example = "模块1")
    private String streetCode;
    /**
	 * 街道名称
	 */
	@ApiModelProperty(value = "街道名称", example = "模块1")
    private String streetName;
    /**
	 * 配药机构code
	 */
	@ApiModelProperty(value = "配药机构code", example = "模块1")
    private String hospitalCode;
    /**
	 * 配药机构名称
	 */
	@ApiModelProperty(value = "配药机构名称", example = "模块1")
    private String hospitalName;
    /**
	 * 配药机构地址
	 */
	@ApiModelProperty(value = "配药机构地址", example = "模块1")
    private String hospitalAddress;
    /**
	 * 重量   单位是克
	 */
	@ApiModelProperty(value = "重量   单位是克", example = "模块1")
    private Integer weight;
    /**
	 * 快递的配送费用
	 */
	@ApiModelProperty(value = "快递的配送费用", example = "模块1")
    private Integer price;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
    /**
	 * 是否自取 1是 0否
	 */
	@ApiModelProperty(value = "是否自取 1是 0否", example = "模块1")
    private Integer oneselfPickupFlg;
    /**
	 * 备注
	 */
	@ApiModelProperty(value = "备注", example = "模块1")
    private String remark;
    /**
	 * 配送机构地址
	 */
	@ApiModelProperty(value = "配送机构地址", example = "模块1")
    private String expressageHospitalAddress;
    /**
	 * 配送机构code
	 */
	@ApiModelProperty(value = "配送机构code", example = "模块1")
    private String expressageHospitalCode;
    /**
	 * 如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称
	 */
	@ApiModelProperty(value = "如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称", example = "模块1")
    private String expressageHospitalName;
    /**
	 * 配送人名称
	 */
	@ApiModelProperty(value = "配送人名称", example = "模块1")
    private String expressageName;
    /**
	 * 配送人code
	 */
	@ApiModelProperty(value = "配送人code", example = "模块1")
    private String expressageCode;
    /**
	 * 开始配送时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "开始配送时间", example = "模块1")
    private Date expressageTime;
    /**
	 * 配送人电话
	 */
	@ApiModelProperty(value = "配送人电话", example = "模块1")
    private String expressageMobile;
    /**
	 * 1可用 0删除
	 */
	@ApiModelProperty(value = "1可用 0删除", example = "模块1")
    private Integer del;
    /**
	 * 接收人电话
	 */
	@ApiModelProperty(value = "接收人电话", example = "模块1")
    private String acceptMobile;
    /**
	 * 接收人code
	 */
	@ApiModelProperty(value = "接收人code", example = "模块1")
    private String acceptCode;
    /**
	 * 接收人名称
	 */
	@ApiModelProperty(value = "接收人名称", example = "模块1")
    private String acceptName;
    /**
	 * 接收人所属的机构code
	 */
	@ApiModelProperty(value = "接收人所属的机构code", example = "模块1")
    private String acceptHospital;
    /**
	 * 接收人所属机构名称
	 */
	@ApiModelProperty(value = "接收人所属机构名称", example = "模块1")
    private String acceptHospitalName;
    /**
	 * 接受时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "接受时间", example = "模块1")
    private Date acceptTime;
    /**
	 * 患者填写的需要送达的机构地址
	 */
	@ApiModelProperty(value = "患者填写的需要送达的机构地址", example = "模块1")
    private String patientHospitalAddress;
    /**
	 * 患者填写的需要送达的机构名称
	 */
	@ApiModelProperty(value = "患者填写的需要送达的机构名称", example = "模块1")
    private String patientHospitalName;
    /**
	 * 患者填写的需要送达的机构code
	 */
	@ApiModelProperty(value = "患者填写的需要送达的机构code", example = "模块1")
    private String patientHospitalCode;
    /**
	 * 接收机构地址
	 */
	@ApiModelProperty(value = "接收机构地址", example = "模块1")
    private String acceptHospitalAddress;
    /**
	 * 配药机构出药人（健管师或者称工作人员）
	 */
	@ApiModelProperty(value = "配药机构出药人（健管师或者称工作人员）", example = "模块1")
    private String hospitalDoctor;
    /**
	 * 配药机构出药人code
	 */
	@ApiModelProperty(value = "配药机构出药人code", example = "模块1")
    private String hospitalDoctorCode;
    /**
	 * 配药机构出药时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "配药机构出药时间", example = "模块1")
    private Date fetchingMedicineTime;
    /**
	 * 
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "", example = "模块1")
    private Date deliveryTime;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
    public String getMailno() {
        return mailno;
    }
    public void setMailno(String mailno) {
        this.mailno = mailno;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public String getProvinceCode() {
        return provinceCode;
    }
    public void setProvinceCode(String provinceCode) {
        this.provinceCode = provinceCode;
    }
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    public String getCityCode() {
        return cityCode;
    }
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getTownCode() {
        return townCode;
    }
    public void setTownCode(String townCode) {
        this.townCode = townCode;
    }
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    public String getStreetCode() {
        return streetCode;
    }
    public void setStreetCode(String streetCode) {
        this.streetCode = streetCode;
    }
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
    public String getHospitalCode() {
        return hospitalCode;
    }
    public void setHospitalCode(String hospitalCode) {
        this.hospitalCode = hospitalCode;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getHospitalAddress() {
        return hospitalAddress;
    }
    public void setHospitalAddress(String hospitalAddress) {
        this.hospitalAddress = hospitalAddress;
    }
    public Integer getWeight() {
        return weight;
    }
    public void setWeight(Integer weight) {
        this.weight = weight;
    }
    public Integer getPrice() {
        return price;
    }
    public void setPrice(Integer price) {
        this.price = price;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public Integer getOneselfPickupFlg() {
        return oneselfPickupFlg;
    }
    public void setOneselfPickupFlg(Integer oneselfPickupFlg) {
        this.oneselfPickupFlg = oneselfPickupFlg;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getExpressageHospitalAddress() {
        return expressageHospitalAddress;
    }
    public void setExpressageHospitalAddress(String expressageHospitalAddress) {
        this.expressageHospitalAddress = expressageHospitalAddress;
    }
    public String getExpressageHospitalCode() {
        return expressageHospitalCode;
    }
    public void setExpressageHospitalCode(String expressageHospitalCode) {
        this.expressageHospitalCode = expressageHospitalCode;
    }
    public String getExpressageHospitalName() {
        return expressageHospitalName;
    }
    public void setExpressageHospitalName(String expressageHospitalName) {
        this.expressageHospitalName = expressageHospitalName;
    }
    public String getExpressageName() {
        return expressageName;
    }
    public void setExpressageName(String expressageName) {
        this.expressageName = expressageName;
    }
    public String getExpressageCode() {
        return expressageCode;
    }
    public void setExpressageCode(String expressageCode) {
        this.expressageCode = expressageCode;
    }
    public Date getExpressageTime() {
        return expressageTime;
    }
    public void setExpressageTime(Date expressageTime) {
        this.expressageTime = expressageTime;
    }
    public String getExpressageMobile() {
        return expressageMobile;
    }
    public void setExpressageMobile(String expressageMobile) {
        this.expressageMobile = expressageMobile;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public String getAcceptMobile() {
        return acceptMobile;
    }
    public void setAcceptMobile(String acceptMobile) {
        this.acceptMobile = acceptMobile;
    }
    public String getAcceptCode() {
        return acceptCode;
    }
    public void setAcceptCode(String acceptCode) {
        this.acceptCode = acceptCode;
    }
    public String getAcceptName() {
        return acceptName;
    }
    public void setAcceptName(String acceptName) {
        this.acceptName = acceptName;
    }
    public String getAcceptHospital() {
        return acceptHospital;
    }
    public void setAcceptHospital(String acceptHospital) {
        this.acceptHospital = acceptHospital;
    }
    public String getAcceptHospitalName() {
        return acceptHospitalName;
    }
    public void setAcceptHospitalName(String acceptHospitalName) {
        this.acceptHospitalName = acceptHospitalName;
    }
    public Date getAcceptTime() {
        return acceptTime;
    }
    public void setAcceptTime(Date acceptTime) {
        this.acceptTime = acceptTime;
    }
    public String getPatientHospitalAddress() {
        return patientHospitalAddress;
    }
    public void setPatientHospitalAddress(String patientHospitalAddress) {
        this.patientHospitalAddress = patientHospitalAddress;
    }
    public String getPatientHospitalName() {
        return patientHospitalName;
    }
    public void setPatientHospitalName(String patientHospitalName) {
        this.patientHospitalName = patientHospitalName;
    }
    public String getPatientHospitalCode() {
        return patientHospitalCode;
    }
    public void setPatientHospitalCode(String patientHospitalCode) {
        this.patientHospitalCode = patientHospitalCode;
    }
    public String getAcceptHospitalAddress() {
        return acceptHospitalAddress;
    }
    public void setAcceptHospitalAddress(String acceptHospitalAddress) {
        this.acceptHospitalAddress = acceptHospitalAddress;
    }
    public String getHospitalDoctor() {
        return hospitalDoctor;
    }
    public void setHospitalDoctor(String hospitalDoctor) {
        this.hospitalDoctor = hospitalDoctor;
    }
    public String getHospitalDoctorCode() {
        return hospitalDoctorCode;
    }
    public void setHospitalDoctorCode(String hospitalDoctorCode) {
        this.hospitalDoctorCode = hospitalDoctorCode;
    }
    public Date getFetchingMedicineTime() {
        return fetchingMedicineTime;
    }
    public void setFetchingMedicineTime(Date fetchingMedicineTime) {
        this.fetchingMedicineTime = fetchingMedicineTime;
    }
    public Date getDeliveryTime() {
        return deliveryTime;
    }
    public void setDeliveryTime(Date deliveryTime) {
        this.deliveryTime = deliveryTime;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionInfoVO.java

@@ -0,0 +1,455 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 
 * 处方药品表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyPrescriptionInfoVO", description = "处方药品表")
public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 处方code 关联表wlyy_prescription code
	 */
	@ApiModelProperty(value = "处方code 关联表wlyy_prescription code", example = "模块1")
    private String prescriptionId;
    /**
	 * 药品code
	 */
	@ApiModelProperty(value = "药品code", example = "模块1")
    private String drugCode;
    /**
	 * 药品名称
	 */
	@ApiModelProperty(value = "药品名称", example = "模块1")
    private String drugName;
    /**
	 * 科目类别编码
	 */
	@ApiModelProperty(value = "科目类别编码", example = "模块1")
    private String subjectClass;
    /**
	 * 吃药频率
	 */
	@ApiModelProperty(value = "吃药频率", example = "模块1")
    private String drugRate;
    /**
	 * 药品规格
	 */
	@ApiModelProperty(value = "药品规格", example = "模块1")
    private String drugFormat;
    /**
	 * 药品数目
	 */
	@ApiModelProperty(value = "药品数目", example = "模块1")
    private Integer num;
    /**
	 * 是否冷藏 1是 0否
	 */
	@ApiModelProperty(value = "是否冷藏 1是 0否", example = "模块1")
    private Integer isRefrigerate;
    /**
	 * 药品用法
	 */
	@ApiModelProperty(value = "药品用法", example = "模块1")
    private String direction;
    /**
	 * 药品价格 单位是分
	 */
	@ApiModelProperty(value = "药品价格 单位是分", example = "模块1")
    private Integer price;
    /**
	 * 用药频次名称
	 */
	@ApiModelProperty(value = "用药频次名称", example = "模块1")
    private String drugRateName;
    /**
	 * 备注
	 */
	@ApiModelProperty(value = "备注", example = "模块1")
    private String remark;
    /**
	 * 皮试类型名称
	 */
	@ApiModelProperty(value = "皮试类型名称", example = "模块1")
    private String physicSkinTestName;
    /**
	 * 注射地点名称
	 */
	@ApiModelProperty(value = "注射地点名称", example = "模块1")
    private String physicSkinTest;
    /**
	 * 注射地点名称
	 */
	@ApiModelProperty(value = "注射地点名称", example = "模块1")
    private String physicInjectPlaceName;
    /**
	 * 注射地点编码
	 */
	@ApiModelProperty(value = "注射地点编码", example = "模块1")
    private String physicInjectPlace;
    /**
	 * 总量单位名称
	 */
	@ApiModelProperty(value = "总量单位名称", example = "模块1")
    private String physicAmountUnitName;
    /**
	 * 总量单位编码
	 */
	@ApiModelProperty(value = "总量单位编码", example = "模块1")
    private String physicAmountUnit;
    /**
	 * 用药总量
	 */
	@ApiModelProperty(value = "用药总量", example = "模块1")
    private String physicAmount;
    /**
	 * 剂量单位名称
	 */
	@ApiModelProperty(value = "剂量单位名称", example = "模块1")
    private String physicDoseUnitName;
    /**
	 * 剂量单位编码
	 */
	@ApiModelProperty(value = "剂量单位编码", example = "模块1")
    private String physicDoseUnit;
    /**
	 * 用药剂量
	 */
	@ApiModelProperty(value = "用药剂量", example = "模块1")
    private String physicDose;
    /**
	 * 用药方法名称
	 */
	@ApiModelProperty(value = "用药方法名称", example = "模块1")
    private String usageName;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String drugUsage;
    /**
	 * 用药天数
	 */
	@ApiModelProperty(value = "用药天数", example = "模块1")
    private Integer dayCount;
    /**
	 * 成组标志, 0.非成组,1.成组
	 */
	@ApiModelProperty(value = "成组标志, 0.非成组,1.成组", example = "模块1")
    private String bindFlag;
    /**
	 * 自付
	 */
	@ApiModelProperty(value = "自付", example = "模块1")
    private Integer charge;
    /**
	 * 金额
	 */
	@ApiModelProperty(value = "金额", example = "模块1")
    private Integer cost;
    /**
	 * 数量单位名称
	 */
	@ApiModelProperty(value = "数量单位名称", example = "模块1")
    private String drugNumUnitName;
    /**
	 * 数量单位编码
	 */
	@ApiModelProperty(value = "数量单位编码", example = "模块1")
    private String drugNumUnit;
    /**
	 * HIS子处方号
	 */
	@ApiModelProperty(value = "HIS子处方号", example = "模块1")
    private String jwSubCode;
    /**
	 * 1可用 0删除
	 */
	@ApiModelProperty(value = "1可用 0删除", example = "模块1")
    private Integer del;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
    public String getDrugRate() {
        return drugRate;
    }
    public void setDrugRate(String drugRate) {
        this.drugRate = drugRate;
    }
    public String getDrugFormat() {
        return drugFormat;
    }
    public void setDrugFormat(String drugFormat) {
        this.drugFormat = drugFormat;
    }
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public Integer getIsRefrigerate() {
        return isRefrigerate;
    }
    public void setIsRefrigerate(Integer isRefrigerate) {
        this.isRefrigerate = isRefrigerate;
    }
    public String getDirection() {
        return direction;
    }
    public void setDirection(String direction) {
        this.direction = direction;
    }
    public Integer getPrice() {
        return price;
    }
    public void setPrice(Integer price) {
        this.price = price;
    }
    public String getDrugRateName() {
        return drugRateName;
    }
    public void setDrugRateName(String drugRateName) {
        this.drugRateName = drugRateName;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getPhysicSkinTestName() {
        return physicSkinTestName;
    }
    public void setPhysicSkinTestName(String physicSkinTestName) {
        this.physicSkinTestName = physicSkinTestName;
    }
    public String getPhysicSkinTest() {
        return physicSkinTest;
    }
    public void setPhysicSkinTest(String physicSkinTest) {
        this.physicSkinTest = physicSkinTest;
    }
    public String getPhysicInjectPlaceName() {
        return physicInjectPlaceName;
    }
    public void setPhysicInjectPlaceName(String physicInjectPlaceName) {
        this.physicInjectPlaceName = physicInjectPlaceName;
    }
    public String getPhysicInjectPlace() {
        return physicInjectPlace;
    }
    public void setPhysicInjectPlace(String physicInjectPlace) {
        this.physicInjectPlace = physicInjectPlace;
    }
    public String getPhysicAmountUnitName() {
        return physicAmountUnitName;
    }
    public void setPhysicAmountUnitName(String physicAmountUnitName) {
        this.physicAmountUnitName = physicAmountUnitName;
    }
    public String getPhysicAmountUnit() {
        return physicAmountUnit;
    }
    public void setPhysicAmountUnit(String physicAmountUnit) {
        this.physicAmountUnit = physicAmountUnit;
    }
    public String getPhysicAmount() {
        return physicAmount;
    }
    public void setPhysicAmount(String physicAmount) {
        this.physicAmount = physicAmount;
    }
    public String getPhysicDoseUnitName() {
        return physicDoseUnitName;
    }
    public void setPhysicDoseUnitName(String physicDoseUnitName) {
        this.physicDoseUnitName = physicDoseUnitName;
    }
    public String getPhysicDoseUnit() {
        return physicDoseUnit;
    }
    public void setPhysicDoseUnit(String physicDoseUnit) {
        this.physicDoseUnit = physicDoseUnit;
    }
    public String getPhysicDose() {
        return physicDose;
    }
    public void setPhysicDose(String physicDose) {
        this.physicDose = physicDose;
    }
    public String getUsageName() {
        return usageName;
    }
    public void setUsageName(String usageName) {
        this.usageName = usageName;
    }
    public String getDrugUsage() {
        return drugUsage;
    }
    public void setDrugUsage(String drugUsage) {
        this.drugUsage = drugUsage;
    }
    public Integer getDayCount() {
        return dayCount;
    }
    public void setDayCount(Integer dayCount) {
        this.dayCount = dayCount;
    }
    public String getBindFlag() {
        return bindFlag;
    }
    public void setBindFlag(String bindFlag) {
        this.bindFlag = bindFlag;
    }
    public Integer getCharge() {
        return charge;
    }
    public void setCharge(Integer charge) {
        this.charge = charge;
    }
    public Integer getCost() {
        return cost;
    }
    public void setCost(Integer cost) {
        this.cost = cost;
    }
    public String getDrugNumUnitName() {
        return drugNumUnitName;
    }
    public void setDrugNumUnitName(String drugNumUnitName) {
        this.drugNumUnitName = drugNumUnitName;
    }
    public String getDrugNumUnit() {
        return drugNumUnit;
    }
    public void setDrugNumUnit(String drugNumUnit) {
        this.drugNumUnit = drugNumUnit;
    }
    public String getJwSubCode() {
        return jwSubCode;
    }
    public void setJwSubCode(String jwSubCode) {
        this.jwSubCode = jwSubCode;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionLogVO.java

@@ -0,0 +1,184 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 
 * 处方流程步骤记录表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyPrescriptionLogVO", description = "处方流程步骤记录表")
public class WlyyPrescriptionLogVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 处方code 关联表wlyy_prescription id
	 */
	@ApiModelProperty(value = "处方code 关联表wlyy_prescription id", example = "模块1")
    private String prescriptionCode;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
    /**
	 * 类型: -1 失效 1HIS对接 2易联众对接  3创建处方 4 审核  5付款 6 配送 7完成 8物流对接
	 */
	@ApiModelProperty(value = "类型: -1 失效 1HIS对接 2易联众对接  3创建处方 4 审核  5付款 6 配送 7完成 8物流对接", example = "模块1")
    private Integer type;
    /**
	 * (-2 患者自己取消 -1 审核不通过 , 0 审核中, 10 审核通过/待支付 ,21支付失败  20 配药中/支付成功, 21 等待领药 ,30 配送中 ,100配送成功/已完成)
	 */
	@ApiModelProperty(value = "(-2 患者自己取消 -1 审核不通过 , 0 审核中, 10 审核通过/待支付 ,21支付失败  20 配药中/支付成功, 21 等待领药 ,30 配送中 ,100配送成功/已完成)", example = "模块1")
    private Integer status;
    /**
	 * 医生或者患者code
	 */
	@ApiModelProperty(value = "医生或者患者code", example = "模块1")
    private String userCode;
    /**
	 * 医生或者患者name
	 */
	@ApiModelProperty(value = "医生或者患者name", example = "模块1")
    private String userName;
    /**
	 * 1 患者 2医生
	 */
	@ApiModelProperty(value = "1 患者 2医生", example = "模块1")
    private Integer userType;
    /**
	 * 医院id
	 */
	@ApiModelProperty(value = "医院id", example = "模块1")
    private String hospital;
    /**
	 * 医院名称
	 */
	@ApiModelProperty(value = "医院名称", example = "模块1")
    private String hospitalName;
    /**
	 * 操作是否成功 1成功 0失败
	 */
	@ApiModelProperty(value = "操作是否成功 1成功 0失败", example = "模块1")
    private Integer flag;
    /**
	 * 备注信息
	 */
	@ApiModelProperty(value = "备注信息", example = "模块1")
    private String remark;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPrescriptionCode() {
        return prescriptionCode;
    }
    public void setPrescriptionCode(String prescriptionCode) {
        this.prescriptionCode = prescriptionCode;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getUserCode() {
        return userCode;
    }
    public void setUserCode(String userCode) {
        this.userCode = userCode;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    public Integer getUserType() {
        return userType;
    }
    public void setUserType(Integer userType) {
        this.userType = userType;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public Integer getFlag() {
        return flag;
    }
    public void setFlag(Integer flag) {
        this.flag = flag;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionReviewedVO.java

@@ -0,0 +1,198 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 
 * 处方审核记录表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2019年05月16日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyPrescriptionReviewedVO", description = "处方审核记录表")
public class WlyyPrescriptionReviewedVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 处方id
	 */
	@ApiModelProperty(value = "处方id", example = "模块1")
    private String prescriptionId;
    /**
	 * 审核医院
	 */
	@ApiModelProperty(value = "审核医院", example = "模块1")
    private String hospital;
    /**
	 * 审核医院名称
	 */
	@ApiModelProperty(value = "审核医院名称", example = "模块1")
    private String hospitalName;
    /**
	 * 审核科室
	 */
	@ApiModelProperty(value = "审核科室", example = "模块1")
    private String dept;
    /**
	 * 审核科室名称
	 */
	@ApiModelProperty(value = "审核科室名称", example = "模块1")
    private String deptName;
    /**
	 * 审核医生
	 */
	@ApiModelProperty(value = "审核医生", example = "模块1")
    private String doctor;
    /**
	 * 审核医生
	 */
	@ApiModelProperty(value = "审核医生", example = "模块1")
    private String doctorName;
    /**
	 * 审核原因
	 */
	@ApiModelProperty(value = "审核原因", example = "模块1")
    private String reason;
    /**
	 * 处方创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "处方创建时间", example = "模块1")
    private Date createTime;
    /**
	 * 1审核通过1 0待审核  -1  审核不通过   -2无效审核
	 */
	@ApiModelProperty(value = "1审核通过1 0待审核  -1  审核不通过   -2无效审核", example = "模块1")
    private Integer status;
    /**
	 * 备注
	 */
	@ApiModelProperty(value = "备注", example = "模块1")
    private String remark;
    /**
	 * 审核时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "审核时间", example = "模块1")
    private Date reviewedTime;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPrescriptionId() {
        return prescriptionId;
    }
    public void setPrescriptionId(String prescriptionId) {
        this.prescriptionId = prescriptionId;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public String getReason() {
        return reason;
    }
    public void setReason(String reason) {
        this.reason = reason;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Date getReviewedTime() {
        return reviewedTime;
    }
    public void setReviewedTime(Date reviewedTime) {
        this.reviewedTime = reviewedTime;
    }
}

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -12,7 +12,7 @@ spring:
  profiles: jwdev
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://192.168.131.174:1221}
      uri: ${wlyy-spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy-spring.config.label:jwdev}
---
@@ -20,7 +20,7 @@ spring:
  profiles: jwtest
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://192.168.131.174:1221}
      uri: ${wlyy-spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy-spring.config.label:jwdev}
---
@@ -28,5 +28,5 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://192.168.131.174:1221}
      uri: ${wlyy.pring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwprod}

svr/svr-base/src/main/java/com/yihu/jw/base/service/system/SystemDictService.java

@@ -76,23 +76,23 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
        JSONArray jsonArray = new JSONArray();
        JSONObject jsonObject = new JSONObject();
        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictIcd10Service.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictIcd10Service.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHospitalDeptService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictHospitalDeptService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictJobTitleService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictJobTitleService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHealthProblemService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictHealthProblemService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictMedicineService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictMedicineService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictDiseaseService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictDiseaseService.queryAll(saasId, createPage(page, size, sorts));
        } else {
            jsonObject = this.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = this.queryAll(saasId, createPage(page, size, sorts));
        }
        jsonArray.add(jsonObject);
        return jsonArray;
@@ -123,23 +123,23 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
        JSONArray jsonArray = new JSONArray();
        JSONObject jsonObject = new JSONObject();
        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictIcd10Service.queryAll(userId, creatPage(page, size, sorts));
            jsonObject = dictIcd10Service.queryAll(userId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHospitalDeptService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictHospitalDeptService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictJobTitleService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictJobTitleService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHealthProblemService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictHealthProblemService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictMedicineService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictMedicineService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictDiseaseService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictDiseaseService.queryAll("", createPage(page, size, sorts));
        } else {
            jsonObject = this.queryAll("", creatPage(page, size, sorts));
            jsonObject = this.queryAll("", createPage(page, size, sorts));
        }
        jsonArray.add(jsonObject);
        return jsonArray;

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -1,6 +1,6 @@
#通用的配置不用区分环境变量
server:
  port: ${server.svr-internet-hospital-entrance}
  port: ${server.svr-internet-hospital-entrance-port}
spring:
  datasource:
@@ -20,9 +20,12 @@ spring:
    test-while-idle: true #指明连接是否被空闲连接回收器(如果有)进行检验，如果检测失败，则连接将被从池中去除
    min-evictable-idle-time-millis: 3600000 #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
  http:
    multipart:
      max-file-size: 5MB
#  http:
#    multipart:
#      max-file-size: 5MB
#      location: D:/work/soft_dev/IdeaWorkSpace/wlyy2.0/svr/svr-patient/temp_file/
#      resolve-lazily: true
  redis:
    database: 0 # Database index used by the connection factory.
@@ -54,7 +57,7 @@ es:
    servicePackLog: base_service_package_log
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
  tracker-server: 172.26.0.110:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码
@@ -76,42 +79,37 @@ spring:
#    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  http:
    multipart:
      location: D:/work/soft_dev/IdeaWorkSpace/wlyy2.0/svr/svr-patient/temp_file/
      resolve-lazily: true
    password: jkzlehr
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    client-transport-sniff: false
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.19.103.87:61616
    broker-url: tcp://172.26.0.116:61616
    user: admin
    password: admin
  redis:
    host: 192.168.131.172 # Redis server host.
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
#    password: jkzl_ehr
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
  fastdfs_file_url: http://172.26.0.110:22122/
# 短信发送地址
jw:
  smsUrl: http://svr-base:10020/sms_gateway/send
myFamily:
  qrCodeFailurTime: 7
  qrCodeFailurTime: 2
wechat:
  id: 97ed8a0a-4f07-4b85-ab02-b716c611a464  # base库中,wx_wechat 的id字段
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP
@@ -119,36 +117,36 @@ sms:
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
    password: ssgg@jkzl2019
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: root
#    password: 123456
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    client-transport-sniff: false
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.19.103.87:61616
    broker-url: tcp://172.26.0.116:61616
    user: admin
    password: admin
  redis:
    host: 192.168.131.172 # Redis server host.
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
  fastdfs_file_url: http://172.26.0.110:22122/
wechat:
  id: 97ed8a0a-4f07-4b85-ab02-b716c611a464  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP
myFamily:
  qrCodeFailurTime: 7
  qrCodeFailurTime: 2
---
spring:
  profiles: prod
@@ -179,4 +177,4 @@ wechat:
sms:
  clientId: EwC0iRSrcP #todo 待配置
myFamily:
  qrCodeFailurTime: 7
  qrCodeFailurTime: 2

svr/svr-internet-hospital/pom.xml

@@ -211,6 +211,10 @@
            <artifactId>thumbnailator</artifactId>
            <version>0.4.8</version>
        </dependency>
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
        </dependency>
    </dependencies>
    <build>

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/SysDictDao.java

@@ -0,0 +1,18 @@
package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface SysDictDao extends PagingAndSortingRepository<WlyyHospitalSysDictDO, String>, JpaSpecificationExecutor<WlyyHospitalSysDictDO>  {
    WlyyHospitalSysDictDO findByHospitalAndDictCode(String hospital, String dictCode);
    List<WlyyHospitalSysDictDO> findByHospitalAndDictName(String hospital, String dictName);
    WlyyHospitalSysDictDO findById(String id);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/SysDictEndpoint.java

@@ -0,0 +1,142 @@
package com.yihu.jw.hospital.endpoint.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.service.consult.SysDictService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by Trick on 2019/5/16.
 */
@RestController
@RequestMapping("internet/consult/sysdict" )
@Api(tags = "互联网医院功能业务字典及开关设置表", description = "互联网医院")
public class SysDictEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SysDictService sysDictService;
    /**
     * 新增功能业务字典
     * @param jsonData
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/create", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "新增&修改功能业务字典", notes = "互联网医院功能业务字典及开关设置表")
    public Envelop createSysDict(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        int flag = -1;
        Envelop envelop = new Envelop();
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = new WlyyHospitalSysDictDO();
        Map dataDetail  = JSONObject.fromObject(jsonData);
        String hospital = dataDetail.get("hospital") == "" ? "": dataDetail.get("hospital") .toString();
        String dictName = dataDetail.get("dictName") == "" ? "": dataDetail.get("dictName") .toString();
        String data = dataDetail.get("data") == "" ? "": dataDetail.get("data") .toString();
        JSONArray array = JSONArray.fromObject(data);
        if(array.size()>0) {
            for (int i = 0; i < array.size(); i++) {
                JSONObject jsonObject = array.getJSONObject(i);
                wlyyHospitalSysDictDO = sysDictService.saveConsultSetting(jsonObject, hospital, dictName);
                if (wlyyHospitalSysDictDO != null) {
                    flag = 0;
                    continue;
                } else {
                    break;
                }
            }
            if (flag < 0) {
                return failed("配置新增失败!");
            } else {
                return success("配置新增成功!", wlyyHospitalSysDictDO);
            }
        }else{
            return failed("获取待更新配置项失败！");
        }
    }
    /**
     * 该接口实现按医院编号、字典名称、字典项编码进行查询的功能
     * 字典及项值约定：
     * dictName( 候诊延时： WaitingDelay )  dictCode ( 等待时长：WaitingTime  过号延时保号： OverdueDelay   过号延时时长： OverdueTime  延时退费规则: DelayedRefundRule )
         * dictName( 邀请专家配置： InvitedConfig )   dictCode ( 支付配置：PayType  邀请确认：InvitedValid   退费规则：RefundRule )
     */
    @PostMapping(value = "/findByHosAndDn", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "基于医院编号及字典名称，查询配置列表", notes = "互联网医院功能业务字典及开关设置表")
    public Envelop findByHosAndDn(
            @ApiParam(name = "hospital", value = "医院编码", required = true)
            @RequestParam(value = "hospital", required = true) String hospital,
            @ApiParam(name = "dictName", value = "字典名称", defaultValue = "")
            @RequestParam(value = "dictName", required = false) String dictName ) throws Exception {
        ListEnvelop listEnvelop = new ListEnvelop();
        List<WlyyHospitalSysDictDO>  wlyyHospitalSysDictDOS = new ArrayList<WlyyHospitalSysDictDO>();
        wlyyHospitalSysDictDOS = sysDictService.findByHospitalAndDictName(hospital,dictName);
        Map res = new HashMap();
        res.put("hospital",hospital);
        res.put("dictName",dictName);
        if(wlyyHospitalSysDictDOS != null){
            for(WlyyHospitalSysDictDO wlyyHospitalSysDictDO : wlyyHospitalSysDictDOS){
                res.put(wlyyHospitalSysDictDO.getDictCode().toString(),wlyyHospitalSysDictDO.getDictValue().toString());
            }
            return success("查询配置信息成功！",res);
        }else{
            return failed("配置信息未存储，请先保存！");
        }
    }
    /**
     * 根据医院编号及字典编码，获取配置界面中某一配置项的值信息
     * dictName( 候诊延时： WaitingDelay )  dictCode ( 等待时长：WaitingTime  过号延时保号： OverdueDelay   过号延时时长： OverdueTime  延时退费规则: DelayedRefundRule )
     * dictName( 邀请专家配置： InvitedConfig )   dictCode ( 支付配置：PayType  邀请确认：InvitedValid   退费规则：RefundRule )
     * @param hospital
     * @param dictCode
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/findByHosAndDc", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "基于医院编号、字典名称及字典项编码，查询指定配置", notes = "互联网医院功能业务字典及开关设置表")
    public ObjEnvelop findByHosAndDc(
            @ApiParam(name = "hospital", value = "医院编码", required = true)
            @RequestParam(value = "hospital", required = true) String hospital,
            @ApiParam(name = "dictCode", value = "字典项编码", defaultValue = "")
            @RequestParam(value = "dictCode", required = false) String dictCode ) throws Exception {
        ObjEnvelop objEnvelop = new ObjEnvelop();
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = new WlyyHospitalSysDictDO();
        wlyyHospitalSysDictDO = sysDictService.findByHospitalAndDictCode(hospital,dictCode);
        if(wlyyHospitalSysDictDO != null){
            objEnvelop.setObj(wlyyHospitalSysDictDO);
            objEnvelop.setStatus(200);
            objEnvelop.setMessage("查询配置信息成功！");
        }else{
            objEnvelop.setStatus(-1);
            objEnvelop.setMessage("对不起，未查询到相关的配置信息！");
        }
        return objEnvelop;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -0,0 +1,18 @@
package com.yihu.jw.hospital.endpoint.prescription;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created by Trick on 2019/5/16.
 */
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.Prescription.PREFIX)
@Api(value = "在线复诊", description = "在线复诊接口", tags = {"在线复诊接口"})
public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/SysDictService.java

@@ -0,0 +1,83 @@
package com.yihu.jw.hospital.service.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dao.consult.SysDictDao;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class SysDictService {
    @Autowired
    private SysDictDao sysDictDao;
    /**
     * 新增&更新社区医生邀请专家配置
     * @param jsonObject
     * @return
     */
    public WlyyHospitalSysDictDO saveConsultSetting(JSONObject jsonObject,String hospital,String dictName ){
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = new WlyyHospitalSysDictDO();
        //JSON数据解析
        Map dataDetail  = JSONObject.fromObject(jsonObject);
        String dictCode = dataDetail.get("dictCode") == "" ? "": dataDetail.get("dictCode") .toString();
        String dictValue = dataDetail.get("dictValue") == "" ? "": dataDetail.get("dictValue") .toString();
        String id = dataDetail.get("id") == "" ? "": dataDetail.get("id") .toString();
        String saasId = "";
        if("".equals(id)){
            wlyyHospitalSysDictDO.setSaasId(saasId);
            wlyyHospitalSysDictDO.setHospital(hospital);
            wlyyHospitalSysDictDO.setDictName(dictName);
            wlyyHospitalSysDictDO.setDictCode(dictCode);
            wlyyHospitalSysDictDO.setDictValue(dictValue);
            wlyyHospitalSysDictDO = sysDictDao.save(wlyyHospitalSysDictDO);
        }else{
            WlyyHospitalSysDictDO wlyyHospitalSysDictDOL = sysDictDao.findById(id);
            wlyyHospitalSysDictDOL.setDictValue(dictValue);
            wlyyHospitalSysDictDO = sysDictDao.save(wlyyHospitalSysDictDOL);
        }
        return wlyyHospitalSysDictDO;
    }
    /**
     * 根据医院编号及字典编码，获取配置界面中某一配置项的值信息
     * dictName( 候诊延时： WaitingDelay )  dictCode ( 等待时长：WaitingTime  过号延时保号： OverdueDelay   过号延时时长： OverdueTime  延时退费规则: DelayedRefundRule )
     * dictName( 邀请专家配置： InvitedConfig )   dictCode ( 支付配置：PayType  邀请确认：InvitedValid   退费规则：RefundRule )
     * @param hospital
     * @param dictCode
     * @return
     */
    public WlyyHospitalSysDictDO findByHospitalAndDictCode(String hospital, String dictCode){
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = sysDictDao.findByHospitalAndDictCode(hospital,dictCode);
        if(wlyyHospitalSysDictDO != null){
            return wlyyHospitalSysDictDO;
        }else{
            return null;
        }
    }
    /**
     * 根据医院编号及字典名称，获取配置界面所有的配置信息
     * dictName( 候诊延时： WaitingDelay )
     * dictName( 邀请专家配置： InvitedConfig )
     * @param hospital
     * @param dictName
     * @return
     */
    public List<WlyyHospitalSysDictDO> findByHospitalAndDictName(String hospital, String dictName){
        List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOs = sysDictDao.findByHospitalAndDictName(hospital,dictName);
        if(wlyyHospitalSysDictDOs != null & wlyyHospitalSysDictDOs.size() > 0){
            return wlyyHospitalSysDictDOs;
        }else{
            return null;
        }
    }
}

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -1,6 +1,6 @@
#通用的配置不用区分环境变量
server:
  port: ${server.svr-internet-hospital}
  port: ${server.svr-internet-hospital-port}
spring:
  datasource:
@@ -20,9 +20,12 @@ spring:
    test-while-idle: true #指明连接是否被空闲连接回收器(如果有)进行检验，如果检测失败，则连接将被从池中去除
    min-evictable-idle-time-millis: 3600000 #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
  http:
    multipart:
      max-file-size: 5MB
#  http:
#    multipart:
#      max-file-size: 5MB
#      location: D:/work/soft_dev/IdeaWorkSpace/wlyy2.0/svr/svr-patient/temp_file/
#      resolve-lazily: true
  redis:
    database: 0 # Database index used by the connection factory.
@@ -54,7 +57,7 @@ es:
    servicePackLog: base_service_package_log
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
  tracker-server: 172.26.0.110:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码
@@ -76,42 +79,37 @@ spring:
#    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  http:
    multipart:
      location: D:/work/soft_dev/IdeaWorkSpace/wlyy2.0/svr/svr-patient/temp_file/
      resolve-lazily: true
    password: jkzlehr
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    client-transport-sniff: false
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.19.103.87:61616
    broker-url: tcp://172.26.0.116:61616
    user: admin
    password: admin
  redis:
    host: 192.168.131.172 # Redis server host.
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
#    password: jkzl_ehr
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
  fastdfs_file_url: http://172.26.0.110:22122/
# 短信发送地址
jw:
  smsUrl: http://svr-base:10020/sms_gateway/send
myFamily:
  qrCodeFailurTime: 7
  qrCodeFailurTime: 2
wechat:
  id: 97ed8a0a-4f07-4b85-ab02-b716c611a464  # base库中,wx_wechat 的id字段
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP
@@ -119,36 +117,36 @@ sms:
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
    password: ssgg@jkzl2019
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: root
#    password: 123456
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    client-transport-sniff: false
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
      uris: http://172.26.0.112:9200,http://172.26.0.112:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.19.103.87:61616
    broker-url: tcp://172.26.0.116:61616
    user: admin
    password: admin
  redis:
    host: 192.168.131.172 # Redis server host.
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
  fastdfs_file_url: http://172.26.0.110:22122/
wechat:
  id: 97ed8a0a-4f07-4b85-ab02-b716c611a464  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP
myFamily:
  qrCodeFailurTime: 7
  qrCodeFailurTime: 2
---
spring:
  profiles: prod
@@ -179,4 +177,4 @@ wechat:
sms:
  clientId: EwC0iRSrcP #todo 待配置
myFamily:
  qrCodeFailurTime: 7
  qrCodeFailurTime: 2

svr/svr-iot-sunnuo/src/main/java/com/yihu/iot/datainput/controller/IotAnalyzerController.java

@@ -96,7 +96,21 @@ public class IotAnalyzerController extends EnvelopRestEndpoint {
            params.put("measure_time",info.get("testtime") == null? "":info.get("testtime").toString());
            params.put("sn",info.get("devicesn") == null? "":info.get("devicesn").toString());
            str = dataInputService.inputBodySignsData(params.toString(),accessToken);
            Map res = new HashMap();
            //体征信息上传成功后，同步到厦门I健康
            data.put("id","");
            boolean synFlag = dataInputService.synXMIjk(data);
            if(synFlag){
                res.put("statusCode", "00");
                res.put("desc", info.get("devicesn") + "体征信息上传厦门I健康成功。");
            }else {
                res.put("statusCode", "02");
                res.put("desc", info.get("devicesn") +  "体征信息上传厦门I健康失败。");
            }
            strResult = objectMapper.writeValueAsString(res);
            logger.info(strResult);
            /*str = dataInputService.inputBodySignsData(params.toString(),accessToken);
            JSONObject result = JSONObject.parseObject(str);
            if (StringUtils.endsWithIgnoreCase(ConstantUtils.FAIL,result.getString("response"))) {
                Map res = new HashMap();
@@ -125,13 +139,13 @@ public class IotAnalyzerController extends EnvelopRestEndpoint {
                }
                strResult = objectMapper.writeValueAsString(res);
                logger.info(strResult);
            }
            }*/
            return strResult;
        } catch (Exception e) {
            e.printStackTrace();
            Map res = new HashMap();
            res.put("statusCode", "03");
            res.put("desc", "体征信息上传失败。");
            res.put("desc", "服务异常，体征信息上传失败。");
            strResult = objectMapper.writeValueAsString(res);
            logger.error(strResult);
            return strResult;