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

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

@@ -1618,6 +1618,7 @@ public class FamilyContractService extends BaseService {
        if (signFamily == null) {
            result.put("status", -1);
            result.put("msg", "居民不存在家庭签约");
            return result;
        }
        if (StringUtils.isNotEmpty(healthDoctor)) {
@@ -1625,6 +1626,7 @@ public class FamilyContractService extends BaseService {
            if (docHealth == null) {
                result.put("status", -2);
                result.put("msg", "医生不存在");
                return result;
            }
            if (StringUtils.isNotEmpty(signFamily.getDoctorHealth())) {
                //判断患者对旧的健管师是否存在健康咨询
@@ -1632,6 +1634,7 @@ public class FamilyContractService extends BaseService {
                if (consultTeam != null) {
                    result.put("status", -1);
                    result.put("msg", "与当前健管师有未结束的咨询");
                    return result;
                }
                DoctorTeamMember teamMember = doctorTeamDoctor.findMemberByTeamAndCode(signFamily.getTeamCode(), signFamily.getDoctorHealth());
@@ -1668,6 +1671,7 @@ public class FamilyContractService extends BaseService {
            if (docQk == null) {
                result.put("status", -2);
                result.put("msg", "医生不存在");
                return result;
            }
            if (StringUtils.isNotEmpty(signFamily.getDoctor())) {
                DoctorTeamMember teamMember = doctorTeamDoctor.findMemberByTeamAndCode(signFamily.getTeamCode(), signFamily.getDoctor());
@@ -1703,6 +1707,7 @@ public class FamilyContractService extends BaseService {
            if (StringUtils.isNotEmpty(signFamily.getMedicalInsuranceNum())) {
                result.put("status", -3);
                result.put("msg", "数据已上传社保，不能修改补贴类型");
                return result;
            } else {
                signFamily.setExpensesType(expensesType);
            }