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/doctor/dao/DoctorWorkTimeDao.java

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

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/doctor/WlyyDoctorWorkTimeDO.java

@@ -0,0 +1,157 @@
package com.yihu.jw.entity.hospital.doctor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Trick on 2019/5/31.
 */
@Entity
@Table(name = "wlyy_doctor_work_time")
public class WlyyDoctorWorkTimeDO extends UuidIdentityEntity {
    private String doctor;//医生code',
    private String doctorName;//医生名称',
    private String hospital;//医院code
    private String hospitalName;//医院名称
    private String dept;//部门
    private String deptName;//部门名称
    private String registerCode;//挂号code',
    private String registerName;//挂号类别名称
    private Double registerFee;//费用
    private String type;//1.线上；2.线下',
    private String timeType;//1.上午 7:00~12:00；2.下午12:00~18:00；4.晚上 其他时间段',
    private Date startTime;//开始时间',
    private Date endTime;//结束时间',
    private Date date;//排班日期',
    private Date createTime;//创建时间',
    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 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 getRegisterCode() {
        return registerCode;
    }
    public void setRegisterCode(String registerCode) {
        this.registerCode = registerCode;
    }
    public String getRegisterName() {
        return registerName;
    }
    public void setRegisterName(String registerName) {
        this.registerName = registerName;
    }
    public Double getRegisterFee() {
        return registerFee;
    }
    public void setRegisterFee(Double registerFee) {
        this.registerFee = registerFee;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public String getTimeType() {
        return timeType;
    }
    public void setTimeType(String timeType) {
        this.timeType = timeType;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getStartTime() {
        return startTime;
    }
    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getEndTime() {
        return endTime;
    }
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getDate() {
        return date;
    }
    public void setDate(Date date) {
        this.date = date;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    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/WlyyOutpatientDO.java

@@ -0,0 +1,248 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
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月31日
*
*/
@Entity
@Table(name = "wlyy_outpatient")
public class WlyyOutpatientDO extends UuidIdentityEntity {
    /**
	 * 每次就诊唯一号
	 */
	private String admNo;
    /**
	 * 原始每次就诊唯一号
	 */
	private String originAdmNo;
    /**
	 * 挂号流水号
	 */
	private String registerNo;
    /**
	 * 原始挂号流水号
	 */
	private String originRegisterNo;
    /**
	 * 部门
	 */
	private String dept;
    /**
	 * 部门名称
	 */
	private String deptName;
    /**
	 * 居民code
	 */
	private String patient;
    /**
	 * 居民名称
	 */
	private String patientName;
    /**
	 * 医生code
	 */
	private String doctor;
    /**
	 * 医生名称
	 */
	private String doctorName;
    /**
	 * 身份证号
	 */
	private String idcard;
    /**
	 * 门急诊标记（MZ门诊，JZ急诊）
	 */
	private String mjz;
    /**
	 * 诊断编码
	 */
	private String icd10;
    /**
	 * icd10_name
	 */
	private String icd10Name;
    /**
	 * 挂号时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date admDate;
    /**
	 * 就诊时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date conDate;
    /**
	 * -1 取消；0 候诊中 ；1 就诊中 ；2 已诊
	 */
	private String status;
	@Column(name = "adm_no")
    public String getAdmNo() {
        return admNo;
    }
    public void setAdmNo(String admNo) {
        this.admNo = admNo;
    }
	@Column(name = "origin_adm_no")
    public String getOriginAdmNo() {
        return originAdmNo;
    }
    public void setOriginAdmNo(String originAdmNo) {
        this.originAdmNo = originAdmNo;
    }
	@Column(name = "register_no")
    public String getRegisterNo() {
        return registerNo;
    }
    public void setRegisterNo(String registerNo) {
        this.registerNo = registerNo;
    }
	@Column(name = "origin_register_no")
    public String getOriginRegisterNo() {
        return originRegisterNo;
    }
    public void setOriginRegisterNo(String originRegisterNo) {
        this.originRegisterNo = originRegisterNo;
    }
	@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 = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
	@Column(name = "patient_name")
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
	@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 = "idcard")
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
	@Column(name = "mjz")
    public String getMjz() {
        return mjz;
    }
    public void setMjz(String mjz) {
        this.mjz = mjz;
    }
	@Column(name = "icd10")
    public String getIcd10() {
        return icd10;
    }
    public void setIcd10(String icd10) {
        this.icd10 = icd10;
    }
	@Column(name = "icd10_name")
    public String getIcd10Name() {
        return icd10Name;
    }
    public void setIcd10Name(String icd10Name) {
        this.icd10Name = icd10Name;
    }
	@Column(name = "adm_date")
    public Date getAdmDate() {
        return admDate;
    }
    public void setAdmDate(Date admDate) {
        this.admDate = admDate;
    }
	@Column(name = "con_date")
    public Date getConDate() {
        return conDate;
    }
    public void setConDate(Date conDate) {
        this.conDate = conDate;
    }
	@Column(name = "status")
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
}

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

@@ -19,6 +19,14 @@ import java.util.Date;
@Table(name = "wlyy_prescription")
public class WlyyPrescriptionDO extends UuidIdentityEntity {
    /**
     * 门诊记录说
     */
    private String outpatientId;
    /**
     *
     */
    private String realOrder;
    /**
@@ -172,6 +180,11 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
     */
    private String reason;
    /**
     * 病症图片
     */
    private String diseaseImg;
    /**
     * 处方备注
     */
@@ -182,66 +195,19 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
     */
    private String cancelReason;
    /**
     * ca加密信息
     */
    private String caCertData;
    /**
     * ca指纹信息
     */
    private String caMessage;
    /**
     * CA数字签名唯一流水号
     */
    private String digitalSignNo;
    /**
     * 原文的MD5摘要
     */
    private String originalDataAbstract;
    /**
     * CA原文数据
     */
    private String strOriginalData;
    /**
     * his-开处方的科室编码
     */
    private String hisDeptCode;
    /**
     * his-开方医生的编码
     */
    private String hisDoctorCode;
    /**
     * his-挂号类型编码
     */
    private String hisGisterTypeCode;
    /**
     * his-费别类型编码
     */
    private String hisRateTypeCode;
    /**
     * his-医院编码
     */
    private String hisHospital;
    /**
     * his-挂号费用
     */
    private Integer hisRegisterFee;
    /**
     * 处方结算状态，0为未结算，1为结算成功，默认为0
     */
    private Integer payStatus;
    @Column(name = "outpatient_id")
    public String getOutpatientId() {
        return outpatientId;
    }
    public void setOutpatientId(String outpatientId) {
        this.outpatientId = outpatientId;
    }
    @Column(name = "real_order")
    public String getRealOrder() {
@@ -492,93 +458,6 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
        this.cancelReason = cancelReason;
    }
    @Column(name = "ca_cert_data")
    public String getCaCertData() {
        return caCertData;
    }
    public void setCaCertData(String caCertData) {
        this.caCertData = caCertData;
    }
    @Column(name = "ca_message")
    public String getCaMessage() {
        return caMessage;
    }
    public void setCaMessage(String caMessage) {
        this.caMessage = caMessage;
    }
    @Column(name = "digital_sign_no")
    public String getDigitalSignNo() {
        return digitalSignNo;
    }
    public void setDigitalSignNo(String digitalSignNo) {
        this.digitalSignNo = digitalSignNo;
    }
    @Column(name = "original_data_abstract")
    public String getOriginalDataAbstract() {
        return originalDataAbstract;
    }
    public void setOriginalDataAbstract(String originalDataAbstract) {
        this.originalDataAbstract = originalDataAbstract;
    }
    @Column(name = "str_original_data")
    public String getStrOriginalData() {
        return strOriginalData;
    }
    public void setStrOriginalData(String strOriginalData) {
        this.strOriginalData = strOriginalData;
    }
    @Column(name = "his_dept_code")
    public String getHisDeptCode() {
        return hisDeptCode;
    }
    public void setHisDeptCode(String hisDeptCode) {
        this.hisDeptCode = hisDeptCode;
    }
    @Column(name = "his_doctor_code")
    public String getHisDoctorCode() {
        return hisDoctorCode;
    }
    public void setHisDoctorCode(String hisDoctorCode) {
        this.hisDoctorCode = hisDoctorCode;
    }
    @Column(name = "his_gister_type_code")
    public String getHisGisterTypeCode() {
        return hisGisterTypeCode;
    }
    public void setHisGisterTypeCode(String hisGisterTypeCode) {
        this.hisGisterTypeCode = hisGisterTypeCode;
    }
    @Column(name = "his_rate_type_code")
    public String getHisRateTypeCode() {
        return hisRateTypeCode;
    }
    public void setHisRateTypeCode(String hisRateTypeCode) {
        this.hisRateTypeCode = hisRateTypeCode;
    }
    @Column(name = "his_hospital")
    public String getHisHospital() {
        return hisHospital;
    }
    public void setHisHospital(String hisHospital) {
        this.hisHospital = hisHospital;
    }
    @Column(name = "his_register_fee")
    public Integer getHisRegisterFee() {
        return hisRegisterFee;
    }
    public void setHisRegisterFee(Integer hisRegisterFee) {
        this.hisRegisterFee = hisRegisterFee;
    }
    @Column(name = "pay_status")
    public Integer getPayStatus() {
@@ -587,4 +466,13 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
    public void setPayStatus(Integer payStatus) {
        this.payStatus = payStatus;
    }
    @Column(name = "disease_img")
    public String getDiseaseImg() {
        return diseaseImg;
    }
    public void setDiseaseImg(String diseaseImg) {
        this.diseaseImg = diseaseImg;
    }
}

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

@@ -0,0 +1,251 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.restmodel.UuidIdentityVO;
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月31日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "WlyyOutpatientVO", description = "门诊信息表")
public class WlyyOutpatientVO extends UuidIdentityVO {
    /**
	 * 每次就诊唯一号
	 */
	@ApiModelProperty(value = "每次就诊唯一号", example = "模块1")
    private String admNo;
    /**
	 * 原始每次就诊唯一号
	 */
	@ApiModelProperty(value = "原始每次就诊唯一号", example = "模块1")
    private String originAdmNo;
    /**
	 * 挂号流水号
	 */
	@ApiModelProperty(value = "挂号流水号", example = "模块1")
    private String registerNo;
    /**
	 * 原始挂号流水号
	 */
	@ApiModelProperty(value = "原始挂号流水号", example = "模块1")
    private String originRegisterNo;
    /**
	 * 部门
	 */
	@ApiModelProperty(value = "部门", example = "模块1")
    private String dept;
    /**
	 * 部门名称
	 */
	@ApiModelProperty(value = "部门名称", example = "模块1")
    private String deptName;
    /**
	 * 居民code
	 */
	@ApiModelProperty(value = "居民code", example = "模块1")
    private String patient;
    /**
	 * 居民名称
	 */
	@ApiModelProperty(value = "居民名称", example = "模块1")
    private String patientName;
    /**
	 * 医生code
	 */
	@ApiModelProperty(value = "医生code", example = "模块1")
    private String doctor;
    /**
	 * 医生名称
	 */
	@ApiModelProperty(value = "医生名称", example = "模块1")
    private String doctorName;
    /**
	 * 身份证号
	 */
	@ApiModelProperty(value = "身份证号", example = "模块1")
    private String idcard;
    /**
	 * 门急诊标记（MZ门诊，JZ急诊）
	 */
	@ApiModelProperty(value = "门急诊标记（MZ门诊，JZ急诊）", example = "模块1")
    private String mjz;
    /**
	 * 诊断编码
	 */
	@ApiModelProperty(value = "诊断编码", example = "模块1")
    private String icd10;
    /**
	 * icd10_name
	 */
	@ApiModelProperty(value = "icd10_name", example = "模块1")
    private String icd10Name;
    /**
	 * 挂号时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "挂号时间", example = "模块1")
    private Date admDate;
    /**
	 * 就诊时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "就诊时间", example = "模块1")
    private Date conDate;
    /**
	 * -1 取消；0 候诊中 ；1 就诊中 ；2 已诊
	 */
	@ApiModelProperty(value = "-1 取消；0 候诊中 ；1 就诊中 ；2 已诊", example = "模块1")
    private String status;
    public String getAdmNo() {
        return admNo;
    }
    public void setAdmNo(String admNo) {
        this.admNo = admNo;
    }
    public String getOriginAdmNo() {
        return originAdmNo;
    }
    public void setOriginAdmNo(String originAdmNo) {
        this.originAdmNo = originAdmNo;
    }
    public String getRegisterNo() {
        return registerNo;
    }
    public void setRegisterNo(String registerNo) {
        this.registerNo = registerNo;
    }
    public String getOriginRegisterNo() {
        return originRegisterNo;
    }
    public void setOriginRegisterNo(String originRegisterNo) {
        this.originRegisterNo = originRegisterNo;
    }
    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 getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    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 getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public String getMjz() {
        return mjz;
    }
    public void setMjz(String mjz) {
        this.mjz = mjz;
    }
    public String getIcd10() {
        return icd10;
    }
    public void setIcd10(String icd10) {
        this.icd10 = icd10;
    }
    public String getIcd10Name() {
        return icd10Name;
    }
    public void setIcd10Name(String icd10Name) {
        this.icd10Name = icd10Name;
    }
    public Date getAdmDate() {
        return admDate;
    }
    public void setAdmDate(Date admDate) {
        this.admDate = admDate;
    }
    public Date getConDate() {
        return conDate;
    }
    public void setConDate(Date conDate) {
        this.conDate = conDate;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
}

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

@@ -200,6 +200,9 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "续方原因", example = "模块1")
    private String reason;
    @ApiModelProperty(value = "疾病图片", example = "模块1")
    private String diseaseImg;
    /**
     * 处方备注
     */
@@ -608,4 +611,12 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    public void setInfoVOs(List<WlyyPrescriptionInfoVO> infoVOs) {
        this.infoVOs = infoVOs;
    }
    public String getDiseaseImg() {
        return diseaseImg;
    }
    public void setDiseaseImg(String diseaseImg) {
        this.diseaseImg = diseaseImg;
    }
}