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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -737,20 +737,45 @@ public class DoctorInfoService extends BaseService {
        return 1;
    }
    @Transactional
    public void updatePassword(String newPassword1, String newPassword2, String oldPassword, String doctorCode) throws Exception{
        if(!newPassword1.equals(newPassword2)){
           throw new Exception("新密码不一致");
    public void updatePassword(String newPassword1, String newPassword2, String oldPassword, String doctorCode) throws Exception {
        if (!newPassword1.equals(newPassword2)) {
            throw new Exception("新密码不一致");
        }
        if(!newPassword1.equals(oldPassword)){
        if (!newPassword1.equals(oldPassword)) {
            throw new Exception("新旧密码一致");
        }
        Doctor doctor=doctorDao.findByCode(doctorCode);
        String oldPasswordTemp= MD5.GetMD5Code(oldPassword+doctor.getSalt());
        if(!oldPasswordTemp.equals(doctor.getPassword())){
        Doctor doctor = doctorDao.findByCode(doctorCode);
        String oldPasswordTemp = MD5.GetMD5Code(oldPassword + doctor.getSalt());
        if (!oldPasswordTemp.equals(doctor.getPassword())) {
            throw new Exception("旧密码错误");
        }
        String newPassword1Temp= MD5.GetMD5Code(newPassword1+doctor.getSalt());
        String newPassword1Temp = MD5.GetMD5Code(newPassword1 + doctor.getSalt());
        doctor.setPassword(newPassword1Temp);
    }
    /**
     * 查询患者是否与医生签约
     *
     * @param patient
     * @param doctor
     * @return
     */
    public boolean isPatientSigned(String patient, String doctor) {
        boolean bo = false;
        //签约团队
        DoctorTeam dt = doctorTeamDao.findByPatientCode(patient);
        DoctorTeam dtSS = doctorTeamDao.findSsTeamByPatientCode(patient);
        //医生是否属于团队成员
        if (dt != null && doctorTeamDoctor.countMemberByTeamAndCode(dt.getCode(), doctor) > 0) {
            bo = true;
        }
        if (dtSS != null && doctorTeamDoctor.countMemberByTeamAndCode(dtSS.getCode(), doctor) > 0) {
            bo = true;
        }
        return bo;
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -493,7 +493,7 @@ public class DoctorController extends BaseController {
                //是否名医
                json.put("isFamous", temp.getIsFamous());
                //是否医生提示 提示过是1 其他都是0
                json.put("isPasswordPrompt", StringUtils.isEmpty(temp.getIsPasswordPrompt())?"0":temp.getIsPasswordPrompt());
                json.put("isPasswordPrompt", StringUtils.isEmpty(temp.getIsPasswordPrompt()) ? "0" : temp.getIsPasswordPrompt());
                return write(200, "医生信息查询成功！", "data", json);
            } else {
@@ -1524,4 +1524,26 @@ public class DoctorController extends BaseController {
        }
    }
    /**
     * 当前医生是否与居民签约
     *
     * @param patient
     * @return
     */
    @RequestMapping(value = "/is_patient_signed")
    @ResponseBody
    public String isPatientSign(String patient) {
        try {
            if (StringUtils.isEmpty(patient)) {
                return error(-1, "居民不能为空");
            }
            boolean isSigned = doctorInfoService.isPatientSigned(patient, getUID());
            return write(200, "查询成功", "data", isSigned ? "1" : "0");
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -35,10 +35,12 @@ public class FamilyMemberController extends BaseController {
     * @param relation 关系
     * @return
     */
    @RequestMapping(value = "/member_add")
    @RequestMapping(value = "/member_add",method = RequestMethod.POST)
    @ApiOperation(value = "添加成员")
    public String addFamilyMember(String member, @RequestParam(required = false) String captcha,
                                  @RequestParam(required = false) String password, int relation) {
    public String addFamilyMember(@RequestParam("member")String member,
                                  @RequestParam(value = "captcha",required = false) String captcha,
                                  @RequestParam(value = "password",required = false) String password,
                                  @RequestParam("relation")int relation) {
        try {
            if (StringUtils.isEmpty(member)) {
                return error(-1, "添加成员不能为空");
@@ -76,9 +78,9 @@ public class FamilyMemberController extends BaseController {
     * @param relation 家庭关系
     * @return
     */
    @RequestMapping(value = "/relation_update")
    @RequestMapping(value = "/relation_update",method = RequestMethod.POST)
    @ApiOperation(value = "家庭成员关系修改")
    public String modifyFamilyRelation(String member, int relation) {
    public String modifyFamilyRelation(@RequestParam("member")String member, @RequestParam("relation")int relation) {
        try {
            if (StringUtils.isEmpty(member)) {
                return error(-1, "添加成员不能为空");
@@ -110,9 +112,9 @@ public class FamilyMemberController extends BaseController {
     * @param member
     * @return
     */
    @RequestMapping(value = "/member_delete")
    @RequestMapping(value = "/member_delete",method = RequestMethod.POST)
    @ApiOperation(value = "家庭成员删除")
    public String deleteMember(String member) {
    public String deleteMember(@RequestParam("member")String member) {
        try {
            if (StringUtils.isEmpty(member)) {
                return error(-1, "成员不能为空");
@@ -157,7 +159,7 @@ public class FamilyMemberController extends BaseController {
     */
    @RequestMapping(value = "/is_register", method = RequestMethod.GET)
    @ApiOperation(value = "家庭成员查询")
    public String isRegister(String idcard) {
    public String isRegister(@RequestParam("idcard")String idcard) {
        try {
            if (StringUtils.isEmpty(idcard)) {
                return error(-1, "身份证号不能为空");