Merge branch 'dev' of huangwenjie/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/oldpeople/OldPeoplePhysicalExaminationEntity.java

@@ -0,0 +1,162 @@
package com.yihu.wlyy.entity.oldpeople;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
/**
 * @author huangwenjie
 * @date 2017/10/18 17:15
 */
@Entity
@Table(name = "wlyy_old_people_physical_examination",catalog = "")
public class OldPeoplePhysicalExaminationEntity extends IdEntity implements Serializable {
	private String code;
	private String medicalNo;
	private String patientName;
	private String patientCode;
	private String idCard;
	private String doctorCode;
	private String jwDoctorCode;
	private String orgCode;
	private String orgName;
	private Timestamp medicalTime;
	private Integer sex;
	private String homeAddres;
	private Timestamp createTime;
	
	private static final long serialVersionUID = 8358924836164389434L;
	
	@Basic
	@Column(name = "code")
	public String getCode() {
		return code;
	}
	
	public void setCode(String code) {
		this.code = code;
	}
	
	@Basic
	@Column(name = "medical_no")
	public String getMedicalNo() {
		return medicalNo;
	}
	
	public void setMedicalNo(String medicalNo) {
		this.medicalNo = medicalNo;
	}
	
	@Basic
	@Column(name = "patient_name")
	public String getPatientName() {
		return patientName;
	}
	
	public void setPatientName(String patientName) {
		this.patientName = patientName;
	}
	
	@Basic
	@Column(name = "patient_code")
	public String getPatientCode() {
		return patientCode;
	}
	
	public void setPatientCode(String patientCode) {
		this.patientCode = patientCode;
	}
	
	@Basic
	@Column(name = "id_card")
	public String getIdCard() {
		return idCard;
	}
	
	public void setIdCard(String idCard) {
		this.idCard = idCard;
	}
	
	@Basic
	@Column(name = "doctor_code")
	public String getDoctorCode() {
		return doctorCode;
	}
	
	public void setDoctorCode(String doctorCode) {
		this.doctorCode = doctorCode;
	}
	
	@Basic
	@Column(name = "jw_doctor_code")
	public String getJwDoctorCode() {
		return jwDoctorCode;
	}
	
	public void setJwDoctorCode(String jwDoctorCode) {
		this.jwDoctorCode = jwDoctorCode;
	}
	
	@Basic
	@Column(name = "org_code")
	public String getOrgCode() {
		return orgCode;
	}
	
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
	
	@Basic
	@Column(name = "org_name")
	public String getOrgName() {
		return orgName;
	}
	
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
	
	@Basic
	@Column(name = "medical_time")
	public Timestamp getMedicalTime() {
		return medicalTime;
	}
	
	public void setMedicalTime(Timestamp medicalTime) {
		this.medicalTime = medicalTime;
	}
	
	@Basic
	@Column(name = "sex")
	public Integer getSex() {
		return sex;
	}
	
	public void setSex(Integer sex) {
		this.sex = sex;
	}
	
	@Basic
	@Column(name = "home_addres")
	public String getHomeAddres() {
		return homeAddres;
	}
	
	public void setHomeAddres(String homeAddres) {
		this.homeAddres = homeAddres;
	}
	
	@Basic
	@Column(name = "create_time")
	public Timestamp getCreateTime() {
		return createTime;
	}
	
	public void setCreateTime(Timestamp createTime) {
		this.createTime = createTime;
	}
	
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/PatientRemindRecordsEntity.java

@@ -0,0 +1,86 @@
package com.yihu.wlyy.entity.patient;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
/**
 * @author huangwenjie
 * @date 2017/10/18 17:15
 */
@Entity
@Table(name = "wlyy_people_remind_records", catalog = "")
public class PatientRemindRecordsEntity extends IdEntity implements Serializable {
	private String code;
	private Integer type;
	private String patientCode;
	private String relationCode;
	private Timestamp remindTime;
	private Timestamp createTime;
	
	private static final long serialVersionUID = 8358924836164389434L;
	
	@Basic
	@Column(name = "code")
	public String getCode() {
		return code;
	}
	
	public void setCode(String code) {
		this.code = code;
	}
	
	@Basic
	@Column(name = "type")
	public Integer getType() {
		return type;
	}
	
	public void setType(Integer type) {
		this.type = type;
	}
	
	@Basic
	@Column(name = "patient_code")
	public String getPatientCode() {
		return patientCode;
	}
	
	public void setPatientCode(String patientCode) {
		this.patientCode = patientCode;
	}
	
	@Basic
	@Column(name = "relation_code")
	public String getRelationCode() {
		return relationCode;
	}
	
	public void setRelationCode(String relationCode) {
		this.relationCode = relationCode;
	}
	
	@Basic
	@Column(name = "remind_time")
	public Timestamp getRemindTime() {
		return remindTime;
	}
	
	public void setRemindTime(Timestamp remindTime) {
		this.remindTime = remindTime;
	}
	
	@Basic
	@Column(name = "create_time")
	public Timestamp getCreateTime() {
		return createTime;
	}
	
	public void setCreateTime(Timestamp createTime) {
		this.createTime = createTime;
	}
	
}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/SignController.java

@@ -107,7 +107,7 @@ public class SignController {
    public Result getSickMedicalSimpleListInfo (
            @ApiParam(name="TIME_START",value="修改的开始时间",defaultValue = "2012-2-6 00:00:00")
            @RequestParam(value="TIME_START",required = false) String TIME_START,
            @ApiParam(name="TIME_END",value="修改的开始时间",defaultValue = "2012-2-7 23:59:59")
            @ApiParam(name="TIME_END",value="修改的结束时间",defaultValue = "2012-2-7 23:59:59")
            @RequestParam(value="TIME_END",required = false) String TIME_END){
        try {
            String response = signZYService.getSickMedicalSimpleListInfo(TIME_START,TIME_END);

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/SignZYService.java

@@ -17,49 +17,16 @@ import java.util.*;
@Service("SignZYService")
public class SignZYService {
    @Autowired
    private PatientDao patientDao;
    @Autowired
    private DoctorDao doctorDao;
    @Autowired
    private SignFamilyDao signFamilyDao;
    @Autowired
    private DoctorMappingDao doctorMappingDao;
    @Autowired
    private HospitalMappingDao hospitalMappingDao;
    @Autowired
    private AdminTeamDao adminTeamDao;
    @Autowired
    private DoctorTeamDao teamDao;
    @Autowired
    private DoctorTeamMemberDao teamMemberDao;
    @Autowired
    private MessageDao messageDao;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private ZysoftService zysoftService;
    @Autowired
    private LogService logService;
    @Autowired
    private SystemDictService systemDictService;
    /**
     * 获取机构映射