Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyMemberService.java

@@ -148,6 +148,12 @@ public class FamilyMemberService extends BaseService {
        memberDao.save(fm);
        memberDao.save(fmt);
        //设置家人openid
        if(StringUtils.isBlank(m.getOpenid())){
            m.setOpenid(p.getOpenid());
            patientDao.save(m);
        }
        return 1;
    }
@@ -1106,6 +1112,12 @@ public class FamilyMemberService extends BaseService {
        memberDao.save(fm);
        memberDao.save(fmt);
        //设置家人openid
        if(StringUtils.isBlank(m.getOpenid())){
            m.setOpenid(p.getOpenid());
            patientDao.save(m);
        }
        return 1;
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -1484,7 +1484,7 @@ public class SignPatientLabelInfoService extends BaseService {
                    SignPatientLabel lb = labelService.getLabelByCodeAndType(label.getLabel(), "4");
                    // 有指定团队时不在团队内的过滤
                    if (teamCode > 0 && teamCode != lb.getTeamCode()) {
                    if (teamCode > 0 &&lb!=null&& teamCode != lb.getTeamCode()) {
                        continue;
                    }
@@ -1492,10 +1492,10 @@ public class SignPatientLabelInfoService extends BaseService {
                        // 是否为签约团队标签
                        boolean teamLabelFlag = false;
                        if (ssTeam > 0 && ssTeam == (lb.getTeamCode()==null?0:lb.getTeamCode())) {
                        if (ssTeam > 0 &&lb!=null&& ssTeam == (lb.getTeamCode()==null?0:lb.getTeamCode())) {
                            teamLabelFlag = true;
                        }
                        if (jtTeam > 0 && jtTeam == (lb.getTeamCode()==null?0:lb.getTeamCode())) {
                        if (jtTeam > 0 &&lb!=null&& jtTeam == (lb.getTeamCode()==null?0:lb.getTeamCode())) {
                            teamLabelFlag = true;
                        }
                        // 有签约关系时，判断标签是否在签约团队标签，不是签约团队标签不显示；无签约关系时返回全部
@@ -1509,7 +1509,7 @@ public class SignPatientLabelInfoService extends BaseService {
                    json.put("teamCode", team.getId());
                    json.put("teamName", team.getName());
                    json.put("creator", lb.getCreator());
                    json.put("creator", lb==null?null:lb.getCreator());
                    json.put("creatorName", doc.getName());
                }

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

@@ -2006,30 +2006,31 @@ public class FamilyContractService extends BaseService {
                JSONObject data = new JSONObject();
                data.put("toUser", patient);
                data.put("represented",patient);//被代理人
                data.put("doctor", docHealth.getCode());
                data.put("doctorName", docHealth.getName());
                data.put("first", p.getName() + "，您好！因签约团队内分工调整，您的健康管理师有变动，" + oldDoctorHealthName +
                        "医生无法继续为您服务，具体变动如下：");
                data.put("keyword3", "家庭医生");
                data.put("first", p.getName() + "，您好！您签约团队的健康管理师已变更，您的新健管师信息如下：");
                data.put("keyword3", "家庭医生-健康管理师");
                data.put("keyword2", DateUtil.dateToStrNoSecond(new Date()));
                data.put("keyword1", docHealth.getName());
                if (StringUtils.isEmpty(signFamily.getDoctor()) || docHealth.getCode().equals(signFamily.getDoctor())) {
                    data.put("remark", docHealth.getName() + "医生将专门为您提供优质健康服务");
                    data.put("remark", docHealth.getName() + "医生将继续为您提供优质健康服务");
                } else {
                    data.put("remark", docHealth.getName() + "医生与" + signFamily.getDoctorName() + "医生一道，为您提供优质健康服务");
                    data.put("remark", docHealth.getName() + "医生将继续为您提供优质健康服务");
                }
                wxMessages.add(data);
            } else {
                JSONObject data = new JSONObject();
                data.put("toUser", patient);
                data.put("represented",patient);//被代理人
                data.put("doctor", docHealth.getCode());
                data.put("doctorName", docHealth.getName());
                data.put("first", p.getName() + "，您好！您的签约团队已为您新增一位健康管理师，医生信息如下：");
                data.put("keyword3", "家庭医生");
                data.put("keyword3", "家庭医生-健康管理师");
                data.put("keyword2", DateUtil.dateToStrNoSecond(new Date()));
                data.put("keyword1", docHealth.getName());
                if (StringUtils.isEmpty(signFamily.getDoctor()) || docHealth.getCode().equals(signFamily.getDoctor())) {
                    data.put("remark", docHealth.getName() + "医生将专门为您提供优质的健康服务");
                    data.put("remark", docHealth.getName() + "医生将继续为您提供优质健康服务");
                } else {
                    data.put("remark", docHealth.getName() + "医生与" + signFamily.getDoctorName() + "医生一道，为您提供优质健康服务");
                }
@@ -2118,15 +2119,14 @@ public class FamilyContractService extends BaseService {
            data.put("represented",patient);//被代理人
            data.put("doctor", docQk.getCode());
            data.put("doctorName", docQk.getName());
            data.put("first", p.getName() + "，您好！因签约团队内分工调整，您的责任医生有变动，" + oldDoctorName +
                    "医生无法继续为您服务，具体变动如下：");
            data.put("keyword3", "家庭医生");
            data.put("first", p.getName() + "，您好！您签约团队的全科医生已变更，您的新全科医生信息如下：");
            data.put("keyword3", "家庭医生-全科医生");
            data.put("keyword2", DateUtil.dateToStrNoSecond(new Date()));
            data.put("keyword1", docQk.getName());
            if (StringUtils.isEmpty(signFamily.getDoctorHealth()) || signFamily.getDoctor().equals(signFamily.getDoctorHealth())) {
                data.put("remark", docQk.getName() + "医生将专门为您提供优质健康服务");
            } else {
                data.put("remark", docQk.getName() + "医生与" + signFamily.getDoctorHealthName() + "医生一道，为您提供优质健康服务");
                data.put("remark", docQk.getName() + "医生将继续为您提供优质健康服务");
            }
            wxMessages.add(data);
        }

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

@@ -422,7 +422,7 @@ public class SignPatientLabelInfoController extends BaseController {
            }
            //D2016008240002
            JSONArray labels = labelInfoService.getPatientLabelByLabelTypeAndTeamCode(patient, labelType, teamCode, getUID());
            //JSONArray labels = labelInfoService.getPatientLabelByLabelTypeAndTeamCode(patient, labelType, teamCode, "D2016008240002");
            //JSONArray labels = labelInfoService.getPatientLabelByLabelTypeAndTeamCode(patient, labelType, teamCode, "xh1D201703150222");
            return write(200, "查询成功", "data", labels);
        } catch (Exception e) {
            e.printStackTrace();

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -1115,7 +1115,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
    @RequestMapping(value = "/sign_info_update")
    @ResponseBody
    @ObserverRequired
    public String updateSignInfo(String patient, @RequestParam(required = false) String healthDoctor,
    public String updateSignInfo(@RequestParam(required = false)String patient, @RequestParam(required = false) String healthDoctor,
                                 @RequestParam(required = false) String doctor,
                                 @RequestParam(required = false) String expensesType) {
        try {
@@ -1128,6 +1128,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            }
            JSONObject result = familyContractService.updateSignInfo(patient, healthDoctor, doctor, expensesType, getUID());
            //JSONObject result = familyContractService.updateSignInfo(patient, healthDoctor, doctor, expensesType, "xh1D201703150222");
            if (result.getInt("status") != 1) {
                return error(-1, result.getString("msg"));