From ab550ebbfa4b579b373fdd7589e799bbb44362e7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 05 七月 2024 18:37:03 +0800
Subject: [PATCH] zjh 2024/07/5-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java | 16
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java | 9
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 159 +++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProBlServiceImpl.java | 14
ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjProBlDto.java | 14
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java | 21 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 9
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 21 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 84 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java | 12
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProBlService.java | 10
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java | 27 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 393 +++++++++++++++-------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProBlMapper.java | 12
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java | 14
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 76 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProBl.java | 30 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java | 10
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 6
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 10
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 10
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java | 5
36 files changed, 783 insertions(+), 226 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
index b992917..cab460d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -1,37 +1,53 @@
-//package com.ltkj.web.controller.his;
-//
-//
-//import com.ltkj.common.core.controller.BaseController;
-//import com.ltkj.common.core.domain.AjaxResult;
-//import com.ltkj.common.core.page.TableDataInfo;
-//import com.ltkj.common.utils.http.HttpUtils;
-//import com.ltkj.hosp.domain.DictSsdm;
-//import com.ltkj.hosp.domain.TjCustomer;
-//import com.ltkj.hosp.hisDto.*;
-//import com.ltkj.hosp.service.ITjCustomerService;
-//import com.ltkj.web.wxUtils.HttpClientUtils;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import io.swagger.annotations.ApiParam;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.annotation.Resource;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//
-//@Api(tags = "AAAAA-----HISAPI鐩稿叧鎺ュ彛鏂囨。")
-//@RestController
-//@RequestMapping("/api/His")
-//public class HisApiController extends BaseController {
+package com.ltkj.web.controller.his;
+
+
+import com.ltkj.common.core.controller.BaseController;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.page.TableDataInfo;
+import com.ltkj.common.utils.http.HttpUtils;
+import com.ltkj.hosp.domain.DictSsdm;
+import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.hisDto.*;
+import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.web.wxUtils.HttpClientUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Api(tags = "AAAAA-----HISAPI鐩稿叧鎺ュ彛鏂囨。")
+@RestController
+@RequestMapping("/api/His")
+public class HisApiController extends BaseController {
// @Autowired
// private ITjCustomerService tjCustomerService;
//
+// @Autowired
+// private HisApiGetMethodService service;
+//
// private static final String HIS_URL = "https://mock.mengxuegu.com/mock/664d3dbce45d2156fa209c80/example/api/His/HisRequest";
//
+//
+// @GetMapping("/his")
+// public AjaxResult Outpinconapply() {
+// Map<String, Object> maps = new HashMap<>();
+// maps.put("his_registration_id","20240704000218");
+// maps.put("ksbm", "浣撴涓績");
+// maps.put("pagecount", 100);
+// maps.put("page", 1);
+// service.getHISDataNew("", maps);
+// return AjaxResult.success();
+// }
+
+
// @PostMapping("/Outpincreateapply")
// @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
// public AjaxResult Outpincreateapply(@RequestBody TjCustomer customer) {
@@ -716,4 +732,4 @@
// String post = HttpClientUtils.sendPost(HIS_URL, map);
// return AjaxResult.success(post);
// }
-//}
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index 201cad1..6d1c214 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -68,7 +68,7 @@
DATA_PASS = props.getProperty("password");
String apiUrl = props.getProperty("his_api_url");
String apiPort = props.getProperty("his_api_port");
- HIS_URL = apiUrl+":"+apiPort+"/api/His/HisRequest";
+ HIS_URL = apiUrl+":"+apiPort;
} catch (IOException e) {
System.out.println("鍒濆鍖栨暟鎹簱寮傚父 ->"+e.getMessage());
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index fd6ce97..819cfa8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -122,7 +122,8 @@
private LtkjEjjfxmzdService ltkjEjjfxmzdService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
-
+ @Autowired
+ private TjProBlService blService;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
long l = System.currentTimeMillis();
@@ -497,6 +498,18 @@
public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+
+ String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss")+order.getOrderId();
+
+ TjProBl proBl=new TjProBl();
+ proBl.setTjh(order.getTjNumber());
+ proBl.setBldh(jxbz);
+ proBl.setBlsj(date);
+ proBl.setBlrdm(sysUser.getUserName());
+ proBl.setBlrmc(sysUser.getNickName());
+ proBl.setBlje(String.valueOf(tjFlowingWater.getPaidIn()));
+ blService.save(proBl);
+
List<TjConsumables> list2 = new ArrayList<>();
String[] tjProIds = tjFlowingWater.getTjProIds();
@@ -531,6 +544,7 @@
tjOrderRemark.setUpdateTime(dates);
tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setJxbz(jxbz);
orderRemarkService.save(tjOrderRemark);
List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
@@ -546,6 +560,7 @@
detail.setUpdateTime(dates);
detail.setCreateId(String.valueOf(sysUser.getUserId()));
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail.setJxbz(jxbz);
tjOrderDetailService.save(detail);
for (Long proId : proIds) {
TjOrderDetail detail1 = new TjOrderDetail();
@@ -554,12 +569,13 @@
// detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
detail1.setProId(proId);
detail1.setIsAddition("Y");
- detail.setCreateBy(sysUser.getNickName());
- detail.setCreateTime(dates);
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(dates);
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setCreateBy(sysUser.getNickName());
+ detail1.setCreateTime(dates);
+ detail1.setUpdateBy(sysUser.getNickName());
+ detail1.setUpdateTime(dates);
+ detail1.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
}
wqq.in(TbTransition::getProId, proIds);
@@ -643,6 +659,7 @@
detail.setUpdateTime(dates);
detail.setCreateId(String.valueOf(sysUser.getUserId()));
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail.setJxbz(jxbz);
tjOrderDetailService.save(detail);
}
@@ -650,56 +667,58 @@
List<TbTransition> tbTransitionList = transitionService.list(wqq);
if (null != tbTransitionList && tbTransitionList.size() > 0) {
for (TbTransition transition : tbTransitionList) {
+ transition.setJxbz(jxbz);
transition.setTjNum(order.getTjNumber());
transition.setCardId(order.getCardId());
transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
transitionService.updateById(transition);
- TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
+// TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
//瀛愰」
- if (null != tjProject) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setProId(transition.getProId());
- tjChargingStandard.setPrice(transition.getNowPrice());
- tjChargingStandard.setProName(tjProject.getProName());
- tjChargingStandard.setCreateBy(sysUser.getNickName());
- tjChargingStandard.setCreateTime(dates);
- tjChargingStandard.setUpdateBy(sysUser.getNickName());
- tjChargingStandard.setUpdateTime(dates);
- tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
- tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
- chargingStandardService.save(tjChargingStandard);
- }
+// if (null != tjProject) {
+// TjChargingStandard tjChargingStandard = new TjChargingStandard();
+// tjChargingStandard.setTjNum(order.getTjNumber());
+// tjChargingStandard.setProId(transition.getProId());
+// tjChargingStandard.setPrice(transition.getNowPrice());
+// tjChargingStandard.setProName(tjProject.getProName());
+// tjChargingStandard.setCreateBy(sysUser.getNickName());
+// tjChargingStandard.setCreateTime(dates);
+// tjChargingStandard.setUpdateBy(sysUser.getNickName());
+// tjChargingStandard.setUpdateTime(dates);
+// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+// chargingStandardService.save(tjChargingStandard);
+// }
}
//鐖堕」
-
- TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
- if (null != parentProject && parentProject.getProParentId() == 0) {
- LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
- List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
- if (null != proConsumables && proConsumables.size() > 0) {
- for (TjProConsumables tjProConsumables : proConsumables) {
- TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
- list2.add(tjConsumables);
- }
- }
-
- } else {
- TjProject parentProjects = projectService.getById(tjProId);
- if (null != parentProjects) {
- LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjProConsumables::getProId, parentProjects.getProId());
- List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
- if (null != proConsumables && proConsumables.size() > 0) {
- for (TjProConsumables tjProConsumables : proConsumables) {
- TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
- list2.add(tjConsumables);
- }
- }
- }
- }
+//
+// TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
+// if (null != parentProject && parentProject.getProParentId() == 0) {
+// LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
+// wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
+// List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
+// if (null != proConsumables && proConsumables.size() > 0) {
+// for (TjProConsumables tjProConsumables : proConsumables) {
+// TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
+// list2.add(tjConsumables);
+// }
+// }
+//
+// } else {
+// TjProject parentProjects = projectService.getById(tjProId);
+// if (null != parentProjects) {
+// LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
+// wqqq.eq(TjProConsumables::getProId, parentProjects.getProId());
+// List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
+// if (null != proConsumables && proConsumables.size() > 0) {
+// for (TjProConsumables tjProConsumables : proConsumables) {
+// TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
+// list2.add(tjConsumables);
+// }
+// }
+// }
+// }
}
+
}
if(projectList.size()>0){
@@ -716,6 +735,7 @@
tjOrderRemark.setUpdateTime(dates);
tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setJxbz(jxbz);
orderRemarkService.save(tjOrderRemark);
TjOrderDetail detail1 = new TjOrderDetail();
@@ -730,6 +750,7 @@
detail1.setUpdateTime(dates);
detail1.setCreateId(String.valueOf(sysUser.getUserId()));
detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
if(null !=config && config.equals("Y")){
//妫�楠�
@@ -813,6 +834,8 @@
List<OutpintestapplyDetailsDto> details = dto.getDetails();
for (OutpintestapplyDetailsDto detail : details) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setSfjx("Y");
+ tree.setJxbz(jxbz);
tree.setCardId(dto.getHisRegistrationId());
LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -872,6 +895,8 @@
List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
for (OutpintestapplyDetailsDto detail : details) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setSfjx("Y");
+ tree.setJxbz(jxbz);
tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -932,6 +957,8 @@
List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
for (OutpintestapplyDetailsDto detail : details1) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setSfjx("Y");
+ tree.setJxbz(jxbz);
tree.setCardId(dao.getHisRegistrationId());
LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -974,23 +1001,23 @@
//鐖堕」鑰楁潗
- ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
- for (TjConsumables tjConsumables : collect) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setConsumablesId(tjConsumables.getId());
- tjChargingStandard.setPrice(tjConsumables.getPrice());
- tjChargingStandard.setProName(tjConsumables.getMakings());
- tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
- tjChargingStandard.setCompany(tjConsumables.getSpecifications());
- tjChargingStandard.setCreateBy(sysUser.getNickName());
- tjChargingStandard.setCreateTime(dates);
- tjChargingStandard.setUpdateBy(sysUser.getNickName());
- tjChargingStandard.setUpdateTime(dates);
- tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
- tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
- chargingStandardService.save(tjChargingStandard);
- }
+// ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
+// for (TjConsumables tjConsumables : collect) {
+// TjChargingStandard tjChargingStandard = new TjChargingStandard();
+// tjChargingStandard.setTjNum(order.getTjNumber());
+// tjChargingStandard.setConsumablesId(tjConsumables.getId());
+// tjChargingStandard.setPrice(tjConsumables.getPrice());
+// tjChargingStandard.setProName(tjConsumables.getMakings());
+// tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
+// tjChargingStandard.setCompany(tjConsumables.getSpecifications());
+// tjChargingStandard.setCreateBy(sysUser.getNickName());
+// tjChargingStandard.setCreateTime(dates);
+// tjChargingStandard.setUpdateBy(sysUser.getNickName());
+// tjChargingStandard.setUpdateTime(dates);
+// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+// chargingStandardService.save(tjChargingStandard);
+// }
}
@Override
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index defc65b..eac56bd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -29,6 +29,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
+import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -53,8 +54,8 @@
* @Date: 2022/12/6 14:29
*/
@RestController
-@RequestMapping("/check")
-@Api(tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@RequestMapping ("/check")
+@Api (tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
public class TjCheckController {
@Resource
private ITjOrderService orderService;
@@ -95,21 +96,22 @@
@Resource
private LtkjMiddleHeadService headService;
@Resource
- private LtkjExamJcbgdService ltkjExamJcbgdService;
+ private LtkjExamJcbgdService jcbgdService;
@Resource
- private LtkjExamJcsqdService ltkjExamJcsqdService;
+ private LtkjExamJcsqdService jcsqdService;
@Resource
private LtkjHybgdService ltkjHybgdService;
@Resource
private LtkjHysqdService ltkjHysqdService;
@Autowired
private HisApiMethodService controller;
+ @Autowired
+ private HisApiGetMethodService service;
-
- @GetMapping("/getOperationPermissionsByTjNum")
- @ApiOperation(value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
- public AjaxResult getOperationPermissionsByTjNum(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping ("/getOperationPermissionsByTjNum")
+ @ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
+ public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
Integer status = order.getStatus();
@@ -124,17 +126,17 @@
}
- @GetMapping("/getCsList")
- @ApiOperation(value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
+ @GetMapping ("/getCsList")
+ @ApiOperation (value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
@Transactional
- public AjaxResult getCsList(@ApiParam(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸插鏍�") @RequestParam(required = false) Integer checkStatus,
- @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
- @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
- @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
- @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
+ public AjaxResult getCsList(@ApiParam (value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸插鏍�") @RequestParam (required = false) Integer checkStatus,
+ @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
+ @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
+ @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+ @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
+ @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -225,9 +227,9 @@
/**
* 鍒濆
*/
- @GetMapping("/cSWebGetProByTjNumAndOrderId")
- @ApiOperation(value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
- public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping ("/cSWebGetProByTjNumAndOrderId")
+ @ApiOperation (value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
+ public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
// List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
// List<CsProVo> list = new ArrayList<>();
// if (null != orderRemarkList && orderRemarkList.size() > 0) {
@@ -272,12 +274,12 @@
/**
* 鍒濆
*/
- @GetMapping("/confirmOrder")
- @ApiOperation(value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
+ @GetMapping ("/confirmOrder")
+ @ApiOperation (value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
@Transactional
- public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
- @ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
- @ApiParam(value = "椹冲洖鐞嗙敱") @RequestParam(required = false) String remark) {
+ public AjaxResult confirmOrder(@ApiParam (value = "tjNumber") @RequestParam String tjNumber,
+ @ApiParam (value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam (defaultValue = "0") Integer status,
+ @ApiParam (value = "椹冲洖鐞嗙敱") @RequestParam (required = false) String remark) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("璇锋鏌ユ槸鍚﹀瓨鍦ㄦ湭妫�鎴栧欢鏈熼」鐩�");
if (null != tjNumber) {
@@ -315,8 +317,8 @@
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
- @GetMapping("/dataSynchronization")
- @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @GetMapping ("/dataSynchronization")
+ @ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
@Transactional
public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
@@ -325,10 +327,10 @@
final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if(null !=order){
+ if (null != order) {
- //寮�鍚瓧鍏稿脊绐�
- if ("Y".equals(getInfoFromSqlData)) {
+ //寮�鍚瓧鍏稿脊绐�
+ if ("Y".equals(getInfoFromSqlData)) {
tbhyxm(order);
// List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
// if (one2 != null && one2.size() > 0) {
@@ -350,47 +352,43 @@
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
asyncService.updateCheckType(order.getTjNumber());
- }
+ }
- //寮�鍚拰his瀵规帴
- if(null !=sfkqdyhis && sfkqdyhis.equals("Y")){
+ //寮�鍚拰his瀵规帴
+ if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {
- List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
- if(null !=baoGaoDans && baoGaoDans.size()>0){
-
-// List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
-// if (one != null && one.size() > 0) {
-// for (LtkjHysqd ltkjHysqd : one) {
-// ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
-// ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
-// }
-// }
-// for (String baoGaoDan : baoGaoDans) {
+ List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
+ if (null != baoGaoDans && baoGaoDans.size() > 0) {
+ //鍚屾妫�楠�
Date dates = new Date();
- Map<String,Object> map=new HashMap<>();
- map.put("his_registration_id",order.getCardId());
- map.put("ksbm","");
- map.put("pationid","");
- map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
- map.put("jsrq",DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
- map.put("pagecount",10);
- map.put("page",1);
+ Map<String, Object> map = new HashMap<>();
+ map.put("his_registration_id", order.getCardId());
+ map.put("ksbm", "");
+ map.put("pationid", "");
+ map.put("ksrq", DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
+ map.put("jsrq", DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
+ map.put("pagecount", 10);
+ map.put("page", 1);
AjaxResult result = controller.Getlabreportinfo(map);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if(null ==code || !code.equals("0")){
+ if (null == code || !code.equals("0")) {
return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
}
JSONArray data = object.getJSONArray("ResultData");
+// int size = data.size();
+// if(size>0){
+//
+// }
for (Object datum : data) {
- JSONObject jsonObject = (JSONObject)datum;
+ JSONObject jsonObject = (JSONObject) datum;
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
- if(null !=jybgid){
- ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(order.getCardId(),jsonObject.getStr("JYBGID"));
+ if (null != jybgid) {
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jybgid.getTmh());
}
- LtkjHysqd hysqd=new LtkjHysqd();
+ LtkjHysqd hysqd = new LtkjHysqd();
hysqd.setTjh(order.getCardId());
hysqd.setTmh(jsonObject.getStr("JYBGID"));
hysqd.setBbbh(jsonObject.getStr("BBDM"));
@@ -404,53 +402,105 @@
hysqd.setSqdh(jsonObject.getStr("SQDBH"));
hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
+ hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
if (ltkjHysqdService.save(hysqd)) {
- Map<String,Object> hashMap=new HashMap<>();
- hashMap.put("jybgid",hysqd.getTmh());
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("jybgid", hysqd.getTmh());
AjaxResult bgdres = controller.Getlabdetailinfo(hashMap);
String result2 = getAjaxResult(bgdres);
JSONObject object1 = getJSONObject(result2);
String code1 = object1.getStr("ResultCode");
- if(null ==code1 || !code1.equals("0")){
- return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
- }
- JSONArray datas = object1.getJSONArray("ResultData");
- for (Object o : datas) {
- JSONObject js = (JSONObject)o;
+ if (null != code1 && code1.equals("0")) {
+ JSONArray datas = object1.getJSONArray("ResultData");
+ for (Object o : datas) {
+ JSONObject js = (JSONObject) o;
// ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jsonObject.getStr("JYBGID"));
- LtkjHybgd bgd=new LtkjHybgd();
- bgd.setTmh(hysqd.getTmh());
- bgd.setJcxmid(js.getStr("JCZBDM"));
- bgd.setJcxm(js.getStr("JCZBMC"));
- bgd.setTdh(js.getStr(""));
- bgd.setJyjg(js.getStr("JCZBJG"));
- bgd.setJgdw(js.getStr("JLDW"));
- bgd.setFwzdz(js.getStr(""));
- bgd.setFwzgz(js.getStr(""));
- bgd.setFwz(js.getStr("CKZFW"));
- bgd.setJysj(js.getStr("BGRQ"));
- bgd.setJyys(js.getStr("JCRBH"));
- bgd.setShsj(js.getStr("BGRQ"));
- bgd.setShsj(js.getStr("BGRQ"));
- bgd.setShys(js.getStr("SHRBH"));
- bgd.setShysmc(js.getStr("SHRXM"));
- bgd.setYcbz(js.getStr("YCTS"));
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(js.getStr("JCZBDM"));
+ bgd.setJcxm(js.getStr("JCZBMC"));
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCZBJG"));
+ bgd.setJgdw(js.getStr("JLDW"));
+ bgd.setFwzdz(js.getStr(""));
+ bgd.setFwzgz(js.getStr(""));
+ bgd.setFwz(js.getStr("CKZFW"));
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(js.getStr("JCRBH"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(js.getStr("SHRBH"));
+ bgd.setShysmc(js.getStr("SHRXM"));
+ bgd.setYcbz(js.getStr("YCTS"));
// bgd.setTpurl(js.getStr(""));
- ltkjHybgdService.save(bgd);
+ ltkjHybgdService.save(bgd);
+ }
}
}
}
-// }
+
+ //鍚屾妫�鏌�
+ Map<String, Object> maps = new HashMap<>();
+ maps.put("his_registration_id", order.getCardId());
+ maps.put("ksbm", "浣撴涓績");
+ maps.put("pagecount", 100);
+ maps.put("page", 1);
+ AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);
+ if (Integer.parseInt(results.get("code").toString()) == 200) {
+ List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
+ if(null !=datas && datas.size()>0){
+ for (Map<String, Object> objectMap : datas) {
+ LtkjExamJcsqd jybgid = jcsqdService.getLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
+ if (null != jybgid) {
+ jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
+ jcbgdService.deletedLtkjJcbgdByTjhAndTmh(jybgid.getTmh());
+ }
+ LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
+ jcbgd.setTjh(order.getCardId());
+ if(null !=objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals(""))
+ jcbgd.setTmh(objectMap.get("JCBGID").toString());
+
+ if(null !=objectMap.get("JCXMDM") || !objectMap.get("JCXMDM").equals(""))
+ jcbgd.setXmdm(objectMap.get("JCXMDM").toString());
+
+ if(null !=objectMap.get("JCXMMC") || !objectMap.get("JCXMMC").equals(""))
+ jcbgd.setXmmc(objectMap.get("JCXMMC").toString());
+
+ if(null !=objectMap.get("JCXMJG") || !objectMap.get("JCXMJG").equals(""))
+ jcbgd.setBgNr(objectMap.get("JCXMJG").toString());
+
+ if(null !=objectMap.get("reporturl") || !objectMap.get("reporturl").equals(""))
+ jcbgd.setBgUrl(objectMap.get("reporturl").toString());
+
+ if(null !=objectMap.get("SHYSQM") || !objectMap.get("SHYSQM").equals(""))
+ jcbgd.setShysxm(objectMap.get("SHYSQM").toString());
+
+ if(null !=objectMap.get("SHYSBH") || !objectMap.get("SHYSBH").equals(""))
+ jcbgd.setShysdm(objectMap.get("SHYSBH").toString());
+
+ if(null !=objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
+ jcbgd.setYxzd(objectMap.get("YXZD").toString());
+
+ if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals(""))
+ jcbgd.setYxbx(objectMap.get("YXBX").toString());
+
+ if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
+ jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());
+
+ jcbgdService.save(jcbgd);
+ }
+ jcsqdService.saveLtkjExamJcsqd(order.getCardId());
+ }
+ }
+ }
+
//鍚屾鍖栭獙椤圭洰
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
//鍚屾妫�鏌ラ」鐩�
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
asyncService.updateCheckType(order.getTjNumber());
}
-
-
- }
- return AjaxResult.success("鍚屾鎴愬姛");
+ return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error();
}
@@ -491,17 +541,17 @@
/**
* 鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃
*/
- @GetMapping("/getList")
- @ApiOperation(value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
+ @GetMapping ("/getList")
+ @ApiOperation (value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
// @PreAuthorize("@ss.hasPermi('check:check:getList')")
- public AjaxResult getList(@ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam(required = false) Integer checkStatus,
- @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
- @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
- @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
- @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
+ public AjaxResult getList(@ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam (required = false) Integer checkStatus,
+ @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
+ @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
+ @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+ @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
+ @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
// String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -609,12 +659,12 @@
* @param checkStatus
* @return
*/
- @PutMapping("/getTjdetailList")
- @ApiOperation(value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
+ @PutMapping ("/getTjdetailList")
+ @ApiOperation (value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
- public AjaxResult getTjdetailList(@ApiParam(value = "浣撴tjNumber") @RequestParam String tjNumber,
- @ApiParam(value = "鎬绘寤鸿") @RequestParam(required = false) String advice,
- @ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
+ public AjaxResult getTjdetailList(@ApiParam (value = "浣撴tjNumber") @RequestParam String tjNumber,
+ @ApiParam (value = "鎬绘寤鸿") @RequestParam (required = false) String advice,
+ @ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
@@ -660,14 +710,15 @@
* @param tjNumber
* @return
*/
- @GetMapping("/updateCheckType")
- @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�旈潪鍖栭獙椤圭洰")
- public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping ("/updateCheckType")
+ @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�旈潪鍖栭獙椤圭洰")
+ public AjaxResult updateCheckType(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
// if (redisCache.hasKey("updateCheckType" + tjNumber)) {
// List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
// return AjaxResult.success(cacheMapValue);
// }
- return getAjaxResult(tjNumber);
+// return getAjaxResult(tjNumber);
+ return getResult(tjNumber);
}
private AjaxResult getAjaxResult(String tjNumber) {
@@ -768,9 +819,9 @@
* @param tjNumber
* @return
*/
- @GetMapping("/updateCheckTypeHuaYan")
- @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿寲楠岄」鐩�")
- public AjaxResult updateCheckTypeHuaYan(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping ("/updateCheckTypeHuaYan")
+ @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿寲楠岄」鐩�")
+ public AjaxResult updateCheckTypeHuaYan(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
// asyncService.updateCheckType(tjNumber);
List<Map<String, Object>> list = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNumber);
@@ -778,9 +829,9 @@
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
- final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
- if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
- tbhyxm(one);
+// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+// if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
+// tbhyxm(one);
// TjCustomer customer = customerService.getById(one.getUserId());
List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanTable(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
@@ -792,13 +843,13 @@
parent.put("checkAdvice", one.getCheckAdvice());
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProId().toString());
- List<TjOrderDetail> dels=new ArrayList<>();
+ List<TjOrderDetail> dels = new ArrayList<>();
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- if(remark.getProId().equals(tjOrderDetail.getProId())){
+ if (remark.getProId().equals(tjOrderDetail.getProId())) {
String ckfw = tjOrderDetail.getStanId();
- if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())){
- ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(),"");
+ if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
+ ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
}
if (StrUtil.isNotBlank(ckfw)) {
try {
@@ -812,15 +863,15 @@
tjOrderDetail.setYcbz("鈫�");
} else if (jyjgval.compareTo(max) > 0) {
tjOrderDetail.setYcbz("鈫�");
- }else {
+ } else {
tjOrderDetail.setYcbz("");
}
} catch (NumberFormatException ignored) {
ignored.printStackTrace();
}
}
- if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
- tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
}
dels.add(tjOrderDetail);
}
@@ -832,7 +883,7 @@
} else {
parent.put("parentAdvice", null);
}
- if(dels.size()==0){
+ if (dels.size() == 0) {
continue;
}
parent.put("sons", dels);
@@ -852,10 +903,98 @@
}
- @GetMapping("/getTm")
- @ApiOperation(value = "鑾峰彇鏉＄爜")
+ @GetMapping ("/updateHYANDCGCheckType")
+ @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿父瑙勫拰鍖栭獙椤圭洰")
+ public AjaxResult updateHYANDCGCheckType(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ return getResult(tjNumber);
+ }
+
+ private AjaxResult getResult(String tjNumber) {
+ asyncService.updateCheckType(tjNumber);
+ List<Map<String, Object>> list = new ArrayList<>();
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+// if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
+// tbhyxm(one);
+ TjCustomer customer = customerService.getById(one.getUserId());
+ List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanAndCgTable(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);
+
+
+ if (null != remarkList && remarkList.size() > 0) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> parent = new HashMap<>();
+ parent.put("checkAdvice", one.getCheckAdvice());
+ parent.put("parent", remark.getProName());
+ parent.put("parentId", remark.getProsId().toString());
+ List<TjOrderDetail> dels = new ArrayList<>();
+ if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ String ckfw = tjOrderDetail.getStanId();
+ if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
+ ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
+ }
+ if (StrUtil.isNotBlank(ckfw)) {
+ try {
+ Integer.parseInt(tjOrderDetail.getYcbz());
+ String[] split = ckfw.split("-");
+ BigDecimal min = new BigDecimal(split[0]);
+ BigDecimal max = new BigDecimal(split[1]);
+ String proResult = tjOrderDetail.getProResult();
+ BigDecimal jyjgval = new BigDecimal(proResult);
+ if (jyjgval.compareTo(min) < 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (jyjgval.compareTo(max) > 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else {
+ tjOrderDetail.setYcbz("");
+ }
+ } catch (NumberFormatException ignored) {
+ ignored.printStackTrace();
+ }
+ }
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+ }
+ dels.add(tjOrderDetail);
+ }
+ }
+ String summary = remark.getSummary();
+ if (null != summary) {
+ String[] split = summary.split(";");
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
+ } else {
+ parent.put("parentAdvice", null);
+ }
+ if (dels.size() == 0) {
+ continue;
+ }
+ parent.put("sons", dels);
+ parent.put("remark", remark.getRemark());
+ if (remark.getDoctorName() != null) {
+ parent.put("doctorName", remark.getDoctorName());
+ }
+
+ list.add(parent);
+ } else {
+ return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
+ }
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ }
+
+
+ @GetMapping ("/getTm")
+ @ApiOperation (value = "鑾峰彇鏉＄爜")
// @PreAuthorize("@ss.hasPermi('check:check:getTm')")
- public AjaxResult getTm(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ public AjaxResult getTm(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
return AjaxResult.success(tjNumber);
}
@@ -864,8 +1003,8 @@
*
* @return
*/
- @PostMapping("/checkUpdateOrderRemark")
- @ApiOperation(value = "鎬绘淇敼澶囨敞鎺ュ彛")
+ @PostMapping ("/checkUpdateOrderRemark")
+ @ApiOperation (value = "鎬绘淇敼澶囨敞鎺ュ彛")
public AjaxResult checkUpdateOrderRemark(@RequestBody List<UpdateOrderRemarkVo> updateOrderRemarkVos) {
if (null != updateOrderRemarkVos && updateOrderRemarkVos.size() > 0) {
for (UpdateOrderRemarkVo remarkVo : updateOrderRemarkVos) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index aedb917..e1a46c6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -46,6 +46,7 @@
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.dto.QianDaoDto;
+import com.ltkj.hosp.dto.TjProBlDto;
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -192,6 +193,10 @@
private ISysDeptService sysDeptService;
@Autowired
private HisApiMethodService controller;
+ @Autowired
+ private TjProBlService blService;
+ @Autowired
+ private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
/**
* 鏌ヨ浣撴璁板綍鍒楄〃
@@ -2746,5 +2751,84 @@
}
return AjaxResult.success();
}
+
+
+ @GetMapping("/getBlproByTjh")
+ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栬ˉ褰曢」鐩褰�")
+ @Transactional
+ public AjaxResult getBlproByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if (null != order) {
+ LambdaQueryWrapper<TjProBl> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjProBl::getTjh,tjNum);
+ List<TjProBl> blList = blService.list(wq);
+ if(null !=blList && blList.size()>0){
+ for (TjProBl bl : blList) {
+ LambdaQueryWrapper<TjOrderRemark>wqr=new LambdaQueryWrapper<>();
+ wqr.eq(TjOrderRemark::getJxbz,bl.getBldh());
+ List<TjOrderRemark> remarkList = remarkService.list(wqr);
+ if(null !=remarkList && remarkList.size()>0){
+ List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
+ LambdaQueryWrapper<TjProject> wqp=new LambdaQueryWrapper<>();
+ wqp.in(TjProject::getProId,collect);
+ List<TjProject> projectList = projectService.list(wqp);
+ for (TjProject project : projectList) {
+ project.setChildren(projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())));
+ }
+ bl.setProjectList(projectList);
+ }
+ }
+ return AjaxResult.success(blList);
+ }
+ return AjaxResult.success(null);
+ }
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ }
+
+
+
+ @PostMapping("/revokeBlProByBldhAndTjh")
+ @ApiOperation(value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
+ @Transactional
+ public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
+
+ if(null ==dto.getBldhs() || dto.getBldhs().size()==0){
+ return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
+ }
+
+ TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
+ if (null != order) {
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if(null !=configByKey && configByKey.equals("Y")){
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ hisRequestParams.put("patientId",order.getCardId());
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
+ BigDecimal cateFeeAll = BigDecimal.ZERO;
+ List<String> advIds=new ArrayList<>();
+ for (Map<String, String> datum : data) {
+ String advId = datum.get("Adv_Id").split("_")[1];
+ BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+ cateFeeAll = cateFeeAll.add(cateFee);
+ advIds.add(advId);
+ }
+ if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO)!=0 ){
+ return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
+ }
+ }
+ }
+ for (String bldh : dto.getBldhs()) {
+ remarkService.deleteTjOrderDetailByjxbz(bldh);
+ tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
+ transitionService.deleteTjOrderDetailByjxbz(bldh);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh,dto.getTjh()).eq(TjProBl::getBldh,bldh));
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java
index 78f8494..f3a07ca 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -60,6 +62,13 @@
*/
private String pationid;
+ //鏄惁鍔犻」
+ private String sfjx;
+
+
+ //鍔犻」鏍囧織
+ private String jxbz;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java
index 403cb53..f768da2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java
@@ -79,6 +79,9 @@
@ApiModelProperty(value = "浣撴鍞竴鍙�")
private String cardId;
+ @ApiModelProperty(value = "鍔犻」鏍囧織")
+ private String jxbz;
+
@ApiModelProperty("鍞竴鏍囪瘑")
@TableField(exist = false)
private String onlyId;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
index 50ab392..1e9a5c2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
@@ -177,6 +177,9 @@
private String remarks;
+ @ApiModelProperty(value = "鍔犻」鏍囧織")
+ private String jxbz;
+
@Override
public String toString() {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
index 929ba6d..6ce9eb7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -64,6 +64,8 @@
@JsonSerialize(using = ToStringSerializer.class)
private Long proId;
+ private String prosId;
+
/**
* 鏍囧噯缁撴灉(鍏宠仈鏍囧噯琛�)
*/
@@ -110,6 +112,9 @@
@ApiModelProperty(value = "鏄惁涓哄姞椤�")
private String isAddition;
+ @ApiModelProperty(value = "鍔犻」鏍囧織")
+ private String jxbz;
+
@ApiModelProperty(value = "娴佹按id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String flowingWaterId;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
index 7bda129..f8d7022 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
@@ -44,6 +44,8 @@
@JsonSerialize(using = ToStringSerializer.class)
private Long proId;
+ private String prosId;
+
@ApiModelProperty(value = "鐖堕」鐩悕绉�")
@TableField(exist = false)
private String proName;
@@ -116,6 +118,9 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date yqDeadline;
+ @ApiModelProperty(value = "鍔犻」鏍囧織")
+ private String jxbz;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProBl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProBl.java
new file mode 100644
index 0000000..fdef1ef
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProBl.java
@@ -0,0 +1,30 @@
+package com.ltkj.hosp.domain;
+/*
+ * @Authot:zjh
+ * @Date: 2024-07-05 13:49
+ * */
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TjProBl {
+
+ @TableId (type = IdType.AUTO)
+ @JsonSerialize (using = ToStringSerializer.class)
+ private Long id;
+ private String tjh;
+ private String bldh;
+ private String blsj;
+ private String blrdm;
+ private String blrmc;
+ private String blje;
+ @TableField(exist = false)
+ private List<TjProject> projectList ;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjProBlDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjProBlDto.java
new file mode 100644
index 0000000..d32a672
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjProBlDto.java
@@ -0,0 +1,14 @@
+package com.ltkj.hosp.dto;/*
+ * @Authot:zjh
+ * @Date: 2024-07-05 13:58
+ * */
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TjProBlDto {
+ private List<String> bldhs;
+ private String tjh;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
index 2a4700f..f403ddf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -4,7 +4,12 @@
import com.ltkj.common.annotation.DataSource;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
+import com.ltkj.hosp.sqlDomain.LtkjHybgd;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -14,4 +19,13 @@
@Mapper
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
+
+ @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tmh=#{tmh} ")
+ void deletedLtkjJcbgdByTjhAndTmh(String tmh);
+
+ @Select ("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
+ List<String> getJianJcBaoGaoDan(String cardId);
+
+ @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tmh=#{tmh}")
+ List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 7dbaf58..87387a7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -5,7 +5,10 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
-import org.apache.ibatis.annotations.Mapper;
+import com.ltkj.hosp.sqlDomain.LtkjHysqd;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -15,4 +18,20 @@
@Mapper
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcsqdMapper extends BaseMapper<LtkjExamJcsqd> {
+
+ @Select ("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} ")
+ LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
+
+ @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} AND tmh=#{tmh} ")
+ void deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh,@Param("tmh")String tmh);
+
+ @Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
+ List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
+
+
+ @Insert("INSERT INTO ltkj_exam_jcsqd \n" +
+ "SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
+ "CONCAT(a.bg_nr,'(',a.yxzd,',',a.yxbx,')') jgzt\n" +
+ "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.tmh;")
+ void saveLtkjExamJcsqd(String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
index 9d66a56..c1e9439 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
@@ -25,7 +25,7 @@
void deletedLtkjHybgdByTjhAndTmh(String tmh);
- @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�楠�' GROUP BY a.sqdh")
+ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND (a.type='妫�楠�' OR a.type='妫�鏌�') GROUP BY a.sqdh")
List<String> getJianYanBaoGaoDan(String cardId);
@Select("SELECT * FROM ltkj_hybgd WHERE tmh=#{tmh}")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index 82043c6..27774fc 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -239,4 +239,7 @@
"\tAND a.tj_num = #{tjNumber}")
boolean updateCardIdByTjNumAndIdCard(@Param("idCard")String idCard,@Param("cardId")String cardId,@Param("tjNumber") String tjNumber);
+
+ @Delete("DELETE FROM tb_transition WHERE jxbz=#{bldh}")
+ void deleteTjOrderDetailByjxbz(String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
index ad21c5b..1377c24 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
@@ -99,4 +99,9 @@
" from tj_flowing_water" +
" where order_id = #{order}")
public int deleteTjFlowingWaterByOrderId(String order);
+
+ @Delete(" delete" +
+ " from tj_flowing_water" +
+ " where jxbz = #{bldh}")
+ void deleteTjOrderDetailByjxbz(String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index feacf9f..f244232 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -185,4 +185,13 @@
@Select("call pro_lis_sqdbgd(1,#{tjnumber,mode=IN})")
// @Select("select * from test_detail")
List<TjOrderDetail> addHuaYanTable(@Param("tjnumber") String tjnumber);
+
+ @Select("call pro_checkhyAndcg(1,#{tjnumber,mode=IN})")
+ List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber);
+
+
+ @Delete("delete\n" +
+ " from tj_order_detail\n" +
+ " where jxbz = #{jxbz}")
+ void deleteTjOrderDetailByjxbz(String jxbz);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 2b9153b..7632d10 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -134,7 +134,13 @@
// @Select("select * from test_remark")
List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);
+ @Select("call pro_checkhyAndcg(0,#{tjnumber,mode=IN})")
+ List<TjOrderRemark> addHuaYanAndCgTable(@Param("tjnumber")String tjnumber);
+
@Update("UPDATE tj_order_remark a SET a.type=2 WHERE a.tj_number=#{tjnumber} AND a.pro_id=#{proId}")
void updateTjOrderRemark(@Param("tjnumber")String tjnumber,@Param("proId")String proId);
+
+ @Delete("DELETE FROM tj_order_remark WHERE jxbz=#{bldh}")
+ void deleteTjOrderDetailByjxbz(String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProBlMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProBlMapper.java
new file mode 100644
index 0000000..6b93962
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProBlMapper.java
@@ -0,0 +1,12 @@
+package com.ltkj.hosp.mapper;/*
+ * @Authot:zjh
+ * @Date: 2024-07-05 13:52
+ * */
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjProBl;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TjProBlMapper extends BaseMapper<TjProBl> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index 916b346..2cf5839 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -122,4 +122,6 @@
boolean updateCardIdByTjNumAndIdCard(String idCard,String cardId,String tjNumber);
+
+ void deleteTjOrderDetailByjxbz(String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
index 5ce34c9..f1c14cb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
@@ -73,4 +73,6 @@
public int deleteTjFlowingWaterByOrderId(String order);
+
+ void deleteTjOrderDetailByjxbz(String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index 7c2f481..fc12434 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -107,4 +107,8 @@
List<TjOrderDetail> addHuaYanTable(String tjnumber);
+
+ List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber);
+
+ void deleteTjOrderDetailByjxbz(String jxbz);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index de377fb..eb0ec55 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -47,7 +47,10 @@
List<TjOrderRemark> addHuaYanTable(String tjnumber);
+ List<TjOrderRemark> addHuaYanAndCgTable(String tjnumber);
+
void updateTjOrderRemark(String tjnumber,String proId);
+ void deleteTjOrderDetailByjxbz(String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
index fb8410f..ba9df46 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
+import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
+
+import java.util.List;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -10,4 +13,11 @@
* @Date: 2023/12/11 17:57
*/
public interface LtkjExamJcbgdService extends IService<LtkjExamJcbgd> {
+
+
+ void deletedLtkjJcbgdByTjhAndTmh(String tmh);
+
+ List<String> getJianJcBaoGaoDan(String cardId);
+
+ List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
index f7afd73..8a51072 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
+import com.ltkj.hosp.sqlDomain.LtkjHysqd;
+
+import java.util.List;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -10,4 +13,13 @@
* @Date: 2023/12/11 17:57
*/
public interface LtkjExamJcsqdService extends IService<LtkjExamJcsqd> {
+
+ LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(String tjh, String tmh);
+
+
+ void deletedLtkjJcsqdByTjhAndTmh(String tjh,String tmh);
+
+ List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
+
+ void saveLtkjExamJcsqd(String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProBlService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProBlService.java
new file mode 100644
index 0000000..2e7cd1e
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProBlService.java
@@ -0,0 +1,10 @@
+package com.ltkj.hosp.service;/*
+ * @Authot:zjh
+ * @Date: 2024-07-05 13:53
+ * */
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjProBl;
+
+public interface TjProBlService extends IService<TjProBl> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
index e1eecad..7f5996c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
@@ -6,8 +6,12 @@
import com.ltkj.hosp.service.LtkjExamJcbgdService;
import com.ltkj.hosp.service.LtkjMiddleDetailService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
+import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* 鐥呯+鎰忚Service涓氬姟灞傚鐞�
@@ -18,4 +22,21 @@
@Service
public class LtkjExamJcbgdServiceImpl extends ServiceImpl<LtkjExamJcbgdMapper, LtkjExamJcbgd> implements LtkjExamJcbgdService {
+ @Resource
+ private LtkjExamJcbgdMapper mapper;
+
+ @Override
+ public void deletedLtkjJcbgdByTjhAndTmh(String tmh) {
+ mapper.deletedLtkjJcbgdByTjhAndTmh(tmh);
+ }
+
+ @Override
+ public List<String> getJianJcBaoGaoDan(String cardId) {
+ return mapper.getJianJcBaoGaoDan(cardId);
+ }
+
+ @Override
+ public List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh) {
+ return mapper.getJianJcBaoGaoDanList(tmh);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
index e3ab2cc..987748f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
@@ -7,7 +7,11 @@
import com.ltkj.hosp.service.LtkjExamJcsqdService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
+import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* 鐥呯+鎰忚Service涓氬姟灞傚鐞�
@@ -18,4 +22,27 @@
@Service
public class LtkjExamJcsqdServiceImpl extends ServiceImpl<LtkjExamJcsqdMapper, LtkjExamJcsqd> implements LtkjExamJcsqdService {
+ @Resource
+ private LtkjExamJcsqdMapper mapper;
+
+
+ @Override
+ public LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(String tjh, String tmh) {
+ return mapper.getLtkjJcsqdByTjhAndTmh(tjh,tmh);
+ }
+
+ @Override
+ public void deletedLtkjJcsqdByTjhAndTmh(String tjh, String tmh) {
+ mapper.deletedLtkjJcsqdByTjhAndTmh(tjh,tmh);
+ }
+
+ @Override
+ public List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh) {
+ return mapper.getLtkjJcsqdByTjh(tjh);
+ }
+
+ @Override
+ public void saveLtkjExamJcsqd(String tjh) {
+ mapper.saveLtkjExamJcsqd(tjh);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index f3be10c..cb4dbcd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -196,4 +196,9 @@
public boolean updateCardIdByTjNumAndIdCard(String idCard, String cardId,String tjNumber) {
return tbTransitionMapper.updateCardIdByTjNumAndIdCard(idCard,cardId,tjNumber);
}
+
+ @Override
+ public void deleteTjOrderDetailByjxbz(String bldh) {
+ tbTransitionMapper.deleteTjOrderDetailByjxbz(bldh);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
index 5ddcac1..38eba80 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
@@ -118,4 +118,9 @@
public int deleteTjFlowingWaterByOrderId(String order) {
return tjFlowingWaterMapper.deleteTjFlowingWaterByOrderId(order);
}
+
+ @Override
+ public void deleteTjOrderDetailByjxbz(String bldh) {
+ tjFlowingWaterMapper.deleteTjOrderDetailByjxbz(bldh);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 54614ce..e7b88c0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -174,4 +174,14 @@
return tjOrderDetailMapper.addHuaYanTable(tjnumber);
}
+ @Override
+ public List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber) {
+ return tjOrderDetailMapper.addHuaYanAndCgTable(tjnumber);
+ }
+
+ @Override
+ public void deleteTjOrderDetailByjxbz(String jxbz) {
+ tjOrderDetailMapper.deleteTjOrderDetailByjxbz(jxbz);
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 8610dd3..4095a2b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -93,8 +93,18 @@
}
@Override
+ public List<TjOrderRemark> addHuaYanAndCgTable(String tjnumber) {
+ return mapper.addHuaYanAndCgTable(tjnumber);
+ }
+
+ @Override
public void updateTjOrderRemark(String tjnumber, String proId) {
mapper.updateTjOrderRemark(tjnumber,proId);
}
+ @Override
+ public void deleteTjOrderDetailByjxbz(String bldh) {
+ mapper.deleteTjOrderDetailByjxbz(bldh);
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProBlServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProBlServiceImpl.java
new file mode 100644
index 0000000..bd75970
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProBlServiceImpl.java
@@ -0,0 +1,14 @@
+package com.ltkj.hosp.service.impl;/*
+ * @Authot:zjh
+ * @Date: 2024-07-05 13:54
+ * */
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjProBl;
+import com.ltkj.hosp.mapper.TjProBlMapper;
+import com.ltkj.hosp.service.TjProBlService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TjProBlServiceImpl extends ServiceImpl<TjProBlMapper, TjProBl> implements TjProBlService {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
index 5dac301..c2bb7ac 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
@@ -1,5 +1,9 @@
package com.ltkj.hosp.sqlDomain;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
/**
@@ -9,8 +13,20 @@
*/
@Data
public class LtkjExamJcbgd {
+
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ private String tjh;
private String tmh;
+ private String xmdm;
+ private String xmmc;
private String bgImg;
private String bgUrl;
private String bgNr;
+ private String shysxm;
+ private String shysdm;
+ private String yxzd;
+ private String yxbx;
+ private String zdsj;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java
index 6700ec3..f4586c2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java
@@ -39,6 +39,9 @@
private String shrdm;
@ApiModelProperty(value = "瀹℃牳浜哄鍚�")
private String shrxm;
+ @ApiModelProperty(value = "妫�楠屾姤鍛婄粨鏋�")
+ private String jybgjg;
+
}
--
Gitblit v1.8.0