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

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -33,7 +33,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    private String password;
    /**
	* 
	*
	*/
    private String salt;
@@ -143,7 +143,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    private String sickVillage;
    /**
	* 
	*
	*/
    private String sickVillageName;

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientFamilyMemberDO.java

@@ -0,0 +1,56 @@
package com.yihu.jw.entity.base.patient;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2018/8/31.
 */
@Entity
@Table(name = "base_patient_family_member")
public class BasePatientFamilyMemberDO extends UuidIdentityEntityWithOperator {
    private String patient;//居民code',
    private String familyMember;//家庭成员code',
    private Integer familyRelation;//家庭关系',
    private Integer isAuthorize;//是否授权0:未授权,1:已授权，默认为1',
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "family_member")
    public String getFamilyMember() {
        return familyMember;
    }
    public void setFamilyMember(String familyMember) {
        this.familyMember = familyMember;
    }
    @Column(name = "family_relation")
    public Integer getFamilyRelation() {
        return familyRelation;
    }
    public void setFamilyRelation(Integer familyRelation) {
        this.familyRelation = familyRelation;
    }
    @Column(name = "is_authorize")
    public Integer getIsAuthorize() {
        return isAuthorize;
    }
    public void setIsAuthorize(Integer isAuthorize) {
        this.isAuthorize = isAuthorize;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/score/BaseEvaluateDO.java

@@ -0,0 +1,46 @@
package com.yihu.jw.entity.base.score;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2018/8/31.
 */
@Entity
@Table(name = "base_evaluate")
public class BaseEvaluateDO extends UuidIdentityEntityWithOperator {
    private String relationCode;//关联业务CODE（关联主表evlute_score）',
    private String scoreType;//评价类型：1、专业能力，2、服务态度，3、回复速度 (可拓展字段)',
    private Double score;//单项得分',
    @Column(name = "relation_code")
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    @Column(name = "score_type")
    public String getScoreType() {
        return scoreType;
    }
    public void setScoreType(String scoreType) {
        this.scoreType = scoreType;
    }
    @Column(name = "score")
    public Double getScore() {
        return score;
    }
    public void setScore(Double score) {
        this.score = score;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/score/BaseEvaluateScoreDO.java

@@ -0,0 +1,136 @@
package com.yihu.jw.entity.base.score;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2018/8/31.
 */
@Entity
@Table(name = "base_evaluate_score")
public class BaseEvaluateScoreDO extends UuidIdentityEntityWithOperator {
    private String city;//城市编码',
    private String town;//城镇编码',
    private String hospital;//医院编码',
    private String team;//团队编码',
    private String doctor;//被评价的医生编码',
    private String doctorName;//医生名字',
    private String patient;//评价人',
    private String patientName;//评价人姓名',
    private Integer evaluateType;//.咨询评价；',
    private String relationCode;//所属业务关系code，例如：1为咨询code',
    private Double score;//主表分数',
    private Integer type;//1、实名，2、匿名',
    @Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    @Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    @Column(name = "hospital")
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    @Column(name = "team")
    public String getTeam() {
        return team;
    }
    public void setTeam(String team) {
        this.team = team;
    }
    @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 = "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 = "evaluate_type")
    public Integer getEvaluateType() {
        return evaluateType;
    }
    public void setEvaluateType(Integer evaluateType) {
        this.evaluateType = evaluateType;
    }
    @Column(name = "relation_code")
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    @Column(name = "score")
    public Double getScore() {
        return score;
    }
    public void setScore(Double score) {
        this.score = score;
    }
    @Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/team/baseTeamDO.java

@@ -0,0 +1,76 @@
package com.yihu.jw.entity.base.team;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2018/8/31.
 */
@Entity
@Table(name = "base_team")
public class BaseTeamDO extends UuidIdentityEntityWithOperator {
    private String saasid;//saas化',
    private String name;//团队名称',
    private String leaderId;//领导医生标识',
    private String teamNum;//团队人数',
    private String qrcode;//团队二维码',
    private String del;//作废标识，1正常，0作废',
    @Column(name = "saasid")
    public String getSaasid() {
        return saasid;
    }
    public void setSaasid(String saasid) {
        this.saasid = saasid;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "leader_id")
    public String getLeaderId() {
        return leaderId;
    }
    public void setLeaderId(String leaderId) {
        this.leaderId = leaderId;
    }
    @Column(name = "team_num")
    public String getTeamNum() {
        return teamNum;
    }
    public void setTeamNum(String teamNum) {
        this.teamNum = teamNum;
    }
    @Column(name = "qrcode")
    public String getQrcode() {
        return qrcode;
    }
    public void setQrcode(String qrcode) {
        this.qrcode = qrcode;
    }
    @Column(name = "del")
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -180,6 +180,27 @@ public class BaseRequestMapping {
    public static class ImGetuiConfig extends Basic{
        public static final String PREFIX  = "/im_getui";
    }
    /**
     * 家庭成员管理
     */
    public static class PatientMember extends Basic{
        public static final String PREFIX = "/patient_member";
    }
    /**
     * 医生评价
     */
    public static class Score extends Basic{
        public static final String PREFIX = "/score";
    }
    /**
     * 团队
     */
    public static class team extends Basic{
        public static final String PREFIX = "/team";
    }
    /**
     * 城市字典

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/patient/PatientFamilyMemberVO.java

@@ -0,0 +1,61 @@
package com.yihu.jw.restmodel.base.patient;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by Trick on 2018/8/31.
 */
@ApiModel(value = "PatientFamilyMemberVO", description = "家庭成员")
public class PatientFamilyMemberVO {
    @ApiModelProperty(value = "id")
    private String id;//主键id
    @ApiModelProperty(value = "居民code")
    private String patient;//居民code',
    @ApiModelProperty(value = "家庭成员code")
    private String familyMember;//家庭成员code',
    @ApiModelProperty(value = "家庭关系 1父亲 2母亲 3老公 4老婆 5儿子 6女儿 7其他")
    private String familyRelation;//家庭关系',
    @ApiModelProperty(value = "是否授权0")
    private Integer isAuthorize;//是否授权0:未授权,1:已授权，默认为1',
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getFamilyMember() {
        return familyMember;
    }
    public void setFamilyMember(String familyMember) {
        this.familyMember = familyMember;
    }
    public String getFamilyRelation() {
        return familyRelation;
    }
    public void setFamilyRelation(String familyRelation) {
        this.familyRelation = familyRelation;
    }
    public Integer getIsAuthorize() {
        return isAuthorize;
    }
    public void setIsAuthorize(Integer isAuthorize) {
        this.isAuthorize = isAuthorize;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/team/teamMemberVO.java

@@ -0,0 +1,62 @@
package com.yihu.jw.restmodel.base.team;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by Trick on 2018/8/31.
 */
@ApiModel(value = "TeamMemberVO", description = "团队成员")
public class TeamMemberVO {
    @ApiModelProperty(value = "id")
    private String id;
    @ApiModelProperty(value = "团队ID")
    private String teamId;//团队ID',
    @ApiModelProperty(value = "机构标识")
    private String orgId;//机构标识',
    @ApiModelProperty(value = "医生标识，多个医生以逗号分开")
    private String doctorId;//医生标识，多个医生以逗号分开',
    @ApiModelProperty(value = "作废标识，1正常，0作废'")
    private String del;//作废标识，1正常，0作废',
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getTeamId() {
        return teamId;
    }
    public void setTeamId(String teamId) {
        this.teamId = teamId;
    }
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    public String getDoctorId() {
        return doctorId;
    }
    public void setDoctorId(String doctorId) {
        this.doctorId = doctorId;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/team/teamVO.java

@@ -0,0 +1,80 @@
package com.yihu.jw.restmodel.base.team;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by Trick on 2018/8/31.
 */
public class TeamVO {
    @ApiModelProperty(value = "id")
    private String id;
    @ApiModelProperty(value = "saas化")
    private String saasid;//saas化',
    @ApiModelProperty(value = "团队名称")
    private String name;//团队名称',
    @ApiModelProperty(value = "领导医生标识")
    private String leaderId;//领导医生标识',
    @ApiModelProperty(value = "团队人数")
    private String teamNum;//团队人数',
    @ApiModelProperty(value = "团队二维码")
    private String qrcode;//团队二维码',
    @ApiModelProperty(value = "作废标识，1正常，0作废',")
    private String del;//作废标识，1正常，0作废',
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasid() {
        return saasid;
    }
    public void setSaasid(String saasid) {
        this.saasid = saasid;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getLeaderId() {
        return leaderId;
    }
    public void setLeaderId(String leaderId) {
        this.leaderId = leaderId;
    }
    public String getTeamNum() {
        return teamNum;
    }
    public void setTeamNum(String teamNum) {
        this.teamNum = teamNum;
    }
    public String getQrcode() {
        return qrcode;
    }
    public void setQrcode(String qrcode) {
        this.qrcode = qrcode;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

common/common-util/src/main/java/com/yihu/jw/util/idcard/IdCardUtil.java

@@ -0,0 +1,182 @@
package com.yihu.jw.util.idcard;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
/**
 * Created by Trick on 2018/9/3.
 */
public class IdCardUtil {
    public static String level_sex_1="1";
    public static String level_sex_2="2";
    public static String level_sex_3="3";
//    public static String level_sex_1_name="男";
//    public static String level_sex_2_name="女";
//    public static String level_sex_3_name="未知";
    /**
     * 根据身份证的号码算出当前身份证持有者的年龄
     *
     * @param
     * @throws Exception
     */
    public static int getAgeForIdcard(String idcard) {
        try {
            int age = 0;
            if (StringUtils.isEmpty(idcard)) {
                return age;
            }
            String birth = "";
            if (idcard.length() == 18) {
                birth = idcard.substring(6, 14);
            } else if (idcard.length() == 15) {
                birth = "19" + idcard.substring(6, 12);
            }
            int year = Integer.valueOf(birth.substring(0, 4));
            int month = Integer.valueOf(birth.substring(4, 6));
            int day = Integer.valueOf(birth.substring(6));
            Calendar cal = Calendar.getInstance();
            age = cal.get(Calendar.YEAR) - year;
            //周岁计算
            if (cal.get(Calendar.MONTH) < (month - 1) || (cal.get(Calendar.MONTH) == (month - 1) && cal.get(Calendar.DATE) < day)) {
                age--;
            }
            return age;
        } catch (Exception e) {
        }
        return -1;
    }
    /**
     * 身份证提取出身日期
     *
     * @param card
     * @return
     * @throws Exception
     */
    public static Date getBirthdayForIdcard(String card)
            throws Exception {
        Date b = null;
        if (card.length() == 18) {
            String year = card.substring(6).substring(0, 4);// 得到年份
            String yue = card.substring(10).substring(0, 2);// 得到月份
            String ri = card.substring(12).substring(0, 2);// 得到日
            // String day=CardCode.substring(12).substring(0,2);//得到日
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
            b = format.parse(year + "-" + yue + "-" + ri);
        } else if (card.length() == 15) {
            String uyear = "19" + card.substring(6, 8);// 年份
            String uyue = card.substring(8, 10);// 月份
            String uri = card.substring(10, 12);// 得到日
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
            b = format.parse(uyear + "-" + uyue + "-" + uri);
        }
        return b;
    }
    /**
     * 身份证提取出身日期
     *
     * @param card
     * @return
     * @throws Exception
     */
    public static String getBirthdayForIdcardStr(String card)
            throws Exception {
        if (card.length() == 18) {
            String year = card.substring(6).substring(0, 4);// 得到年份
            String yue = card.substring(10).substring(0, 2);// 得到月份
            String ri = card.substring(12).substring(0, 2);// 得到日
            // String day=CardCode.substring(12).substring(0,2);//得到日
            return year + yue + ri;
        } else if (card.length() == 15) {
            String uyear = "19" + card.substring(6, 8);// 年份
            String uyue = card.substring(8, 10);// 月份
            String uri = card.substring(10, 12);// 得到日
            return uyear + uyue + uri;
        }
        return null;
    }
    /**
     * 根据身份证的号码算出当前身份证持有者的性别
     * 1 女 2 男 3未知
     *
     * @return
     * @throws Exception
     */
    public static String getSexForIdcard(String CardCode)
            throws Exception {
        String sex = level_sex_3;
        if (CardCode.length() == 18) {
            if (Integer.parseInt(CardCode.substring(16).substring(0, 1)) % 2 == 0) {// 判断性别
                // modifid by lyr 2016-09-29
                // sex =  Constant.level_sex_2;
                sex =level_sex_1;
                // modifid by lyr 2016-09-29
            } else {
                // modifid by lyr 2016-09-29
                // sex =  Constant.level_sex_1;
                sex = level_sex_2;
                // modifid by lyr 2016-09-29
            }
        } else if (CardCode.length() == 15) {
            String usex = CardCode.substring(14, 15);// 用户的性别
            if (Integer.parseInt(usex) % 2 == 0) {
                // sex =  Constant.level_sex_2;
                sex = level_sex_1;
            } else {
                // sex =  Constant.level_sex_1;
                sex = level_sex_2;
            }
        }
        return sex;
    }
    /**
     * 根据身份证的号码算出当前身份证持有者的性别
     * 1 男 2 女 3未知
     *
     * @return
     * @throws Exception
     */
    public static String getSexForIdcard_new(String CardCode)
            throws Exception {
        String sex = level_sex_3;
        try {
            if (CardCode.length() == 18) {
                if (Integer.parseInt(CardCode.substring(16).substring(0, 1)) % 2 == 0) {// 判断性别
                    // modifid by lyr 2016-09-29
                    sex = level_sex_2;
                    // modifid by lyr 2016-09-29
                } else {
                    // modifid by lyr 2016-09-29
                    sex = level_sex_1;
                    // modifid by lyr 2016-09-29
                }
            } else if (CardCode.length() == 15) {
                String usex = CardCode.substring(14, 15);// 用户的性别
                if (Integer.parseInt(usex) % 2 == 0) {
                    sex = level_sex_2;
                } else {
                    sex = level_sex_1;
                }
            }
            return sex;
        } catch (Exception e) {
            e.printStackTrace();
        }
        return sex;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/patient/BasePatientDao.java

@@ -0,0 +1,13 @@
package com.yihu.jw.base.dao.patient;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BasePatientDao extends PagingAndSortingRepository<BasePatientDO, String>, JpaSpecificationExecutor<BasePatientDO> {
    BasePatientDO findByIdAndDel(String id,String del);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/patient/BasePatientFamilyMemberDao.java

@@ -0,0 +1,13 @@
package com.yihu.jw.base.dao.patient;
import com.yihu.jw.entity.base.patient.BasePatientFamilyMemberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BasePatientFamilyMemberDao extends PagingAndSortingRepository<BasePatientFamilyMemberDO, String>, JpaSpecificationExecutor<BasePatientFamilyMemberDO> {
    public BasePatientFamilyMemberDO findByPatientAndFamilyMember(String patient,String member);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/score/BaseEvaluateDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.base.dao.score;
import com.yihu.jw.entity.base.score.BaseEvaluateDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BaseEvaluateDao extends PagingAndSortingRepository<BaseEvaluateDO, String>, JpaSpecificationExecutor<BaseEvaluateDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/score/BaseEvaluateScoreDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao.score;
import com.yihu.jw.entity.base.score.BaseEvaluateScoreDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BaseEvaluateScoreDao extends PagingAndSortingRepository<BaseEvaluateScoreDO, String>, JpaSpecificationExecutor<BaseEvaluateScoreDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/team/BaseTeamDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao.team;
import com.yihu.jw.entity.base.team.BaseTeamDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BaseTeamDao extends PagingAndSortingRepository<BaseTeamDO, String>, JpaSpecificationExecutor<BaseTeamDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/team/BaseTeamMemberDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao.team;
import com.yihu.jw.entity.base.team.BaseTeamMemberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BaseTeamMemberDao extends PagingAndSortingRepository<BaseTeamMemberDO, String>, JpaSpecificationExecutor<BaseTeamMemberDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/patient/PatientFamilyMemberEndpoint.java

@@ -0,0 +1,49 @@
package com.yihu.jw.base.endpoint.patient;
import com.yihu.jw.base.service.patient.PatientFamilyMemberService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created by Trick on 2018/9/3.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.PatientMember.PREFIX)
@Api(value = "家庭成员", description = "家庭成员管理", tags = {"wlyy基础服务 - 家庭成员管理"})
public class PatientFamilyMemberEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private PatientFamilyMemberService patientMemberService;
    @PostMapping(value = BaseRequestMapping.PatientMember.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public Envelop createFamilyMember(@ApiParam(name = "patient", value = "用户id", required = true)
                                      @RequestParam(value = "patient")String patient,
                                      @ApiParam(name = "member", value = "家庭成员id", required = true)
                                      @RequestParam(value = "member")String member,
                                      @ApiParam(name = "relation", value = "关系 1父亲 2母亲 3老公 4老婆 5儿子 6女儿 7其他", required = true)
                                      @RequestParam(value = "relation")Integer relation)throws Exception{
        patientMemberService.createFamilyMember(patient,member,relation);
        return success("success");
    }
    @PostMapping(value = BaseRequestMapping.PatientMember.DELETE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除")
    public Envelop delFamilyMember(@ApiParam(name = "patient", value = "用户id", required = true)
                                      @RequestParam(value = "patient")String patient,
                                      @ApiParam(name = "member", value = "家庭成员id", required = true)
                                      @RequestParam(value = "member")String member)throws Exception{
        patientMemberService.delFamilyMember(patient,member);
        return success("success");
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/score/ScoreEndPoint.java

@@ -0,0 +1,44 @@
package com.yihu.jw.base.endpoint.score;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.score.ScoreService;
import com.yihu.jw.entity.base.score.BaseEvaluateDO;
import com.yihu.jw.entity.base.score.BaseEvaluateScoreDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
 * Created by Trick on 2018/9/3.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Score.PREFIX)
@Api(value = "评价系统", description = "评价系统", tags = {"wlyy基础服务 - 评价系统"})
public class ScoreEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private ScoreService scoreService;
    @PostMapping(value = BaseRequestMapping.Score.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public Envelop addEvaluateScore(@ApiParam(name = "baseEvaluateScoreJson", value = "分数主表json", required = true)
                                    @RequestParam(value = "baseEvaluateScoreJson") String baseEvaluateScoreJson,
                                    @ApiParam(name = "evaluates", value = "用户列表", required = true)
                                    @RequestParam(value = "evaluates") String evaluates) {
        BaseEvaluateScoreDO baseEvaluateScoreDO = JSONObject.parseObject(baseEvaluateScoreJson, BaseEvaluateScoreDO.class);
        List<BaseEvaluateDO> evaluateDOs = (List<BaseEvaluateDO>) JSONArray.parseArray(evaluates, BaseEvaluateDO.class);
        scoreService.addEvaluateScore(baseEvaluateScoreDO, evaluateDOs);
        return success("success");
    }
}

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

@@ -0,0 +1,15 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.UserDao;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Service - 后台管理员
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class UserService extends BaseJpaService<UserDO, UserDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/patient/PatientFamilyMemberService.java

@@ -0,0 +1,121 @@
package com.yihu.jw.base.service.patient;
import com.yihu.jw.base.dao.patient.BasePatientDao;
import com.yihu.jw.base.dao.patient.BasePatientFamilyMemberDao;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.BasePatientFamilyMemberDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.util.idcard.IdCardUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
 * Created by Trick on 2018/8/31.
 */
@Service
@Transactional
public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamilyMemberDO,BasePatientFamilyMemberDao> {
    @Autowired
    private BasePatientFamilyMemberDao familyMemberDao;
    @Autowired
    private BasePatientDao basePatientDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public String createFamilyMember(String patient,String member,Integer relation)throws Exception{
        BasePatientDO pDo = basePatientDao.findByIdAndDel(patient,"1");
        BasePatientDO mDo = basePatientDao.findByIdAndDel(patient,"1");
        BasePatientFamilyMemberDO family1 = new BasePatientFamilyMemberDO();
        //添加正向关系
        family1.setPatient(patient);
        family1.setFamilyMember(member);
        family1.setFamilyRelation(relation);
        //默认添加已经授权记录，用户同意授权之后调用此接口
        family1.setIsAuthorize(1);
        //添加反向关系
        BasePatientFamilyMemberDO family2 = new BasePatientFamilyMemberDO();
        family1.setPatient(patient);
        family1.setFamilyMember(member);
        family1.setFamilyRelation(familyRelationTrans(mDo,relation));
        //默认添加已经授权记录，用户同意授权之后调用此接口
        family1.setIsAuthorize(1);
        return "1";
    }
    public String delFamilyMember(String patient,String member)throws Exception{
        BasePatientFamilyMemberDO family1 = familyMemberDao.findByPatientAndFamilyMember(patient,member);
        BasePatientFamilyMemberDO family2 = familyMemberDao.findByPatientAndFamilyMember(member,patient);
        familyMemberDao.delete(family1);
        familyMemberDao.delete(family2);
        return "1";
    }
    /**
     * 家庭关系转换
     *
     * @param patient  居民
     * @param relation 关系 1父亲 2母亲 3老公 4老婆 5儿子 6女儿 7其他
     * @return
     */
    public int familyRelationTrans(BasePatientDO patient, Integer relation) throws Exception {
        int relationTrans = 0;
        switch (relation) {
            case 1:
            case 2:
                if (patient.getSex() == 1) {
                    relationTrans = 5;
                } else if (patient.getSex() == 2) {
                    relationTrans = 6;
                } else {
                    relationTrans = 0;
                }
                if (relationTrans == 0) {
                    if (IdCardUtil.getSexForIdcard(StringUtils.isEmpty(patient.getIdcard()) ? "" : patient.getIdcard()).equals("1")) {
                        relationTrans = 6;
                    } else if (IdCardUtil.getSexForIdcard(StringUtils.isEmpty(patient.getIdcard()) ? "" : patient.getIdcard()).equals("2")) {
                        relationTrans = 5;
                    }
                }
                break;
            case 3:
                relationTrans = 4;
                break;
            case 4:
                relationTrans = 3;
                break;
            case 5:
            case 6:
                if (patient.getSex() == 1) {
                    relationTrans = 1;
                } else if (patient.getSex() == 2) {
                    relationTrans = 2;
                } else {
                    relationTrans = 0;
                }
                if (relationTrans == 0) {
                    if (IdCardUtil.getSexForIdcard(StringUtils.isEmpty(patient.getIdcard()) ? "" : patient.getIdcard()).equals("1")) {
                        relationTrans = 2;
                    } else if (IdCardUtil.getSexForIdcard(StringUtils.isEmpty(patient.getIdcard()) ? "" : patient.getIdcard()).equals("2")) {
                        relationTrans = 1;
                    }
                }
                break;
        }
        return relationTrans;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/score/ScoreService.java

@@ -0,0 +1,42 @@
package com.yihu.jw.base.service.score;
import com.yihu.jw.base.dao.score.BaseEvaluateDao;
import com.yihu.jw.base.dao.score.BaseEvaluateScoreDao;
import com.yihu.jw.entity.base.score.BaseEvaluateDO;
import com.yihu.jw.entity.base.score.BaseEvaluateScoreDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
/**
 * Created by Trick on 2018/8/31.
 */
@Service
@Transactional
public class ScoreService {
    @Autowired
    private BaseEvaluateScoreDao baseEvaluateScoreDao;
    @Autowired
    private BaseEvaluateDao baseEvaluateDao;
    public String addEvaluateScore(BaseEvaluateScoreDO baseEvaluateScoreDO, List<BaseEvaluateDO> evaluateDOList){
        if(evaluateDOList!=null&& evaluateDOList.size()>0){
            Double total = 0.0;
            for(BaseEvaluateDO evaluate :evaluateDOList){
                total += evaluate.getScore();
            }
            Double avg = new BigDecimal(total/evaluateDOList.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
            baseEvaluateScoreDO.setScore(avg);
            baseEvaluateDao.save(evaluateDOList);
            baseEvaluateScoreDao.save(baseEvaluateScoreDO);
        }
        return "success";
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/team/TeamService.java

@@ -0,0 +1,25 @@
package com.yihu.jw.base.service.team;
import com.yihu.jw.base.dao.FunctionDao;
import com.yihu.jw.base.dao.team.BaseTeamDao;
import com.yihu.jw.base.dao.team.BaseTeamMemberDao;
import com.yihu.jw.entity.base.team.BaseTeamDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
 * Created by Trick on 2018/8/31.
 */
@Service
@Transactional
public class TeamService extends BaseJpaService<BaseTeamDO, FunctionDao> {
    @Autowired
    private BaseTeamDao teamDao;
    @Autowired
    private BaseTeamMemberDao baseTeamMemberDao;
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/rehabilitation/RehabilitationManageController.java

@@ -281,12 +281,12 @@ public class RehabilitationManageController {
    }
    @PostMapping(value = SpecialistMapping.rehabilitation.updateNoteAndImageRehabilitationOperate)
    @ApiOperation(value = "康复计划完成时更新服务完成笔记和图片接口.")
    @ApiOperation(value = "康复计划完成时更新服务完成笔记和图片接口并且确认完成")
    public Envelop updateNoteAndImageRehabilitationOperate(@ApiParam(name = "planDetailId", value = "服务项目id", required = true)@RequestParam(value = "planDetailId", required = true)String planDetailId,
                                                           @ApiParam(name = "node", value = "服务完成笔记", required = true)@RequestParam(value = "node", required = true)String node,
                                                           @ApiParam(name = "image", value = "相关记录图片，json格式", required = true)@RequestParam(value = "image", required = true)String image){
                                                           @ApiParam(name = "node", value = "服务完成笔记", required = true)@RequestParam(value = "node", required = false)String node,
                                                           @ApiParam(name = "image", value = "相关记录图片，json格式", required = true)@RequestParam(value = "image", required = false)String image){
        try {
            if(rehabilitationManageService.updateNodeAndRelationRecordImg(node,image,planDetailId)>0){
            if(rehabilitationManageService.updateNodeAndRelationRecordImg(node,image,planDetailId)>1){
                return Envelop.getSuccess(SpecialistMapping.api_success);
            }
            return Envelop.getError("update error!");

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/rehabilitation/RehabilitationPlanController.java

@@ -242,7 +242,7 @@ public class RehabilitationPlanController extends EnvelopRestEndpoint {
            RehabilitationOperateRecordsDO rehabilitationOperateRecordsDO= toEntity(dataJson, RehabilitationOperateRecordsDO.class);
            List<RehabilitationOperateRecordsDO> list = rehabilitationOperateRecordsDao.findByRehabilitationDetailId(rehabilitationOperateRecordsDO.getRehabilitationDetailId());
            if (list!=null && list.size()>0){
                return MixEnvelop.getError("改明细日志已存在！");
                return MixEnvelop.getError("该明细日志已存在！");
            }
            return MixEnvelop.getSuccess(SpecialistMapping.api_success,rehabilitationPlanService.saveRehabilitationRecord(rehabilitationOperateRecordsDO));
        }catch (Exception e){

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/rehabilitation/RehabilitationOperateRecordsDao.java

@@ -20,6 +20,6 @@ public interface RehabilitationOperateRecordsDao extends PagingAndSortingReposit
    int updateStatus(Integer status,String rehabilitationDetailId);
    @Modifying
    @Query("update RehabilitationOperateRecordsDO a set a.node=?1,a.relationRecordImg=?2 where a.rehabilitationDetailId =?3 ")
    @Query("update RehabilitationOperateRecordsDO a set a.node=?1,a.relationRecordImg=?2,a.status=1 where a.rehabilitationDetailId =?3 ")
    int updateNodeAndRelationRecordImg(String node,String rehabilitationRecordImg,String rehabilitataioDetailId);
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -1033,14 +1033,19 @@ public class RehabilitationManageService {
    }
    /**
     * 更新康复计划项目操作日志
     * 更新康复计划项目操作日志并且确认完成更新status
     * @param node
     * @param image
     * @param planDeatilId
     * @return
     */
    public int updateNodeAndRelationRecordImg(String node,String image,String planDeatilId){
        return rehabilitationOperateRecordsDao.updateNodeAndRelationRecordImg(node,image,planDeatilId);
        int i = 0;
        i = rehabilitationDetailDao.updateStatusById(1,planDeatilId);
        int j = 0;
        j = rehabilitationOperateRecordsDao.updateNodeAndRelationRecordImg(node,image,planDeatilId);
        int result = i+j;
        return  result;
    }
    /**

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationPlanService.java

@@ -294,7 +294,8 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
            if (org.apache.commons.lang3.StringUtils.isNotBlank(rehabilitationDetailDO.getServiceQrCode())) {
                fileUrl = rehabilitationDetailDO.getServiceQrCode();
            } else {
                String contentJsonStr="{\"planDetailId\":\""+planDetailId+"\",\"sessionId\":\""+sessionId+"\"}";
                //String contentJsonStr="{\"planDetailId\":\""+planDetailId+"\",\"sessionId\":\""+sessionId+"\"}";
                String contentJsonStr=""+"?paramStr="+planDetailId+","+sessionId;
                InputStream ipt = QrcodeUtil.createQrcode(contentJsonStr, 300, "png");
                isneiwang = false;
                if (isneiwang) {