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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -392,7 +392,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
    //添加核酸预约关联家属
    @Transactional
    public MixEnvelop addNatFamily(String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo,String medicareType,String medicare,String clinicId,String idtype,String idtypeName) throws Exception {
    public MixEnvelop addNatFamily(String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo,String medicareType,String medicare,String clinicId,String idtype,String idtypeName,String sex,String age,String birth) throws Exception {
        MixEnvelop mixEnvelop = new MixEnvelop();
        try{
            List<BaseNatPatientFamilyMemberDO> natPatientFamilyMemberDOList = natPatientFamilyMemberDao.findbyPatientAndFamilyRelationAndNameAndIdcard(patientId,familyName,idCard);
@@ -406,20 +406,39 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
            if (null!=basePatientMemberDictDO){
                dictName = basePatientMemberDictDO.getRelationName();
            }
            String birth = IdCardUtil.getBirthdayForIdcardStr2(idCard);
            int sex=3;
            String familySex = IdCardUtil.getSexForIdcard(idCard);
            if (familySex.equalsIgnoreCase("男")){
                sex =1 ;
            }else if (familySex.equalsIgnoreCase("女")){
                sex = 2 ;
            if (!StringUtils.isNotBlank(birth)){
                birth = IdCardUtil.getBirthdayForIdcardStr2(idCard);
            }
            if (!StringUtils.isNotBlank(sex)){
                sex="3";
                String familySex = IdCardUtil.getSexForIdcard(idCard);
                if (familySex.equalsIgnoreCase("男")){
                    sex ="1" ;
                }else if (familySex.equalsIgnoreCase("女")){
                    sex = "2" ;
                }
            }
            String familyAge = String.valueOf(IdCardUtil.getAgeForIdcard(idCard));
            /*if (!StringUtils.isNotBlank(age)){
                age = String.valueOf(IdCardUtil.getAgeForIdcard(idCard));
            }else {*/
            int age1 = 0;
            int year = Integer.valueOf(birth.substring(0, 4));
            int month = Integer.valueOf(birth.substring(4, 6));
            int day = Integer.valueOf(birth.substring(6));
            Calendar cal = Calendar.getInstance();
            age1 = cal.get(Calendar.YEAR) - year;
            //周岁计算
            if (cal.get(Calendar.MONTH) < (month - 1) || (cal.get(Calendar.MONTH) == (month - 1) && cal.get(Calendar.DATE) < day)) {
                age1--;
            }
            age = age1+"";
        /*    }*/
            ArchiveVO archiveVO = new ArchiveVO();
            archiveVO.setXming0(familyName);
            archiveVO.setSfzhao(idCard);
            archiveVO.setXbie00(sex+"");
            archiveVO.setBrnl00(familyAge);
            archiveVO.setXbie00(sex);
            archiveVO.setBrnl00(age);
            archiveVO.setYytel0(phoneNum);
            archiveVO.setCsrq00(birth);
            archiveVO.setCardtype("X");
@@ -454,9 +473,9 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
            result.setPatient(patientId);
            result.setIdcard(idCard);
            result.setMobile(phoneNum);
            result.setAge(familyAge);
            result.setAge(age);
            result.setName(familyName);
            result.setSex(sex);
            result.setSex(Integer.parseInt(sex));
            result.setIdType(idtype);
            result.setIdTypeName(idtypeName);
            natPatientFamilyMemberDao.save(result);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/hospital/WlyyFamilyMemberController.java

@@ -467,6 +467,9 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            String clinicId = jsonObject.getString("clinicId");
            String idtype = jsonObject.getString("idtype");
            String idtypeName = jsonObject.getString("idtypeName");
            String sex = jsonObject.getString("sex");
            String age = jsonObject.getString("age");
            String birth = jsonObject.getString("birth");
            boolean checkCode =false;
            if(!StringUtils.isEmpty(code)){
                checkCode = this.verification(client_id, username, code);
@@ -489,7 +492,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                    }
                }
                mixEnvelop = wlyyFamilyMemberService.addNatFamily(patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId,idtype,idtypeName);
                mixEnvelop = wlyyFamilyMemberService.addNatFamily(patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId,idtype,idtypeName,sex,age,birth);
            } else {
                mixEnvelop.setStatus(408);