From 0ebc42ccd16d2e8ea1a5d815253021c91cc2836f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 07 三月 2025 16:43:52 +0800
Subject: [PATCH] 2025-03-07
---
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 14 ++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 48 ++++++++++++++++++++++++
3 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 21ff9cd..4c04cea 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -1048,7 +1048,8 @@
xmXh++;
}
}
- }else {
+ }
+ /*else {
if (!collect.isEmpty() || !map.isEmpty()){
paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
paragraph.setSpacingBefore(3f);
@@ -1143,7 +1144,7 @@
}
}
}
- }
+ }*/
if(isBr) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -1388,7 +1389,8 @@
}
}
}*/
- } else {
+ }
+ /** else {
if (!collect.isEmpty() || !map.isEmpty()){
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
@@ -1575,6 +1577,7 @@
}
}
}
+ */
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -2997,8 +3000,9 @@
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
- wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
+ wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId());
+ wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+ .or().eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getHisXmbm()));
wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
if (null != list && !list.isEmpty()) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 0c2433c..b658599 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -95,6 +95,12 @@
private ISysDictDataService dictDataService;
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private IDictCompService dictCompService;
+ @Autowired
+ private ITjDwDeptService tjDwDeptService;
+ @Autowired
+ private ITjDwGroupingService tjDwGroupingService;
@Value("${path.filePath}")
private String value;
@@ -1019,4 +1025,46 @@
return AjaxResult.error("璇烽�夋嫨棰勭害瀵硅薄");
}
+ /**
+ * 鍥綋棰勭害浣撴淇℃伅 鑱斿姩涓嬫媺妗�
+ * @param pid
+ * @param type
+ * @return
+ */
+ @GetMapping("/linkage")
+ public String linkage(@RequestParam("pid") String pid, @RequestParam("type") String type) {
+ switch (type){
+ case "1":
+ List<DictComp> list = dictCompService.list();
+ List<HashMap<String, Object>> collect = list.stream().map(i -> {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("value", i.getDrugManufacturerId());
+ hashMap.put("text", i.getCnName());
+ return hashMap;
+ }).collect(Collectors.toList());
+ return JSONUtil.toJsonStr(collect);
+ case "2":
+ List<TjDwDept> list1 = tjDwDeptService.getDwDeptListByTjDwDeptId(pid);
+ List<HashMap<String, Object>> collect1 = list1.stream().map(i -> {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("value", i.getId());
+ hashMap.put("text", i.getDwDeptName());
+ return hashMap;
+ }).collect(Collectors.toList());
+ return JSONUtil.toJsonStr(collect1);
+ case "3":
+ LambdaQueryWrapper<TjDwGrouping> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjDwGrouping::getDwDeptId,pid);
+ List<TjDwGrouping> list2 = tjDwGroupingService.list(wrapper);
+ List<HashMap<String, Object>> collect2 = list2.stream().map(i -> {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("value", i.getId());
+ hashMap.put("text", i.getGroupingName());
+ return hashMap;
+ }).collect(Collectors.toList());
+ return JSONUtil.toJsonStr(collect2);
+ }
+ return null;
+ }
+
}
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
index c00444e..c9a7b42 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -112,7 +112,7 @@
"/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
"/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs","/check/ceshicc").permitAll()
.antMatchers("/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**").permitAll()
- .antMatchers("/check/dataSynchronizationApi").permitAll()
+ .antMatchers("/check/dataSynchronizationApi","/reservation/reservation/linkage").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
--
Gitblit v1.8.0