Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -30,6 +30,7 @@ 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.
@@ -52,11 +53,13 @@ public class PackageServiceEndpoint extends EnvelopRestEndpoint {
                                         @RequestParam(value = "labelType", required = false)String labelType,
                                         @ApiParam(name = "patient", value = "居民code(判断居民是否签约，非必传)")
                                         @RequestParam(value = "patient", required = false)String patient,
                                         @ApiParam(name = "saasId", value = "租户id")
                                         @RequestParam(value = "saasId", required = false)String saasId,
                                         @ApiParam(name = "page", value = "第几页")
                                         @RequestParam(value = "page", required = true)Integer page,
                                         @ApiParam(name = "size", value = "每页大小")
                                         @RequestParam(value = "size", required = true)Integer size) {
        return packageService.findPackageService(city,labelCode,labelType,patient,page,size);
        return packageService.findPackageService(city,saasId,labelCode,labelType,patient,page,size);
    }
@@ -110,26 +113,26 @@ public class PackageServiceEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = PatientRequestMapping.SignPackage.signPackageAndFamily)
    @ApiOperation(value = "绑定家人，签约服务包", notes = "绑定家人，签约服务包")
    public Envelop signPackageAndFamily(@ApiParam(name = "recordJson", value = "签约实体")
    public ObjEnvelop<Map<String,Object>> signPackageAndFamily(@ApiParam(name = "recordJson", value = "签约实体")
                                        @RequestParam(value = "recordJson", required = true)String recordJson,
                                        @ApiParam(name = "patient", value = "申请绑定的居民code")
                                                               @ApiParam(name = "patient", value = "申请绑定的居民code")
                                        @RequestParam(value = "patient", required = true)String patient,
                                        @ApiParam(name = "familyName", value = "申请绑定的家人的名称")
                                                               @ApiParam(name = "familyName", value = "申请绑定的家人的名称")
                                        @RequestParam(value = "familyName", required = false)String familyName,
                                        @ApiParam(name = "principalNum", value = "医社保号")
                                                               @ApiParam(name = "principalNum", value = "医社保号")
                                        @RequestParam(value = "principalNum", required = false)String principalNum,
                                        @ApiParam(name = "idcard", value = "身份证号")
                                                               @ApiParam(name = "idcard", value = "身份证号")
                                        @RequestParam(value = "idcard", required = false)String idcard,
                                        @ApiParam(name = "familyMobile", value = "家人的手机号码")
                                                               @ApiParam(name = "familyMobile", value = "家人的手机号码")
                                        @RequestParam(value = "familyMobile", required = true)String familyMobile,
                                        @ApiParam(name = "platform", value = "消息平台，1微信端/患者端，2医生APP端")
                                                               @ApiParam(name = "platform", value = "消息平台，1微信端/患者端，2医生APP端")
                                        @RequestParam(value = "platform", required = true)Integer platform,
                                        @ApiParam(name = "familyBindRole", value = "1\"配偶\",2\"父亲\",3\"母亲\",4\"公公\",5\"婆婆\",6\"岳父\",7\"岳母\",8\"女婿\",9\"儿媳\",10\"子女\"")
                                                               @ApiParam(name = "familyBindRole", value = "1\"配偶\",2\"父亲\",3\"母亲\",4\"公公\",5\"婆婆\",6\"岳父\",7\"岳母\",8\"女婿\",9\"儿媳\",10\"子女\"")
                                        @RequestParam(value = "familyBindRole", required = true)Integer familyBindRole,
                                        @ApiParam(name = "isAdult", value = "0未成年人 1成年人")
                                                               @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,familyName,principalNum,idcard);
        return success(PatientRequestMapping.SignPackage.api_success,packageService.signPackageAndFamily(recordDO,patient,familyMobile,platform,familyBindRole,isAdult,familyName,principalNum,idcard));
    }
    @GetMapping(value = PatientRequestMapping.SignPackage.findDoctorById)

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/wechat/WechatInfoEndPoint.java

@@ -186,4 +186,6 @@ public class WechatInfoEndPoint extends EnvelopRestEndpoint {
        }
        return null;
    }
}

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

@@ -140,7 +140,12 @@ public class MyFamilyService {
            messageDO.setSenderPhoto(patientDO.getPhoto());
            messageDO.setTitle("家人绑定");
            messageDO.setMsgDigest("");
            String msgContent = familyPatient.getName()+",您好！"+patientDO.getName()+"向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。";
            String msgContent = "";
            if(familyPatient.getName()==null){
                msgContent = "您好！"+patientDO.getName()+"向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。";
            }else{
                msgContent = familyPatient.getName()+",您好！"+patientDO.getName()+"向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。";
            }
            messageDO.setMsgContent(msgContent);
            messageDO.setMsgTypeCode("010801");
            messageDO.setMsgTypeName("系统消息-添加家人申请");
@@ -393,8 +398,11 @@ public class MyFamilyService {
        }else{
            map.put("isBinding",0);
        }
        map.put("explain","您的"+role.get(converRole-1)+apply.getName()+"邀请您绑定家人账号");
        if(apply.getName()==null){
            map.put("explain","您的"+role.get(converRole-1)+"邀请您绑定家人账号");
        }else{
            map.put("explain","您的"+role.get(converRole-1)+apply.getName()+"邀请您绑定家人账号");
        }
        return map;
    }
@@ -413,7 +421,11 @@ public class MyFamilyService {
        Integer converRole = familyRelationTrans(patientApplyLog.getFamilyBindRole(),apply.getSex());
        if(patientApplyLog.getFailureTime().getTime()<System.currentTimeMillis()) {
            map.put("overdue", "1");//过期
            map.put("explain", "您的" + role.get(converRole - 1) + apply.getName() + "向您发起的绑定邀请已过期");
            if(apply.getName()==null){
                map.put("explain", "您的" + role.get(converRole - 1)  + "向您发起的绑定邀请已过期");
            }else{
                map.put("explain", "您的" + role.get(converRole - 1) + apply.getName() + "向您发起的绑定邀请已过期");
            }
        }else {
            map.put("overdue", "0");
        }
@@ -605,12 +617,16 @@ public class MyFamilyService {
            map.put("applySex",createPatient.getSex());
            map.put("applyPatientPhoto",createPatient.getPhoto());
            map.put("applyPatientNonage",this.nonageByIdcard(createPatient.getIdcard()));//1成年，2未成年
            map.put("explain","您的"+role.get(converRole-1)+createPatient.getName()+"邀请您绑定家人账号");
            if(createPatient.getName()==null){
                map.put("explain","您的"+role.get(converRole-1)+"邀请您绑定家人账号");
            }else{
                map.put("explain","您的"+role.get(converRole-1)+createPatient.getName()+"邀请您绑定家人账号");
            }
            result.add(map);
            BaseMessageDO msg = messageService.findById(Integer.valueOf(one.get("id")+""));
            msg.setReadState(1);
            msg.setReadTime(new Date());
            messageService.save(msg);
//            BaseMessageDO msg = messageService.findById(Integer.valueOf(one.get("id")+""));
//            msg.setReadState(1);
//            msg.setReadTime(new Date());
//            messageService.save(msg);
        }
        return result;
    }

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

@@ -25,6 +25,7 @@ import com.yihu.jw.restmodel.patient.signPackage.ServicePackageVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.patient.PatientRequestMapping;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -70,7 +71,7 @@ public class PackageService {
    @Autowired
    private PatientLabelDao patientLabelDao;
    public MixEnvelop findPackageService(String city,String labelCode,String labelType,String patient,Integer page,Integer size){
    public MixEnvelop findPackageService(String city,String saasId ,String labelCode,String labelType,String patient,Integer page,Integer size){
        String totalSql ="SELECT " +
                " count(1) as total " +
@@ -83,9 +84,12 @@ public class PackageService {
                " p.city_code = '"+city+"' " +
                " AND p.del =1 ";
        if(StringUtils.isNotBlank(labelCode)&&StringUtils.isNotBlank(labelType)){
            totalSql += " ADN l.label_code='"+labelCode+"'" +
            totalSql += " AND l.label_code='"+labelCode+"'" +
                        " AND l.label_type='"+labelType+"' ";
        }
        if(StringUtils.isNotBlank(saasId)){
            totalSql += " AND p.saas_id = '"+saasId+"' ";
        }
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
        Long count = 0L;
@@ -118,9 +122,12 @@ public class PackageService {
                " p.city_code = '"+city+"' " +
                " AND p.del =1 ";
        if(StringUtils.isNotBlank(labelCode)&&StringUtils.isNotBlank(labelType)){
            sql +=  " ADN l.label_code='"+labelCode+"'" +
            sql +=  " AND l.label_code='"+labelCode+"'" +
                    " AND l.label_type='"+labelType+"' ";
        }
        if(StringUtils.isNotBlank(saasId)){
            sql += " AND p.saas_id = '"+saasId+"' ";
        }
        sql +=  "ORDER BY p.sort ASC LIMIT " + (page - 1) * size + "," + size + "";
        List<ServicePackageVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(ServicePackageVO.class));
@@ -252,14 +259,34 @@ public class PackageService {
        return Envelop.getSuccess(PatientRequestMapping.SignPackage.api_success);
    }
    public Envelop signPackageAndFamily(ServicePackageSignRecordDO recordDO,String patient, String familyMobile, Integer platform, Integer familyBindRole,
    public Map<String,Object> signPackageAndFamily(ServicePackageSignRecordDO recordDO,String patient, String familyMobile, Integer platform, Integer familyBindRole,
                                        Integer isAdult,String familyName,String principalNum,String idcard) throws Exception{
        //1.绑定家人
        myFamilyService.signBindFamily(patient,familyMobile,platform,familyBindRole,isAdult,familyName,principalNum,idcard);
        //2.服务签约
        servicePackageSignRecordDao.save(recordDO);
        Map<String,Object> map = myFamilyService.signBindFamily(patient,familyMobile,platform,familyBindRole,isAdult,familyName,principalNum,idcard);
        return Envelop.getSuccess(PatientRequestMapping.SignPackage.api_success);
        Map<String,Object> rs = new HashedMap();
        if(map!=null){
            //2.服务签约
            String memberPatient =  map.get("familyMemberCode").toString();
            recordDO.setPatient(memberPatient);
            if(findPatientSignExist(memberPatient,recordDO.getServicePackageId())){
                rs.put("mes","用户已存在");
                rs.put("status","-1");
                return rs;
            }
            servicePackageSignRecordDao.save(recordDO);
            rs.put("mes","签约成功");
            rs.put("status","1");
            return rs;
        }else{
            rs.put("mes","用户创建失败！");
            rs.put("status","-2");
        }
        return rs;
    }