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

@@ -2258,6 +2258,7 @@ public class FamilyContractService extends BaseService {
                jo.put("sex", doctor.getSex());//医生性别  1男，2女）
                jo.put("name", doctor.getName());//医生名称
                jo.put("photo", doctor.getPhoto());//医生头像
                jo.put("hosptial", doctor.getHospital());//所属机构
                jo.put("hosptialName", doctor.getHospitalName());//所属机构名称
                jo.put("level", doctor.getLevel());//医生等级1专科医生，2全科医生，3健康管理师
                jo.put("signType", "1");//签约类别 1是三师 2是家庭
@@ -2289,6 +2290,7 @@ public class FamilyContractService extends BaseService {
                jo.put("sex", doctor.getSex());
                jo.put("name", doctor.getName());
                jo.put("photo", doctor.getPhoto());
                jo.put("hosptial", doctor.getHospital());//所属机构
                jo.put("hosptialName", doctor.getHospitalName());
                jo.put("level", doctor.getLevel());
                jo.put("signType", "2");//2是家庭
@@ -2309,6 +2311,7 @@ public class FamilyContractService extends BaseService {
                jo.put("sex", doctorHealth.getSex());
                jo.put("name", doctorHealth.getName());
                jo.put("photo", doctorHealth.getPhoto());
                jo.put("hosptial", doctor.getHospital());//所属机构
                jo.put("hosptialName", doctorHealth.getHospitalName());
                jo.put("level", doctorHealth.getLevel());
                jo.put("signType", "2");//2是家庭