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

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

@@ -220,7 +220,7 @@ public class FamilyMemberService extends BaseService {
        if (result != null && result.size() > 0) {
            for (Map<String, Object> map : result) {
                JSONObject obj = new JSONObject();
                List<SignFamily> signs = contractService.findAllSignByPatient(patient);
                List<SignFamily> signs = contractService.findAllSignByPatient(map.get("code").toString());
                boolean ssSign = false;
                boolean jtSign = false;

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/SMSService.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.patient.PatientDao;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.json.JSONObject;
@@ -28,6 +30,8 @@ public class SMSService extends BaseService {
    @Autowired
    public SMSDao smsDao;
    @Autowired
    PatientDao patientDao;
    /**
     * 发送短信验证码接口
@@ -38,7 +42,7 @@ public class SMSService extends BaseService {
     * @return
     * @throws Exception
     */
    public String send(String mobile, String ip, int type) throws Exception {
    public String send(String mobile, String ip, int type, String code) throws Exception {
        // 生成6位随机验证码
        String captcha = String.valueOf(Math.random()).substring(2, 8);
        // 默认为123456
@@ -80,7 +84,7 @@ public class SMSService extends BaseService {
            sms.setContent("您的注册验证码为：" + captcha);
        } else if (type == 2 || type == 3) {
            // 找回密码
            sms.setContent("【厦门市民健康系统】您的找回密码验证码为：" + captcha );
            sms.setContent("【厦门市民健康系统】您的找回密码验证码为：" + captcha);
        } else if (type == 4 || type == 5) {
            // 登录
            sms.setContent("您的登录验证码为：" + captcha);
@@ -94,8 +98,12 @@ public class SMSService extends BaseService {
            // 新手机号绑定验证
            sms.setContent("【厦门市民健康系统】您绑定手机号的验证码为：" + captcha);
        } else if (type == 10) {
            Patient patient = patientDao.findByCode(code);
            if (patient == null) {
                throw new Exception("短信发送失败！");
            }
            // 新手机号绑定验证
            sms.setContent("【厦门市民健康系统】XXX欲添加您为家人,验证码为：" + captcha + "。如其非您的家人，请忽略本短信。");
            sms.setContent("【厦门市民健康系统】" + patient.getName() + "欲添加您为家人,验证码为：" + captcha + "。如其非您的家人，请忽略本短信。");
        } else {
            // 其他验证码
            sms.setContent("验证码：" + captcha);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/sms/SMSController.java

@@ -70,7 +70,7 @@ public class SMSController extends BaseController {
			if (StringUtils.isEmpty(ip)) {
				return error(-1, "无效的ip请求！");
			}
			String res = smsService.send(mobile, ip, type);
			String res = smsService.send(mobile, ip, type, getUID());
			if (StringUtils.equals(res, "ok")) {
				return write(200, "验证码短信已发送！");
			} else {

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

@@ -50,7 +50,7 @@ public class FamilyMemberController extends BaseController {
                return error(-1, "家庭关系无效");
            }
            int result = familyMemberService.addMember("940976bd50404d2fb9aef98057d85361", member, captcha, password, relation);
            int result = familyMemberService.addMember(getUID(), member, captcha, password, relation);
            if (result == -1) {
                return error(-1, "居民信息查询失败");
@@ -87,7 +87,7 @@ public class FamilyMemberController extends BaseController {
                return error(-1, "家庭关系无效");
            }
            int result = familyMemberService.modifyFamilyRelation("940976bd50404d2fb9aef98057d85361", member, relation);
            int result = familyMemberService.modifyFamilyRelation(getUID(), member, relation);
            if (result == -1) {
                return error(-1, "居民信息查询失败");
@@ -118,7 +118,7 @@ public class FamilyMemberController extends BaseController {
                return error(-1, "成员不能为空");
            }
            int result = familyMemberService.deleteMember("940976bd50404d2fb9aef98057d85361", member);
            int result = familyMemberService.deleteMember(getUID(), member);
            if (result == -1) {
                return error(-1, "与该成员的关系不存在");
@@ -140,7 +140,7 @@ public class FamilyMemberController extends BaseController {
    @ApiOperation(value = "家庭成员查询")
    public String getPatientFamilyMembers() {
        try {
            JSONArray result = familyMemberService.getPatientFamilyMembers("940976bd50404d2fb9aef98057d85361");
            JSONArray result = familyMemberService.getPatientFamilyMembers(getUID());
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {