Merge remote-tracking branch 'origin/fhx-base-医助需求1008' into master-test

fhx

2024-10-11 06624bc2204d9e9aa019c8c6350b2e6499818ee9

Merge remote-tracking branch 'origin/fhx-base-医助需求1008' into master-test

 phi_platform_user/src/main/java/com/hx/phip/controller/appointment/AppAutoMateController.java

@@ -244,10 +244,10 @@
        // int sxTime = 5;
        sql.setLength(0);
        sql.append(" select * from cure_set_time ");
        sql.append(" where isDel = #{m.isDel} and appType = #{m.appType} and memberLevelId = #{m.memberLevelId}");
        sql.append(" where isDel = #{m.isDel} and appType = #{m.appType} and userLevel = #{m.userLevel}");
        values.put("isDel", BaseEntity.NO);
        values.put("appType", dto.getAppType());
        values.put("memberLevelId", user.getMemberLevelId());
        values.put("userLevel", user.getUserLevel());
        sqlSentence.setSqlSentence(sql.toString());

        List<CureSetTime> cList = commonService.selectList(CureSetTimeMapper.class, sqlSentence);

 phi_platform_user/src/main/java/com/hx/phip/controller/appointment/CrmSelfV2Controller.java

@@ -8,6 +8,7 @@
import com.hx.exception.TipsException;
import com.hx.mybatisTool.SqlSentence;
import com.hx.phiappt.common.OperatorConstants;
import com.hx.phiappt.common.RoleType;
import com.hx.phiappt.constants.tool.user.UserTool;
import com.hx.phiappt.dao.mapper.*;
import com.hx.phiappt.model.*;
@@ -51,7 +52,7 @@
    @RequestMapping("/shop/list")
    public Result shopList(){
        SqlSentence sqlSentence = new SqlSentence();
        sqlSentence.setSqlSentence(" select id, name, workTime from shop where isDel = 0 and isUp = 1 ");
        sqlSentence.setSqlSentence(" select id, name, workTime, province, city, area, addr from shop where isDel = 0 and isUp = 1 ");
        List<Map<String, Object>> list = commonService.selectListMap(ShopMapper.class, sqlSentence);
        Map<String, Object> data = new HashMap<>();
        data.put("list", list);
@@ -381,6 +382,7 @@
        Map<String, Object> values = new HashMap<>();
        sqlSentence.setM(values);
        values.put("shopId", dto.getShopId());
        values.put("roleUniqueStr", RoleType.UNIQUE_STR_DOCTOR);
        StringBuilder sql = new StringBuilder();

        //查询门店下的医生员工
@@ -430,7 +432,7 @@
            }
            //按时间排序
            dateList.sort(Comparator.comparing((Map<String, Object> h) -> ((String) h.get("startTime"))));
            dataMap.put("dateList", dateList);
            doctorMap.put("dateList", dateList);
        }

        return dataMap;