云招呼代码修改

common/common-entity/sql/2023.sql

@@ -243,4 +243,8 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000007', NULL, 'PROFESSIONAL_STATE', '6', '军人', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000008', NULL, 'PROFESSIONAL_STATE', '7', '不便分类的其他从业人员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
===========================20231024上门服务结束====================================
===========================20231024上门服务结束====================================
ALTER TABLE `base`.`base_service_package_item`
MODIFY COLUMN `service_package_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'system' COMMENT '服务包id' AFTER `name`,
MODIFY COLUMN `service_package_item_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建服务项的id。也是本表的id。system那些数据' AFTER `service_package_id`;

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageService.java

@@ -109,7 +109,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                BeanUtils.copyProperties(itemDO1, itemDO);
                itemDO.setId(null);
                itemDO.setCreateTime(DateUtil.getStringDate());
 //               itemDO.setServicePackageItemId(itemDO1.getId());//20231110补的
                itemDO.setServicePackageItemId(itemDO1.getId());//20231110补的
                itemDO.setServicePackageId(servicePackageDO.getId());
            }
            servicePackageItemDao.save(itemDO);

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/consult/service/ConsultTeamService.java

@@ -3347,9 +3347,9 @@ public class ConsultTeamService extends ConsultService {
            return null;
        }
        //这是id
//        ConsultDo consult = consultDao.queryByIdAndType(code, type);
        ConsultDo consult = consultDao.queryByIdAndType(code, type);
        ConsultDo consult = consultDao.findByRelationCode(code);
//        ConsultDo consult = consultDao.findByRelationCode(code);
        if (null == consult) {
            result.put("data", "");

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/DoorOrderController.java

@@ -115,6 +115,19 @@ public class DoorOrderController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 根据签约id或者订单id获取服务项机构
     */
    @GetMapping(value = "getOgrById")
    @ApiOperation(value = "服务人员列表（医生列表）")
    public Envelop getOgrById(
            @ApiParam(name = "signId", value = "签约id") @RequestParam(value = "signId", required = false) String signId,
            @ApiParam(name = "orderId", value = "订单id") @RequestParam(value = "orderId", required = false) String orderId) {
        List<Map<String, Object>> list = wlyyDoorServiceOrderService.getOgrById(signId,orderId);
        return success("查询成功", list);
    }
    /**
     * 查询所有社区医生的机构
@@ -126,6 +139,7 @@ public class DoorOrderController extends EnvelopRestEndpoint {
        return success("查询成功", list);
    }
    @GetMapping(value = "queryDoctorList")
    @ApiOperation(value = "服务人员列表（医生列表）")
    public Envelop queryDoctorList(

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/DoorOrderService.java

@@ -66,9 +66,9 @@ public class DoorOrderService {
    @Autowired
    private HttpClientUtil httpClientUtil;
//    @Value("${sign.check_upload}")
    //    @Value("${sign.check_upload}")
    private String jwUrl;
//    @Value("${server.server_url}")
    //    @Value("${server.server_url}")
    private String wxServerUrl;
    //图片服务地址
    @Value("${fastDFS.fastdfs_file_url}")
@@ -146,23 +146,45 @@ public class DoorOrderService {
    /**
     * 服务项查询
     *
     * @param signId 签约id
     * @param type doorService 上门服务
     * @param type   doorService 上门服务
     */
    public PageEnvelop getServiceItem(String signId, String name, String type, Integer page, Integer size){
        String sql = "SELECT si.* ";
        String countSql = "select count(si.id) ";
        String filter = " from base_service_package_sign_record r," +
                "base_service_package_item i,base_service_package_sub_item si,base_service_package_item_relational ir " +
                "WHERE r.id = '"+signId+"' and i.service_package_id=r.service_package_id and i.`code`='"+type+"' and si.status='1' " +
                " and i.id = ir.item_id and ir.sub_item_id= si.id ";
        if(StringUtils.isNotBlank(name)){
            filter += " and si.name like '%"+name+"%' ";
        }
        String oderBy = " order by si.sort limit "+(page-1)*size+","+size;
        List<ServicePackageSubItemDO> list = jdbcTemplate.query(sql+filter+oderBy,new BeanPropertyRowMapper<>(ServicePackageSubItemDO.class));
        long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
        return PageEnvelop.getSuccessListWithPage("",list,page,size,count);
    public PageEnvelop getServiceItem(String signId, String name, String type, Integer page, Integer size) {
//        String sql = "SELECT si.* ";
//        String countSql = "select count(si.id) ";
//        String filter = " from base_service_package_sign_record r," +
//                "base_service_package_item i,base_service_package_sub_item si,base_service_package_item_relational ir " +
//                "WHERE r.id = '"+signId+"' and i.service_package_id=r.service_package_id and i.`code`='"+type+"' and si.status='1' " +
//                " and i.id = ir.item_id and ir.sub_item_id= si.id ";
//        if(StringUtils.isNotBlank(name)){
//            filter += " and si.name like '%"+name+"%' ";
//        }
//        String oderBy = " order by si.sort limit "+(page-1)*size+","+size;
        String sql = "SELECT e.* ";
        String countSql = "select count(e.id) ";
        String filter =
                "FROM\n" +
                        "	base_service_package_sign_record a \n" +
                        "	INNER JOIN base_service_package_item b ON a.service_package_id = b.service_package_id\n" +
                        "	INNER JOIN base_service_package_item c ON c.id=b.service_package_item_id\n" +
                        "	INNER JOIN base_service_package_item_relational d ON d.item_id=b.id \n" +
                        "	INNER JOIN base_service_package_sub_item e ON e.id=d.sub_item_id\n" +
                        "WHERE 1=1\n" +
                        "	AND b.`code` = '" + type + "' \n" +
                        "	AND e.`status` = '1' \n" +
                        "	AND a.id = '" + signId + "' ";
        if (StringUtils.isNotBlank(name)) {
            filter += " and e.name like '%" + name + "%' ";
        }
        String oderBy = " order by e.sort limit " + (page - 1) * size + "," + size;
        sql = sql + filter + oderBy;
        countSql = countSql + filter;
        List<ServicePackageSubItemDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ServicePackageSubItemDO.class));
        long count = jdbcTemplate.queryForObject(countSql, Long.class);
        return PageEnvelop.getSuccessListWithPage("", list, page, size, count);
    }
    public Map<String, String> getNumGroupByStatusTeam(String doctor, Integer type) {

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/WlyyDoorServiceOrderService.java

@@ -164,11 +164,11 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
    @Autowired
    FileUploadService fileUploadService;
//    @Value("${neiwang.enable}")
    //    @Value("${neiwang.enable}")
    private Boolean isneiwang;  //如果不是内网项目要转到到内网wlyy在上传
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
//    @Value("${neiwang.wlyy}")
    //    @Value("${neiwang.wlyy}")
    private String neiwangWlyy;  //内网的项目地址
    @Value("${wlyy.url}")
@@ -1305,7 +1305,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
     * 如果是外网那是发送到内网的服务器
     */
    public UploadVO PrescriptionQRCodetoNeiWang(InputStream ipt) throws Exception {
        String filename = "QRCode_" + System.currentTimeMillis()+".jpg";
        String filename = "QRCode_" + System.currentTimeMillis() + ".jpg";
        String fileUrls = "";
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
@@ -2012,7 +2012,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                "  o.serve_lat as lat, " +
                "  o.`status` as status, " +
                "  o.`dispatcher_name` as dispatcherName, " +
                "  concat( o.patient,'_' ,c.`code`, '_',o.`number`,'_11' ) as sessionId, " +
                "  concat( o.patient,'_' ,c.`id`, '_',o.`number`,'_11' ) as sessionId, " +
                "   t1.`type` as patientType " +
                " FROM " +
                " ( wlyy_door_service_order o " +
@@ -3099,4 +3099,30 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
        jdbcTemplate.execute(sql);
    }
    public List<Map<String, Object>> getOgrById(String signId, String orderId) {
        String sql = "";
        if (StringUtils.isNotBlank(signId)) {
            sql = "SELECT\n" +
                    "	b.* \n" +
                    "FROM\n" +
                    "	base_service_package_sign_record a\n" +
                    "	INNER JOIN base_service_package_item b ON a.service_package_id = b.service_package_id\n" +
                    "	AND a.id='" + signId + "'";
            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
            return list;
        }
        if (StringUtils.isNotBlank(orderId)) {
            sql = "SELECT\n" +
                    "	DISTINCT b.* \n" +
                    "FROM\n" +
                    "	base_service_package_sign_record a\n" +
                    "	INNER JOIN wlyy_door_service_order b ON a.service_package_id=b.package_id\n" +
                    "	INNER JOIN base_service_package_item c ON b.package_id = c.service_package_id\n" +
                    "	AND b.id='" + orderId + "'\n";
            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
            return list;
        }
        return null;
    }
}