zhaowenxuan
2025-02-19 331d513f2546feb17834c89ac40513b93cdfc514
增加报告查询接口以及修改药品申请
5个文件已修改
1个文件已添加
158 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
New file
@@ -0,0 +1,94 @@
package com.ltkj.web.controller.api;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.web.controller.system.TjCheckController;
import com.ltkj.web.controller.system.TjReportController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
 * @Company: 西安路泰科技有限公司
 * @Author: zhaowenxuan
 * @Date: 2025/2/18 10:59
 */
@RequestMapping("/api")
@RestController
public class DefaultController {
    @Autowired
    private TjReportController tjReportController;
    @Autowired
    private TjCheckController tjCheckController;
    /**
     * 提供给三方调用的报告查看接口
     * @param response
     * @param json
     */
    @PostMapping("/viewReport")
    public void viewReport(HttpServletResponse response, @RequestBody String json){
        JSONObject entries = JSONUtil.parseObj(json);
        String tjNum = entries.getStr("tjNum");
        tjReportController.preview(response,true,tjNum);
    }
    /**
     * 提供给三方调用的报告数据接口
     * @param json
     * @return
     */
    @PostMapping("/reportData")
    public AjaxResult reportData(@RequestBody String json){
        String tjNum = JSONUtil.parseObj(json).getStr("tjNum");
        JSONObject entries = JSONUtil.parseObj(tjCheckController.updateCheckType(tjNum));
        removeNullFields(entries);
        return JSONUtil.toBean(entries, AjaxResult.class);
    }
    public static void removeNullFields(JSONObject jsonObject) {
        ArrayList<String> strings = new ArrayList<>();
        strings.add("orderId");
        strings.add("updateTime");
        strings.add("orderDetailId");
        strings.add("flowingWaterId");
        strings.add("createBy");
        strings.add("deleted");
        strings.add("createTime");
        strings.add("updateBy");
        strings.add("createId");
        strings.add("prosId");
        strings.add("params");
        List<String> keysToRemove = new ArrayList<>();
        jsonObject.forEach((key, value) -> {
            if (strings.contains(key)) {
                keysToRemove.add(key);
            } else if (value == null) {
                keysToRemove.add(key);
            } else if (value instanceof JSONObject) {
                removeNullFields((JSONObject) value);
            } else if (value instanceof JSONArray) {
                JSONArray jsonArray = (JSONArray) value;
                for (Object arrayItem : jsonArray) {
                    if (arrayItem instanceof JSONObject) {
                        removeNullFields((JSONObject) arrayItem);
                    }
                }
            }
        });
        for (String key : keysToRemove) {
            jsonObject.remove(key);
        }
    }
}
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -1330,12 +1330,25 @@
            dto1.setSqysbm(ysbm);
            dto1.setMzksbm(dept);
            dto1.setSjrq(date);
            dto1.setCzybm(ysbm);
            dto1.setCzyksbm(dept);
            dto1.setCflxbm("A");
            dto1.setYfbm("1");
            String yfbm = configService.selectConfigByKey("chufang_yfbm");
            String mzzd = configService.selectConfigByKey("chufang_mzzd");
            String czybm = configService.selectConfigByKey("chufang_czybm");
            String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
            String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
            if (czybm.equalsIgnoreCase("N"))
                dto1.setCzybm(ysbm);
            else dto1.setCzybm(czybm);
            if (czyksbm.equalsIgnoreCase("N"))
                dto1.setCzyksbm(dept);
            else dto1.setCzyksbm(czyksbm);
            dto1.setCflxbm(cflxbm);
            if (yfbm.equalsIgnoreCase("N"))
                dto1.setYfbm("1");
            else dto1.setYfbm(yfbm);
            dto1.setFyts("1");
            dto1.setMzzd("");
            if (mzzd.equalsIgnoreCase("N"))
                dto1.setMzzd("");
            else dto1.setMzzd(mzzd);
            dto1.setDetails(outpinmedicapplyDetilsDtos);
            AjaxResult result = controller.Outpinmedicapply(dto1);
            String result1 = getAjaxResult(result);
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -2205,12 +2205,25 @@
                    dto1.setSqysbm(ysbm);
                    dto1.setMzksbm(dept);
                    dto1.setSjrq(date);
                    dto1.setCzybm(ysbm);
                    dto1.setCzyksbm(dept);
                    dto1.setCflxbm("A");
                    dto1.setYfbm("1");
                    String yfbm = configService.selectConfigByKey("chufang_yfbm");
                    String mzzd = configService.selectConfigByKey("chufang_mzzd");
                    String czybm = configService.selectConfigByKey("chufang_czybm");
                    String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
                    String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
                    if (czybm.equalsIgnoreCase("N"))
                        dto1.setCzybm(ysbm);
                    else dto1.setCzybm(czybm);
                    if (czyksbm.equalsIgnoreCase("N"))
                        dto1.setCzyksbm(dept);
                    else dto1.setCzyksbm(dept);
                    dto1.setCflxbm(cflxbm);
                    if (yfbm.equalsIgnoreCase("N"))
                        dto1.setYfbm("1");
                    else dto1.setYfbm(yfbm);
                    dto1.setFyts("1");
                    dto1.setMzzd("");
                    if (mzzd.equalsIgnoreCase("N"))
                        dto1.setMzzd("");
                    else dto1.setMzzd(mzzd);
                    dto1.setDetails(outpinmedicapplyDetilsDtos);
                    AjaxResult result = controller.Outpinmedicapply(dto1);
                    String result1 = getAjaxResult(result);
ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
@@ -133,7 +133,7 @@
                return response.toString();
            }
        } catch (IOException e) {
            e.printStackTrace();
            log.error(String.valueOf(e),e.getMessage());
        }
        return null;
@@ -175,7 +175,7 @@
                return response.toString();
            }
        } catch (IOException e) {
            e.printStackTrace();
            log.error(String.valueOf(e),e.getMessage());
        }
        return null;
@@ -366,7 +366,7 @@
            long getEnd = System.currentTimeMillis();
            System.out.println("=================获取响应结果耗时:" + (getEnd - getStart) + "ms");
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e),e.getMessage());
        } finally {
            try {
                // 关闭连接,释放资源
@@ -426,7 +426,7 @@
            entity = response.getEntity();
            responseContent = EntityUtils.toString(entity, "UTF-8");
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e),e.getMessage());
        } finally {
            try {
                // 关闭连接,释放资源
@@ -465,7 +465,7 @@
            entity = response.getEntity();
            responseContent = EntityUtils.toString(entity, "UTF-8");
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e),e.getMessage());
        } finally {
            try {
                // 关闭连接,释放资源
@@ -565,7 +565,7 @@
                return response.toString();
            }
        } catch (IOException e) {
            e.printStackTrace();
            log.error(String.valueOf(e),e.getMessage());
        }
        return null;
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -116,6 +116,8 @@
                // 静态资源,可匿名访问
                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                // 三方可调用接口
                .antMatchers("/api/viewReport","/api/reportData").permitAll()
                .antMatchers("/jmreport/**","/lis/**","/pacs/**","/callBack/**","/hosp/order/signOrderInfo").anonymous()
                // 除上面外的所有请求全部需要鉴权认证
                .anyRequest().authenticated()
ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
@@ -33,7 +33,9 @@
                        "/cus/package/projectListByPacId/**",
                        "/cus/hospital/getHospList",
                        "/lis/**","/api/His/**","/pacs/**",
                        "/callBack/**"
                        "/callBack/**",
                        "/api/viewReport",
                        "/api/reportData"
                });
        registry.addInterceptor(dbChangeInterceptor)