From 18e5f7bfe225b284dfc62033ef7963ead120a19f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 18 三月 2025 17:43:11 +0800
Subject: [PATCH] 修改泾川手动检验检查
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
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..4362a26 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;
@@ -275,7 +281,11 @@
//骞撮緞
tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
//鍑虹敓鏃ユ湡
- tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+ try {
+ tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+ } catch (Exception e) {
+ return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
+ }
if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {
@@ -428,7 +438,11 @@
//骞撮緞
tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
//鍑虹敓鏃ユ湡
- tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+ try {
+ tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+ } catch (Exception e) {
+ return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
+ }
TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm()));
if (null != dwDept) {
@@ -952,7 +966,7 @@
}
- reservation.setPacId(dwDept.getId());
+ reservation.setPacId(dwGrouping.getId());
compPay = compPay.add(dwGrouping.getYsPrice());
// reservation.setTjType(String.valueOf(1));
reservation.setTeamNo(teamNo);
@@ -1019,4 +1033,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;
+ }
+
}
--
Gitblit v1.8.0