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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -3986,7 +3986,7 @@ public class FamilyContractService extends BaseService {
        SignFamily sf = new SignFamily();
        String sql = "SELECT t.doctor,t.doctor_health，t.team_code teamCode,t.admin_team_code adminTeamCode,t.mobile FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status=-4 AND t.expenses_status='1' AND t.sign_year ='" + (DateUtil.getSignYear() - 1) + "'";
        String sql = "SELECT t.doctor,t.doctor_health,t.team_code teamCode,t.admin_team_code adminTeamCode,t.mobile FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status=-4 AND t.expenses_status='1' AND t.sign_year ='" + (DateUtil.getSignYear() - 1) + "'";
        List<Map<String, Object>> signs = jdbcTemplate.queryForList(sql);
        if (signs == null || signs.size() == 0) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -2820,8 +2820,8 @@ public class SignWebService extends BaseService {
        //新建全科医生成员
        DoctorTeamMember dmb = new DoctorTeamMember();
        dmb.setName(renew.getDoctorName());
        dmb.setMemberCode(renew.getDoctor());
        dmb.setName(d.getName());
        dmb.setMemberCode(d.getCode());
        dmb.setCode(getCode());
        dmb.setDel("1");
        dmb.setCzrq(new Date());

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

@@ -1062,10 +1062,10 @@ public class PatientController extends WeixinBaseController {
    @RequestMapping(value = "/getDoctorActivityPath")
    @ResponseBody
    private String getDoctorActivityPath(String code){
    public String getDoctorActivityPath(String code){
        try {
            Doctor d = doctorService.findDoctorByCode(code);
            return write(-1, "获取成功!", "data", d.getActivityPath());
            return write(200, "获取成功!", "data", d.getActivityPath());
        }catch (Exception e){
            error(e);
            return error(-1, "获取地址失败");