代码提交

liusheng

2025-02-20 3cef3e781e6da1994c77bd4045a949f36878874a

代码提交

 ruoyi-admin/pom.xml

@@ -10,7 +10,7 @@
    <modelVersion>4.0.0</modelVersion>
    <!--    <packaging>war</packaging>-->
    <packaging>jar</packaging>
    <artifactId>smartor-admin</artifactId>
    <artifactId>smartor-suifang</artifactId>

    <description>
        web服务入口

 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java

@@ -72,8 +72,9 @@
     * @return 修改后的 SQL
     */
    private String modifySqlWithorgidId(String originalSql, String orgid) {
        if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu"))
        if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu")) {
            return originalSql;
        }
        // 提取 orgid 的 WHERE 子句
        String whereClause = " orgid = '" + orgid + "'";


 smartor/src/main/java/com/smartor/domain/BingRenXX.java

@@ -20,8 +20,8 @@

    @ApiModelProperty(value = "组织机构铝箔")
    public String ZuZhiJGMC;

    @ApiModelProperty(value = "机构ID")
    public String orgid;
//
//    @ApiModelProperty(value = "机构ID")
//    public String orgid;

}

 smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java

@@ -191,7 +191,7 @@
                }
            }
        }
        if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getTargetoptionList()) && ivrLibaTargetVO.getValueType() == 1) {
        if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getTargetoptionList()) && ivrLibaTargetVO.getScriptType().equals("1") || CollectionUtils.isNotEmpty(ivrLibaTargetVO.getTargetoptionList()) && ivrLibaTargetVO.getScriptType().equals("2")) {
            //选项处理
            for (IvrLibaTargetoption ivrLibaTargetoption : ivrLibaTargetVO.getTargetoptionList()) {
                if (CollectionUtils.isNotEmpty(ivrLibaTargetoption.getNodynamiccruxs())) {
@@ -216,7 +216,8 @@
                }

            }
        } else if (ivrLibaTargetVO.getValueType() == 2 || ivrLibaTargetVO.getValueType() == 3) {
        } else if (ivrLibaTargetVO.getScriptType().equals("3") || ivrLibaTargetVO.getScriptType().equals("4")) {
            //这里先等等
        }

        return ivrLibaTarget.getId().intValue();

 smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java

@@ -265,6 +265,8 @@
        serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
        List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
        if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
            serviceSubtask.setId(serviceSubtaskList.get(0).getId());
            serviceSubtask.setUpdateTime(new Date());
            serviceSubtaskMapper.updateServiceSubtaskByTaskGuid(serviceSubtask);
        } else {
            serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -298,7 +300,6 @@
        List<BaseOrganization> baseOrganizations = baseOrganizationMapper.selectBaseOrganizationList(baseOrganization);
        if (CollectionUtils.isNotEmpty(baseOrganizations)) {
            YongHuXX yongHuXX = serviceQueryInfo.getYeWuXX().getYongHuXX();
            yongHuXX.setYongHuID(baseOrganizations.get(0).getOrgid());
            yongHuXX.setZuZhiJGID(baseOrganizations.get(0).getGuid());
            yongHuXX.setZuZhiJGMC(baseOrganizations.get(0).getOrganizationName());
            serviceQueryInfo.getYeWuXX().setYongHuXX(yongHuXX);

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml

@@ -154,7 +154,8 @@
               stop_state,
               leavehospitaldistrictcode,
               leavehospitaldistrictname,
               leavediagname,leaveicd10code
               leavediagname,
               leaveicd10code
        from service_subtask
    </sql>

@@ -732,9 +733,8 @@
            <if test="patfrom != null ">patfrom=#{patfrom},</if>
            <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
        </trim>
        where task_guid = #{taskGuid}
        where task_guid = #{taskGuid} and task_name = #{taskName}
    </update>



    <update id="deleteServiceSubtaskById" parameterType="Long">