Merge remote-tracking branch 'origin/master-xlk-test' into master-xlk-test

fhx

2024-09-19 8fba7f68ef12af2ebe44ea73871d5eb491373125

Merge remote-tracking branch 'origin/master-xlk-test' into master-xlk-test

 phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java

@@ -1373,10 +1373,11 @@
        if (indicationList != null && indicationList.size() > 0) {
            for (Indication indication : indicationList) {
                mjIndicationDetailVo = detailVoMap.get(indication.getName());
                if (mjIndicationDetailVo != null) {
                    mjIndicationDetailVo.setDetailMsg(indication.getDescription());
                    mjIndicationDetailVo.setImgUrl(indication.getImgUrl());
                if (mjIndicationDetailVo == null) {
                    continue;
                }
                mjIndicationDetailVo.setDetailMsg(indication.getDescription());
                mjIndicationDetailVo.setImgUrl(indication.getImgUrl());
                detailVoMap.put(indication.getName(), mjIndicationDetailVo);
            }
        }
@@ -1402,14 +1403,15 @@
            if (microPlanItemList != null && microPlanItemList.size() > 0) {
                for (MicroPlanItem microPlanItem : microPlanItemList) {
                    mjIndicationDetailVo = detailVoMap.get(microPlanItem.getCommonName());
                    if (mjIndicationDetailVo != null) {
                        List<String> goodsIdList = mjIndicationDetailVo.getGoodsIdList();
                        if (goodsIdList == null) {
                            goodsIdList = new ArrayList<>();
                        }
                        goodsIdList.add(microPlanItem.getCommonId());
                        mjIndicationDetailVo.setGoodsIdList(goodsIdList);
                    if (mjIndicationDetailVo == null){
                        continue;
                    }
                    List<String> goodsIdList = mjIndicationDetailVo.getGoodsIdList();
                    if (goodsIdList == null) {
                        goodsIdList = new ArrayList<>();
                    }
                    goodsIdList.add(microPlanItem.getCommonId());
                    mjIndicationDetailVo.setGoodsIdList(goodsIdList);
                    detailVoMap.put(microPlanItem.getCommonName(), mjIndicationDetailVo);
                }
            }