Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2024-01-25 261f7542d7a818b7183cb51e3d1e911b3b676acc

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

 phi_platform_user/src/main/java/com/hx/phip/service/impl/UserServiceImpl.java

@@ -39,7 +39,6 @@
import com.hx.phip.service.SystemParameterService;
import com.hx.phip.service.UserService;
import com.hx.phip.service.UserUnionHisService;
import com.hx.phip.service.user.UserDoctorNewService;
import com.hx.resultTool.Result;
import com.hx.util.DateUtil;
import com.hx.util.SimpleTool;
@@ -3821,7 +3820,7 @@

            //婚否
            marriageTyp.setTypeNo("LT202208162cHDcz");
            if(userInfoCompleteDto.getMarriageTypeName().equals("已婚")){
            if(!StringUtils.isEmpty(userInfoCompleteDto.getMarriageTypeName()) && userInfoCompleteDto.getMarriageTypeName().equals("已婚")){
                marriageTyp.setTagNo("LA20220816MsuHuP");
            }else {
                marriageTyp.setTagNo("LA20220816Gl0vLL");
@@ -3841,7 +3840,7 @@

            //婚否
            marriageTyp.setTypeNo("LT20230921zyrMZC");
            if(userInfoCompleteDto.getMarriageTypeName().trim().equals("已婚")){
            if(!StringUtils.isEmpty(userInfoCompleteDto.getMarriageTypeName()) &&userInfoCompleteDto.getMarriageTypeName().trim().equals("已婚")){
                marriageTyp.setTagNo("LA20230921hkVYme");
            }else {
                marriageTyp.setTagNo("LA20230921s87r0q");
@@ -3849,7 +3848,7 @@

            //生育
            growthType.setTypeNo("LT20230921Mg7yoF");
            if(userInfoCompleteDto.getGrowthTypeName().trim().equals("已育")){
            if(!StringUtils.isEmpty(userInfoCompleteDto.getGrowthTypeName()) && userInfoCompleteDto.getGrowthTypeName().trim().equals("已育")){
                growthType.setTagNo("LA202309218d5OFD");
            }else {
                growthType.setTagNo("LA20230921KtufiX");
@@ -3861,9 +3860,13 @@
        userLabelAddDto.setUserId(userInfoCompleteDto.getUserId());
        professionType.setTagName(userInfoCompleteDto.getProfessionTypeName().trim());
        list.add(professionType);
        marriageTyp.setTagName(userInfoCompleteDto.getMarriageTypeName().trim());
        if (!StringUtils.isEmpty(userInfoCompleteDto.getMarriageTypeName())){
            marriageTyp.setTagName(userInfoCompleteDto.getMarriageTypeName().trim());
        }
        list.add(marriageTyp);
        growthType.setTagName(userInfoCompleteDto.getGrowthTypeName().trim());
        if (!StringUtils.isEmpty(userInfoCompleteDto.getGrowthTypeName())){
            growthType.setTagName(userInfoCompleteDto.getGrowthTypeName().trim());
        }
        list.add(growthType);
        userLabelAddDto.setUserLabelDtoList(list);