Merge branch 'dev' of liuwenbin/wlyy2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/patient/PatientRequestMapping.java

@@ -70,6 +70,7 @@ public class PatientRequestMapping {
        public static final String messageToBinding  = "/messageToBinding";
        public static final String cancelBindFamily  = "/cancelBindFamily";
        public static final String updateAuthorizeById  = "/updateAuthorizeById";
        public static final String nonageByIdcard  = "/nonageByIdcard";
    }
    public static class MyMessage extends Basic {

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/myFamily/MyFamilyEndpoint.java

@@ -67,7 +67,7 @@ public class MyFamilyEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "familyBindRole", value = "家庭关系关系 1配偶 2父亲 3母亲 4公公 5婆婆 6岳父 7岳母 8子女", required = true)
            @RequestParam(value = "familyBindRole",required = true) Integer familyBindRole) throws Exception {
        try{
            Map<String,Object> patientApplyLog = myFamilyService.bindingMyFamily( getUID(patient), familyMobile, 1,familyBindRole);
            Map<String,Object> patientApplyLog = myFamilyService.bindingMyFamily( getUID(patient), familyMobile, 1,familyBindRole,null);
            return success(patientApplyLog);
        }catch (Exception e){
            e.printStackTrace();
@@ -254,4 +254,18 @@ public class MyFamilyEndpoint extends EnvelopRestEndpoint {
            return failed(e.getMessage());
        }
    }
    @GetMapping(value = PatientRequestMapping.MyFamily.nonageByIdcard)
    @ApiOperation(value = "根据身份判断是否未成年 1成年，2未成年")
    public Envelop nonageByIdcard(
            @ApiParam(name = "idcard", value = "身份证", required = true)
            @RequestParam(value = "idcard",required = true) String idcard) throws Exception {
        try{
            Integer resultMap = myFamilyService.nonageByIdcard(idcard);
            return success(resultMap);
        }catch (Exception e){
            e.printStackTrace();
            return failed(e.getMessage());
        }
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/personal_info/PatientEndpoint.java

@@ -196,8 +196,10 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "预注册测试接口")
    public Envelop bespeakRegist(
            @ApiParam(name = "mobile", value = "手机号")
            @RequestParam(value = "mobile", required = true) String mobile) throws Exception {
        Map<String, Object> map = patientService.bespeakRegist(mobile, 2L);
            @RequestParam(value = "mobile", required = true) String mobile,
            @ApiParam(name = "name", value = "居民名称")
            @RequestParam(value = "name", required = false) String name) throws Exception {
        Map<String, Object> map = patientService.bespeakRegist(mobile,name, 2L);
        Envelop envelop = new Envelop();
        String code = map.get("code").toString();
        String message = map.get("message").toString();

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/servicepackage/PackageServiceEndpoint.java

@@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * Created by Trick on 2018/11/27.
@@ -113,6 +112,8 @@ public class PackageServiceEndpoint extends EnvelopRestEndpoint {
                                        @RequestParam(value = "recordJson", required = true)String recordJson,
                                        @ApiParam(name = "patient", value = "申请绑定的居民code")
                                        @RequestParam(value = "patient", required = true)String patient,
                                        @ApiParam(name = "familyName", value = "申请绑定的家人的名称")
                                        @RequestParam(value = "familyName", required = false)String familyName,
                                        @ApiParam(name = "familyMobile", value = "家人的手机号码")
                                        @RequestParam(value = "familyMobile", required = true)String familyMobile,
                                        @ApiParam(name = "platform", value = "消息平台，1微信端/患者端，2医生APP端")
@@ -122,7 +123,7 @@ public class PackageServiceEndpoint extends EnvelopRestEndpoint {
                                        @ApiParam(name = "isAdult", value = "0未成年人 1成年人")
                                        @RequestParam(value = "isAdult", required = true)Integer isAdult) throws Exception {
        ServicePackageSignRecordDO recordDO = toEntity(recordJson, ServicePackageSignRecordDO.class);
        return packageService.signPackageAndFamily(recordDO,patient,familyMobile,platform,familyBindRole,isAdult);
        return packageService.signPackageAndFamily(recordDO,patient,familyMobile,platform,familyBindRole,isAdult,familyName);
    }
    @GetMapping(value = PatientRequestMapping.SignPackage.findDoctorById)

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/MyFamilyService.java

@@ -9,6 +9,7 @@ import com.yihu.jw.message.service.MessageService;
import com.yihu.jw.patient.service.BasePatientMedicardCardService;
import com.yihu.jw.patient.service.personal_Info.PatientService;
import com.yihu.jw.patient.service.servicepackage.PackageService;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.wechat.service.WeChatQrcodeService;
import org.apache.commons.collections.map.HashedMap;
@@ -68,22 +69,11 @@ public class MyFamilyService {
        }
        List<BasePatientFamilyMemberDO> list = patientFamilyMemberService.getByPatientAndFamilyRelation(patient,null);
        list.addAll(patientFamilyMemberService.getByFamilyMemberAndRelation(patient,null));
        for(BasePatientFamilyMemberDO one:list){
            Integer relation = one.getFamilyRelation();
            if(one.getFamilyMember().equals(patient)){//需要关系转换
                BasePatientDO p = patientService.findByIdAndDel(patient);
                relation = familyRelationTrans(one.getFamilyRelation(),p.getSex());
            }
            if(relation==10){continue;}
            Map<String,Object> relationMap = map.get(relation.toString());
            relationMap.put("isBinding",1);
        }
        List<BasePatientFamilyMemberDO> childrenList = patientFamilyMemberService.getByPatientAndFamilyRelation(patient,10);
        childrenList.addAll(patientFamilyMemberService.getByFamilyMemberAndRelation(patient,2,3));
        if(childrenList.size()==2){
            map.get("10").put("isBinding",1);
        }
        Collection<Map<String,Object>> valueCollection = map.values();
        List<Map<String,Object>> valueList = new LinkedList<>(valueCollection);
        return valueList;
@@ -97,7 +87,7 @@ public class MyFamilyService {
     * @throws Exception
     */
    @Transactional(rollbackFor = Exception.class)
    public Map<String,Object> bindingMyFamily( String patient, String familyMobile, Integer platform,Integer familyBindRole) throws Exception{
    public Map<String,Object> bindingMyFamily( String patient, String familyMobile, Integer platform,Integer familyBindRole,String familyName) throws Exception{
        BasePatientDO patientDO = patientService.findByIdAndDel(patient);
        //1、检验手机号码是否有存在账号，
@@ -105,7 +95,7 @@ public class MyFamilyService {
        Long time = 1000*60*60*24*Long.valueOf(qrCodeFailurTime);
        if(familyPatient==null){
            //2、没有存在账号的，预注册一个账号，调用预注册接口
            Map<String,Object> map = patientService.bespeakRegist(familyMobile,time);
            Map<String,Object> map = patientService.bespeakRegist(familyMobile,familyName,time);
            if(Integer.valueOf(map.get("code")+"")==1){
                familyPatient = (BasePatientDO)map.get("patient");
            }else{
@@ -181,13 +171,20 @@ public class MyFamilyService {
     * @param familyBindRole 1"配偶",2"父亲",3"母亲",4"公公",5"婆婆",6"岳父",7"岳母",8"女婿",9"儿媳",10"子女"
     * @param isAdult 0未成年人 1成年人
     */
    public Map<String,Object> signBindFamily( String patient, String familyMobile, Integer platform,Integer familyBindRole,Integer isAdult) throws Exception{
    public Map<String,Object> signBindFamily( String patient, String familyMobile, Integer platform,Integer familyBindRole,Integer isAdult,String familyName) throws Exception{
        if(isAdult==1){
            Map<String,Object> p = bindingMyFamily(patient, familyMobile, platform,familyBindRole);
            Map<String,Object> p = bindingMyFamily(patient, familyMobile, platform,familyBindRole,familyName);
            return p;
        }else if(isAdult==0){
            //注册一个没有手机号码的用户信息
            BasePatientDO familyPatient = null;
            BasePatientDO familyPatient = new BasePatientDO();
            familyPatient.setLocked(0);
            familyPatient.setEnabled(1);
            familyPatient.setDel("0");
            familyPatient.setLoginFailureCount(0);
            familyPatient.setPatientStatus("1");
            familyPatient.setName(familyName);
            familyPatient = patientService.save(familyPatient);
            //生成绑定信息
            BasePatientFamilyMemberDO patientFamilyMember = new BasePatientFamilyMemberDO();
            patientFamilyMember.setPatient(patient);
@@ -196,6 +193,15 @@ public class MyFamilyService {
            patientFamilyMember.setIsAuthorize(1);//0:未授权,1:已授权
            patientFamilyMember.setDel(1);
            patientFamilyMemberService.save(patientFamilyMember);
//            //生成家人绑定信息
//            BasePatientFamilyMemberDO patientFamilyMember2 = new BasePatientFamilyMemberDO();
//            patientFamilyMember2.setPatient(familyPatient.getId());
//            patientFamilyMember2.setFamilyMember(familyPatient.getName());
//            BasePatientDO createUser = patientService.findByIdAndDel(patient);
//            patientFamilyMember2.setFamilyRelation(familyRelationTrans(familyBindRole,createUser.getSex()));
//            patientFamilyMember2.setIsAuthorize(1);
//            patientFamilyMember2.setDel(1);
//            patientFamilyMemberService.save(patientFamilyMember2);
        }
        return null;
    }
@@ -267,7 +273,7 @@ public class MyFamilyService {
                patientFamilyMemberService.save(patientFamilyMember);
                BasePatientFamilyMemberDO patientFamilyMember2 = new BasePatientFamilyMemberDO();
                patientFamilyMember2.setPatient(patientApplyLog.getFamilyMemberCode());
                patientFamilyMember2.setFamilyMember(patientApplyLog.getFamilyMemberName());
                patientFamilyMember2.setFamilyMember(patientApplyLog.getCreateUser());
                BasePatientDO createUser = patientService.findByIdAndDel(patientApplyLog.getCreateUser());
                patientFamilyMember2.setFamilyRelation(familyRelationTrans(patientApplyLog.getFamilyBindRole(),createUser.getSex()));
                patientFamilyMember2.setIsAuthorize(isAuthorize);
@@ -407,7 +413,7 @@ public class MyFamilyService {
                map2.put("principalNum","");//社保卡号
            }
            map2.put("mobile",basePatientDO.getMobile());//手机号码
            if(StringUtils.isEmpty(packageId)){
            if(!StringUtils.isEmpty(packageId)){
                if(packageService.findPatientSignExist(basePatientDO.getId(),packageId)){
                    map2.put("isPackage",1);
                }else{
@@ -567,6 +573,19 @@ public class MyFamilyService {
        }
    }
    /**
     * 根据身份判断是否未成年
     * @param idcard
     */
    public Integer nonageByIdcard(String idcard){
        Integer age = IdCardUtil.getAgeForIdcard(idcard);
        if(age>18){
            return 1;
        }else {
            return 0;
        }
    }
    /**
     * 家庭关系转换

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/personal_Info/PatientService.java

@@ -120,7 +120,7 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
     * @param time 预注册过期时间 例如: 2 , 则2分钟过期
     * @return
     */
    public Map<String,Object> bespeakRegist(String mobile,long time){
    public Map<String,Object> bespeakRegist(String mobile,String name,long time){
        Map<String, Object> map = new HashMap<>();
        boolean b = CommonUtils.isMobile(mobile);
@@ -150,6 +150,7 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
            patient.setDel("0");
            patient.setLoginFailureCount(0);
            patient.setPatientStatus("1");
            patient.setName(name);
            patient = this.save(patient);
        }else{
            patient = list.get(0);

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/servicepackage/PackageService.java

@@ -29,7 +29,6 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -250,9 +249,9 @@ public class PackageService {
        return Envelop.getSuccess(PatientRequestMapping.SignPackage.api_success);
    }
    public Envelop signPackageAndFamily(ServicePackageSignRecordDO recordDO,String patient, String familyMobile, Integer platform, Integer familyBindRole, Integer isAdult) throws Exception{
    public Envelop signPackageAndFamily(ServicePackageSignRecordDO recordDO,String patient, String familyMobile, Integer platform, Integer familyBindRole, Integer isAdult,String familyName) throws Exception{
        //1.绑定家人
        myFamilyService.signBindFamily(patient,familyMobile,platform,familyBindRole,isAdult);
        myFamilyService.signBindFamily(patient,familyMobile,platform,familyBindRole,isAdult,familyName);
        //2.服务签约
        servicePackageSignRecordDao.save(recordDO);