Merge branch 'fhx-base-预约功能整合0808' into master-xlk-test

fhx

2024-10-10 1689d170920b16a7d930aa4bf648410d1b3fe790

Merge branch 'fhx-base-预约功能整合0808' into master-xlk-test

 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();

        //查询门店下的医生员工