liuwenbin 7 rokov pred
rodič
commit
1eca571a0c

+ 4 - 4
patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/entity/IdEntity.java

@ -3,7 +3,7 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.mm.entity;
package com.yihu.mm.entity.medicine;
import org.hibernate.annotations.GenericGenerator;
@ -26,16 +26,16 @@ import java.io.Serializable;
public abstract class IdEntity implements Serializable {
	private static final long serialVersionUID = 3673803562328635206L;
	protected Long id;  // 非业务主键
	protected String id;  // 非业务主键
	@Id
	@GeneratedValue(generator = "uuid")
	@GenericGenerator(name = "uuid", strategy = "uuid")
	public Long getId() {
	public String getId() {
		return id;
	}
	public void setId(Long id) {
	public void setId(String id) {
		this.id = id;
	}
}

+ 0 - 91
patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/entity/medicine/MedicineExaminationAnwser.java

@ -1,91 +0,0 @@
package com.yihu.mm.entity.medicine;
import com.yihu.mm.entity.IdEntity;
/**
 * Created by Administrator on 2017/8/9.
 */
public class MedicineExaminationAnwser extends IdEntity{
    private String tpId;    //试卷编号
    private String tpName;  //试卷名称
    private Integer tpType; //'问卷类型',1:初筛问卷,2:助理问卷,4:现场问卷
    private String pbId;    //因素编号
    private String pbTitle; //因素题目
    private String pbAlternative;   //备选答案
    private String tpsId;    //试卷因素编号
    private Integer tpsSort;  //排序编号
    private Integer iMultiselect;   //是否多选,1:单选,2:多选
    public String getTpId() {
        return tpId;
    }
    public void setTpId(String tpId) {
        this.tpId = tpId;
    }
    public String getTpName() {
        return tpName;
    }
    public void setTpName(String tpName) {
        this.tpName = tpName;
    }
    public Integer getTpType() {
        return tpType;
    }
    public void setTpType(Integer tpType) {
        this.tpType = tpType;
    }
    public String getPbId() {
        return pbId;
    }
    public void setPbId(String pbId) {
        this.pbId = pbId;
    }
    public String getPbTitle() {
        return pbTitle;
    }
    public void setPbTitle(String pbTitle) {
        this.pbTitle = pbTitle;
    }
    public String getPbAlternative() {
        return pbAlternative;
    }
    public void setPbAlternative(String pbAlternative) {
        this.pbAlternative = pbAlternative;
    }
    public String getTpsId() {
        return tpsId;
    }
    public void setTpsId(String tpsId) {
        this.tpsId = tpsId;
    }
    public Integer getTpsSort() {
        return tpsSort;
    }
    public void setTpsSort(Integer tpsSort) {
        this.tpsSort = tpsSort;
    }
    public Integer getiMultiselect() {
        return iMultiselect;
    }
    public void setiMultiselect(Integer iMultiselect) {
        this.iMultiselect = iMultiselect;
    }
}

+ 0 - 22
patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/entity/medicine/Test.java

@ -1,22 +0,0 @@
package com.yihu.mm.entity.medicine;
import javax.persistence.*;
/**
 * Created by chenweida on 2017/8/8.
 */
@Entity
@Table(name = "test")
public class Test {
    private Long id;
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
}

+ 16 - 12
patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/entity/medicine/MedicineAnswerLog.java

@ -1,20 +1,24 @@
package com.yihu.mm.entity.medicine;
package com.yihu.mm.entity.medicine.questionnaire;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.mm.entity.IdEntity;
import com.yihu.mm.entity.medicine.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Administrator on 2017/8/9.
 */
public class MedicineAnswerLog extends IdEntity{
@Entity
@Table(name = "wlyy_medicine_anwser_log")
public class MedicineAnswerLog extends IdEntity {
    private String patientCode; //客户code
    private String tpId;    //试卷编号
    private String tpName; //试卷名称
    private String pbType;  //问卷类型
    private Date createTime;    //创建时间
    private String remark;      //备注
    private String problems;    //问题的集合
    public String getPatientCode() {
@ -50,14 +54,6 @@ public class MedicineAnswerLog extends IdEntity{
        this.createTime = createTime;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getProblems() {
        return problems;
    }
@ -65,4 +61,12 @@ public class MedicineAnswerLog extends IdEntity{
    public void setProblems(String problems) {
        this.problems = problems;
    }
    public String getPbType() {
        return pbType;
    }
    public void setPbType(String pbType) {
        this.pbType = pbType;
    }
}

+ 0 - 10
patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/repository/medicine/TestDao.java

@ -1,10 +0,0 @@
package com.yihu.mm.repository.medicine;
import com.yihu.mm.entity.medicine.Test;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/8/8.
 */
public interface TestDao extends PagingAndSortingRepository<Test, Long> {
}

+ 13 - 1
patient-co-customization/patient-co-modern-medicine/src/main/resources/application.yml

@ -7,6 +7,9 @@ security:
    username: jkzl
    password: jkzlehr
fastDFS:
  fastdfs_file_url: http://www.xmtyw.cn/
spring:
  datasource:
    medicine:
@ -86,7 +89,16 @@ spring:
      username: root
      password: 123456
#越人的登录key值
yueren:
  login_key:  aa
  url:  aa
server:
  server_url: http://weixin.xmtyw.cn/wlyy-dev/
---
##开发连测试用这个版本的配置
spring:
  profiles: dev_test
  profiles: dev_test