From e44fea2d4845aed7848f163152da532f19ccce41 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 06 十二月 2023 18:03:49 +0800
Subject: [PATCH] 1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeService.java | 63 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 8
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeServiceImpl.java | 90 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 16
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 55 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskWorkLogMapper.java | 65 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 16
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmTypeLog.java | 64 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskWorkLogController.java | 93 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeLogServiceImpl.java | 88 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeLogMapper.java | 65 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskWorkLogServiceImpl.java | 90 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java | 83 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java | 227 -------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskWorkLogService.java | 63 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeLogController.java | 93 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java | 110 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeLogService.java | 63 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java | 93 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java | 82 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 135 +++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java | 72 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeMapper.java | 65 ++
23 files changed, 1,478 insertions(+), 321 deletions(-)
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 82561aa..80c770e 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
@@ -1538,15 +1538,15 @@
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
-// List<Long> longList = new ArrayList<>();
-// for (String str : split) {
-// if(!"".equals(str)){
-// longList.add(Long.valueOf(str));
-// }
-// }
+ List<Long> longList = new ArrayList<>();
+ for (String str : split) {
+ if(!"".equals(str)){
+ longList.add(Long.valueOf(str));
+ }
+ }
// parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(longList));
- parent.put("parentAdvice", tjAdviceService.getAdviceStringsByIds(Arrays.asList(split)));
-
+ //parent.put("parentAdvice", tjAdviceService.getAdviceStringsByIds(Arrays.asList(split)));
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
} else {
parent.put("parentAdvice", null);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
index 3e7091b..da91fa0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -6,21 +6,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.config.MatchUtils;
-import com.ltkj.hosp.domain.TjAskHistorys;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.service.ITjAskHistorysService;
-import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.val;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.enums.BusinessType;
-import com.ltkj.hosp.domain.TjAskMedicalHistory;
-import com.ltkj.hosp.service.ITjAskMedicalHistoryService;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
@@ -43,11 +41,15 @@
@Resource
private ITjCustomerService tjCustomerService;
+ @Autowired
+ private ITjAskWorkLogService tjAskWorkLogService;
+ @Autowired
+ private ITjHarmTypeLogService tjHarmTypeLogService;
+
/**
* 鏌ヨ闂瘖鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('hosp:history:list')")
@GetMapping("/list")
public TableDataInfo list(TjAskMedicalHistory tjAskMedicalHistory) {
startPage();
@@ -58,7 +60,6 @@
/**
* 瀵煎嚭闂瘖鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('hosp:history:export')")
@Log(title = "闂瘖", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TjAskMedicalHistory tjAskMedicalHistory) {
@@ -70,7 +71,6 @@
/**
* 鑾峰彇闂瘖璇︾粏淇℃伅
*/
-// @PreAuthorize("@ss.hasPermi('hosp:history:query')")
@GetMapping(value = "/{askId}")
public AjaxResult getInfo(@PathVariable("askId") Long askId) {
return success(tjAskMedicalHistoryService.selectTjAskMedicalHistoryByAskId(askId));
@@ -103,11 +103,26 @@
/**
* 鏂板闂瘖
*/
- //@PreAuthorize("@ss.hasPermi('hosp:history:add')")
+ @Transactional
@Log(title = "闂瘖", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
- return toAjax(tjAskMedicalHistoryService.insertTjAskMedicalHistory(tjAskMedicalHistory));
+ tjAskMedicalHistoryService.insertTjAskMedicalHistory(tjAskMedicalHistory);
+ final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs();
+ for (TjAskWorkLog workLog : workLogs) {
+ final boolean save = tjAskWorkLogService.save(workLog);
+ if (!save){
+ return AjaxResult.error();
+ }
+ List<TjHarmTypeLog> harmTypeLogs = workLog.getHarmTypeLogs();
+ for (TjHarmTypeLog harmTypeLog : harmTypeLogs) {
+ final boolean save1 = tjHarmTypeLogService.save(harmTypeLog);
+ if (!save1){
+ return AjaxResult.error();
+ }
+ }
+ }
+ return AjaxResult.success();
}
@@ -115,9 +130,9 @@
* pc绔慨鏀归棶璇�
*/
@ApiOperation(value = "pc绔慨鏀归棶璇�")
- //@PreAuthorize("@ss.hasPermi('hosp:history:edit')")
@Log(title = "闂瘖", businessType = BusinessType.UPDATE)
@PutMapping
+ @Transactional
public AjaxResult edit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
boolean b =false;
tjAskMedicalHistory.setFromBy("PC绔�");
@@ -133,6 +148,21 @@
for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
boolean b1 = historysService.saveOrUpdate(tjAskHistorys);
+ if (!b1){
+ return AjaxResult.error();
+ }
+ }
+ }
+
+ List<TjAskWorkLog> askWorkLogs = tjAskMedicalHistory.getWorkLogs();
+ if (askWorkLogs!=null&&askWorkLogs.size()>0){
+ for (TjAskWorkLog askWorkLog : askWorkLogs) {
+ askWorkLog.setAskId(tjAskMedicalHistory.getAskId());
+ boolean b1 = tjAskWorkLogService.saveOrUpdate(askWorkLog);
+ List<TjHarmTypeLog> harmTypeLogs = askWorkLog.getHarmTypeLogs();
+ for (TjHarmTypeLog harmTypeLog : harmTypeLogs) {
+ tjHarmTypeLogService.saveOrUpdate(harmTypeLog);
+ }
if (!b1){
return AjaxResult.error();
}
@@ -208,7 +238,6 @@
/**
* 鍒犻櫎闂瘖
*/
-// @PreAuthorize("@ss.hasPermi('hosp:history:remove')")
@Log(title = "闂瘖", businessType = BusinessType.DELETE)
@DeleteMapping("/{askIds}")
public AjaxResult remove(@PathVariable Long[] askIds) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskWorkLogController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskWorkLogController.java
new file mode 100644
index 0000000..8260242
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskWorkLogController.java
@@ -0,0 +1,93 @@
+package com.ltkj.web.controller.system;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ltkj.common.annotation.Log;
+import com.ltkj.common.core.controller.BaseController;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.enums.BusinessType;
+import com.ltkj.hosp.domain.TjAskWorkLog;
+import com.ltkj.hosp.service.ITjAskWorkLogService;
+import com.ltkj.common.utils.poi.ExcelUtil;
+import com.ltkj.common.core.page.TableDataInfo;
+
+/**
+ * 闂瘖鑱屼笟鍙茶褰旵ontroller
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/hosp/askWorkLog")
+public class TjAskWorkLogController extends BaseController {
+ @Autowired
+ private ITjAskWorkLogService tjAskWorkLogService;
+
+ /**
+ * 鏌ヨ闂瘖鑱屼笟鍙茶褰曞垪琛�
+ */
+ @GetMapping("/list")
+ public TableDataInfo list(TjAskWorkLog tjAskWorkLog) {
+ startPage();
+ List<TjAskWorkLog> list = tjAskWorkLogService.list();
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭闂瘖鑱屼笟鍙茶褰曞垪琛�
+ */
+ @Log(title = "闂瘖鑱屼笟鍙茶褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, TjAskWorkLog tjAskWorkLog) {
+ List<TjAskWorkLog> list = tjAskWorkLogService.selectTjAskWorkLogList(tjAskWorkLog);
+ ExcelUtil<TjAskWorkLog> util = new ExcelUtil<TjAskWorkLog>(TjAskWorkLog.class);
+ util.exportExcel(response, list, "闂瘖鑱屼笟鍙茶褰曟暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇闂瘖鑱屼笟鍙茶褰曡缁嗕俊鎭�
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(tjAskWorkLogService.getById(id));
+ }
+
+ /**
+ * 鏂板闂瘖鑱屼笟鍙茶褰�
+ */
+ @Log(title = "闂瘖鑱屼笟鍙茶褰�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody TjAskWorkLog tjAskWorkLog) {
+ return toAjax(tjAskWorkLogService.save(tjAskWorkLog));
+ }
+
+ /**
+ * 淇敼闂瘖鑱屼笟鍙茶褰�
+ */
+ @Log(title = "闂瘖鑱屼笟鍙茶褰�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody TjAskWorkLog tjAskWorkLog) {
+ return toAjax(tjAskWorkLogService.updateById(tjAskWorkLog));
+ }
+
+ /**
+ * 鍒犻櫎闂瘖鑱屼笟鍙茶褰�
+ */
+ @Log(title = "闂瘖鑱屼笟鍙茶褰�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(tjAskWorkLogService.removeByIds(Arrays.asList(ids)));
+ }
+}
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 99b8f5a..24eb716 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
@@ -488,14 +488,14 @@
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
-// List<Long> longList = new ArrayList<>();
-// for (String str : split) {
-// if(!"".equals(str)){
-// longList.add(Long.valueOf(str));
-// }
-// }
-// parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(longList));
- parent.put("parentAdvice", tjAdviceService.getAdviceStringsByIds(Arrays.asList(split)));
+ List<Long> longList = new ArrayList<>();
+ for (String str : split) {
+ if(!"".equals(str)){
+ longList.add(Long.valueOf(str));
+ }
+ }
+ //parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(longList));
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
} else {
parent.put("parentAdvice", null);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java
new file mode 100644
index 0000000..92f8fe4
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java
@@ -0,0 +1,93 @@
+package com.ltkj.web.controller.system;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ltkj.common.annotation.Log;
+import com.ltkj.common.core.controller.BaseController;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.enums.BusinessType;
+import com.ltkj.hosp.domain.TjHarmType;
+import com.ltkj.hosp.service.ITjHarmTypeService;
+import com.ltkj.common.utils.poi.ExcelUtil;
+import com.ltkj.common.core.page.TableDataInfo;
+
+/**
+ * 鑱屼笟鐥匔ontroller
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/hosp/harmType")
+public class TjHarmTypeController extends BaseController {
+ @Autowired
+ private ITjHarmTypeService tjHarmTypeService;
+
+ /**
+ * 鏌ヨ鑱屼笟鐥呭垪琛�
+ */
+ @GetMapping("/list")
+ public TableDataInfo list(TjHarmType tjHarmType) {
+ startPage();
+ List<TjHarmType> list = tjHarmTypeService.list();
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鑱屼笟鐥呭垪琛�
+ */
+ @Log(title = "鑱屼笟鐥�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, TjHarmType tjHarmType) {
+ List<TjHarmType> list = tjHarmTypeService.selectTjHarmTypeList(tjHarmType);
+ ExcelUtil<TjHarmType> util = new ExcelUtil<TjHarmType>(TjHarmType.class);
+ util.exportExcel(response, list, "鑱屼笟鐥呮暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鑱屼笟鐥呰缁嗕俊鎭�
+ */
+ @GetMapping(value = "/{aid}")
+ public AjaxResult getInfo(@PathVariable("aid") String aid) {
+ return success(tjHarmTypeService.getById(aid));
+ }
+
+ /**
+ * 鏂板鑱屼笟鐥�
+ */
+ @Log(title = "鑱屼笟鐥�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody TjHarmType tjHarmType) {
+ return toAjax(tjHarmTypeService.save(tjHarmType));
+ }
+
+ /**
+ * 淇敼鑱屼笟鐥�
+ */
+ @Log(title = "鑱屼笟鐥�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody TjHarmType tjHarmType) {
+ return toAjax(tjHarmTypeService.updateById(tjHarmType));
+ }
+
+ /**
+ * 鍒犻櫎鑱屼笟鐥�
+ */
+ @Log(title = "鑱屼笟鐥�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{aids}")
+ public AjaxResult remove(@PathVariable String[] aids) {
+ return toAjax(tjHarmTypeService.removeByIds(Arrays.asList(aids)));
+ }
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeLogController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeLogController.java
new file mode 100644
index 0000000..e27946a
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeLogController.java
@@ -0,0 +1,93 @@
+package com.ltkj.web.controller.system;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ltkj.common.annotation.Log;
+import com.ltkj.common.core.controller.BaseController;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.enums.BusinessType;
+import com.ltkj.hosp.domain.TjHarmTypeLog;
+import com.ltkj.hosp.service.ITjHarmTypeLogService;
+import com.ltkj.common.utils.poi.ExcelUtil;
+import com.ltkj.common.core.page.TableDataInfo;
+
+/**
+ * 闂瘖鍗卞鍥犵礌鍏宠仈Controller
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/hosp/harmTypeLog")
+public class TjHarmTypeLogController extends BaseController {
+ @Autowired
+ private ITjHarmTypeLogService tjHarmTypeLogService;
+
+ /**
+ * 鏌ヨ闂瘖鍗卞鍥犵礌鍏宠仈鍒楄〃
+ */
+ @GetMapping("/list")
+ public TableDataInfo list(TjHarmTypeLog tjHarmTypeLog) {
+ startPage();
+ List<TjHarmTypeLog> list = tjHarmTypeLogService.list();
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭闂瘖鍗卞鍥犵礌鍏宠仈鍒楄〃
+ */
+ @Log(title = "闂瘖鍗卞鍥犵礌鍏宠仈", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, TjHarmTypeLog tjHarmTypeLog) {
+ List<TjHarmTypeLog> list = tjHarmTypeLogService.selectTjHarmTypeLogList(tjHarmTypeLog);
+ ExcelUtil<TjHarmTypeLog> util = new ExcelUtil<TjHarmTypeLog>(TjHarmTypeLog.class);
+ util.exportExcel(response, list, "闂瘖鍗卞鍥犵礌鍏宠仈鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇闂瘖鍗卞鍥犵礌鍏宠仈璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(tjHarmTypeLogService.getById(id));
+ }
+
+ /**
+ * 鏂板闂瘖鍗卞鍥犵礌鍏宠仈
+ */
+ @Log(title = "闂瘖鍗卞鍥犵礌鍏宠仈", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody TjHarmTypeLog tjHarmTypeLog) {
+ return toAjax(tjHarmTypeLogService.save(tjHarmTypeLog));
+ }
+
+ /**
+ * 淇敼闂瘖鍗卞鍥犵礌鍏宠仈
+ */
+ @Log(title = "闂瘖鍗卞鍥犵礌鍏宠仈", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody TjHarmTypeLog tjHarmTypeLog) {
+ return toAjax(tjHarmTypeLogService.updateById(tjHarmTypeLog));
+ }
+
+ /**
+ * 鍒犻櫎闂瘖鍗卞鍥犵礌鍏宠仈
+ */
+ @Log(title = "闂瘖鍗卞鍥犵礌鍏宠仈", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(tjHarmTypeLogService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 6b0809c..a65cfb6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -1391,4 +1391,12 @@
}
return AjaxResult.error("鏆傛棤鍘嗗彶鎶ュ憡");
}
+
+
+
+
+
+
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
index 6cad60b..627e54c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
@@ -188,4 +188,76 @@
}
}
}
+
+
+
+ @GetMapping("/zhiYeTable/{flag}")
+ @ApiOperation(value = "涓嬭浇鑱屼笟鍋ュ悍琛�")
+ public void zhiYeTable(HttpServletResponse response, @PathVariable("flag") boolean flag) {
+
+ LambdaQueryWrapper<TjReportTemplate> we = new LambdaQueryWrapper<>();
+ we.eq(TjReportTemplate::getName, "鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�");
+ TjReportTemplate one = tjReportTemplateService.getOne(we);
+ if (one == null) {
+ return;
+ }
+ String userId = SecurityUtils.getLoginUser().getUsername();
+ PDFBinaryUtil.base64StringToPDF(one.getTemplate(), FileUtil.mkdir(value).getPath() + "\\" + userId + "_鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�.pdf");
+ String filePath = value + "\\" + userId + "_鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�.pdf";
+ File f = new File(filePath);
+ if (filePath.isEmpty()) {
+ System.out.println("鏂囦欢涓嶅瓨鍦紒");
+ return;
+ }
+ BufferedInputStream br = null;
+ OutputStream out = null;
+ FileInputStream fileInputStream = null;
+ try {
+ fileInputStream = new FileInputStream(f);
+ br = new BufferedInputStream(fileInputStream);
+ byte[] bs = new byte[1024];
+ int len = 0;
+ response.reset(); // 闈炲父閲嶈
+ if (flag) {
+ // 鍦ㄧ嚎鎵撳紑鏂瑰紡
+ URL u = new URL("file:///" + filePath);
+ //System.out.println(u);
+ String contentType = u.openConnection().getContentType();
+ response.setContentType(contentType);
+ response.setHeader("Content-Disposition", "inline;filename="
+ + userId +"_鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�.pdf");
+ } else {
+ // 绾笅杞芥柟寮�
+ response.setContentType("application/x-msdownload");
+ response.setContentType("application/pdf;charset=utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename="
+ + userId +"_鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�.pdf");
+ }
+ out = response.getOutputStream();
+ while ((len = br.read(bs)) > 0) {
+ out.write(bs, 0, len);
+ }
+ out.flush();
+ out.close();
+ br.close();
+ fileInputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ //System.out.println("pdf澶勭悊鏂囦欢寮傚父" + e);
+ } finally {
+ if (out != null) {
+ try {
+ out.close();
+ br.close();
+ fileInputStream.close();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index a2eb643..0418744 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -1,5 +1,7 @@
package com.ltkj.web.controller.system;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -7,11 +9,13 @@
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -57,34 +61,34 @@
@ApiOperation(value = "鏌ヨ瑙勫垯+鐥呯鍒楄〃")
public TableDataInfo list(TjRules tjRules) {
startPage();
- LambdaQueryWrapper<TjRules> wq=new LambdaQueryWrapper<>();
- if (tjRules.getProId()!=null){
- wq.eq(TjRules::getProId,tjRules.getProId());
+ LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
+ if (tjRules.getProId() != null) {
+ wq.eq(TjRules::getProId, tjRules.getProId());
}
- if (tjRules.getProName()!=null){
- wq.like(TjRules::getProName,tjRules.getProName());
+ if (tjRules.getProName() != null) {
+ wq.like(TjRules::getProName, tjRules.getProName());
}
- if (tjRules.getRuleType()!=null){
- wq.eq(TjRules::getRuleType,tjRules.getRuleType());
+ if (tjRules.getRuleType() != null) {
+ wq.eq(TjRules::getRuleType, tjRules.getRuleType());
}
- if (tjRules.getRuleStr()!=null){
- wq.like(TjRules::getRuleStr,tjRules.getRuleStr());
+ if (tjRules.getRuleStr() != null) {
+ wq.like(TjRules::getRuleStr, tjRules.getRuleStr());
}
- if (tjRules.getBingzhong()!=null){
- wq.like(TjRules::getBingzhong,tjRules.getBingzhong());
+ if (tjRules.getBingzhong() != null) {
+ wq.like(TjRules::getBingzhong, tjRules.getBingzhong());
}
- if (tjRules.getBzPinyin()!=null){
- wq.like(TjRules::getBzPinyin,tjRules.getBzPinyin());
+ if (tjRules.getBzPinyin() != null) {
+ wq.like(TjRules::getBzPinyin, tjRules.getBzPinyin());
}
- if (tjRules.getSex()!=null){
- wq.eq(TjRules::getSex,tjRules.getSex());
+ if (tjRules.getSex() != null) {
+ wq.eq(TjRules::getSex, tjRules.getSex());
}
wq.orderByAsc(TjRules::getSort);
List<TjRules> list = tjRulesService.list(wq);
- if (list!=null){
+ if (list != null) {
for (TjRules rules : list) {
- LambdaQueryWrapper<TjRuleAdvice> wq1=new LambdaQueryWrapper<>();
- wq1.eq(TjRuleAdvice::getBz,rules.getAid());
+ LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjRuleAdvice::getBz, rules.getAid());
final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
rules.setRuleAdvices(list1);
}
@@ -103,22 +107,22 @@
@ApiParam(value = "浣撴鍙�") @RequestParam String ruleStr) {
TjOrder one = orderService.getOrderByTjNum(tjNumber);
TjCustomer customer = customerService.getById(one.getUserId());
- LambdaQueryWrapper<TjRules> wq=new LambdaQueryWrapper<>();
- if (proId!=null){
- wq.eq(TjRules::getProId,proId);
+ LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
+ if (proId != null) {
+ wq.eq(TjRules::getProId, proId);
}
- if (ruleStr!=null){
- wq.like(TjRules::getRuleStr,ruleStr);
+ if (ruleStr != null) {
+ wq.like(TjRules::getRuleStr, ruleStr);
}
- if (customer.getCusSex()!=null){
- wq.eq(TjRules::getSex,customer.getCusSex());
+ if (customer.getCusSex() != null) {
+ wq.eq(TjRules::getSex, customer.getCusSex());
}
wq.orderByAsc(TjRules::getSort);
List<TjRules> list = tjRulesService.list(wq);
- if (list!=null){
+ if (list != null) {
for (TjRules rules : list) {
- LambdaQueryWrapper<TjRuleAdvice> wq1=new LambdaQueryWrapper<>();
- wq1.eq(TjRuleAdvice::getBz,rules.getAid());
+ LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjRuleAdvice::getBz, rules.getAid());
final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
rules.setRuleAdvices(list1);
}
@@ -134,21 +138,21 @@
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭瑙勫垯+鐥呯鍒楄〃")
public void export(HttpServletResponse response, TjRules tjRules) {
- LambdaQueryWrapper<TjRules> wq=new LambdaQueryWrapper<>();
- if (tjRules.getProName()!=null){
- wq.like(TjRules::getProName,tjRules.getProName());
+ LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
+ if (tjRules.getProName() != null) {
+ wq.like(TjRules::getProName, tjRules.getProName());
}
- if (tjRules.getRuleType()!=null){
- wq.eq(TjRules::getRuleType,tjRules.getRuleType());
+ if (tjRules.getRuleType() != null) {
+ wq.eq(TjRules::getRuleType, tjRules.getRuleType());
}
- if (tjRules.getBingzhong()!=null){
- wq.like(TjRules::getBingzhong,tjRules.getBingzhong());
+ if (tjRules.getBingzhong() != null) {
+ wq.like(TjRules::getBingzhong, tjRules.getBingzhong());
}
- if (tjRules.getBzPinyin()!=null){
- wq.like(TjRules::getBzPinyin,tjRules.getBzPinyin());
+ if (tjRules.getBzPinyin() != null) {
+ wq.like(TjRules::getBzPinyin, tjRules.getBzPinyin());
}
- if (tjRules.getSex()!=null){
- wq.eq(TjRules::getSex,tjRules.getSex());
+ if (tjRules.getSex() != null) {
+ wq.eq(TjRules::getSex, tjRules.getSex());
}
List<TjRules> list = tjRulesService.list(wq);
ExcelUtil<TjRules> util = new ExcelUtil<TjRules>(TjRules.class);
@@ -200,4 +204,57 @@
}
return toAjax(true);
}
+
+ /**
+ * 瑙勫垯鑷姩璁＄畻
+ */
+ @GetMapping("/AutoGetRule")
+ @ApiOperation(value = "瑙勫垯鑷姩璁＄畻")
+ public AjaxResult AutoGetRule(@ApiParam(value = "椤圭洰") @RequestParam String proId,
+ @ApiParam(value = "瀹㈡埛") @RequestParam String cusId,
+ @ApiParam(value = "鍏抽敭瀛�") @RequestParam(required = false) String keyWord,
+ @ApiParam(value = "缁撴灉鍊�") @RequestParam(required = false) BigDecimal keyNum) {
+ List<TjRules> res = new ArrayList<>();
+ TjCustomer byId = customerService.getById(cusId);
+ LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjRules::getProId, proId);
+ wq.lt(TjRules::getAgeLt, MatchUtils.getAgeByIdCard(byId.getCusIdcard()));
+ wq.gt(TjRules::getAgeGt, MatchUtils.getAgeByIdCard(byId.getCusIdcard()));
+ wq.in(TjRules::getSex, 0, byId.getCusSex());
+ final List<TjRules> list = tjRulesService.list(wq);
+ for (TjRules tjRules : list) {
+ //鍒ゆ柇瑙勫垯绫诲瀷:鏁板��/鏂囧瓧
+ if ("2".equals(tjRules.getRuleType())) {
+
+ if (new BigDecimal(0).equals(tjRules.getRuleLt()) && new BigDecimal(0).equals(tjRules.getRuleGt())) {
+ res.add(tjRules);
+ } else {
+ if (keyNum != null) {
+ if (tjRules.getRuleLt().compareTo(keyNum) < 0 && tjRules.getRuleGt().compareTo(keyNum) > 0) {
+ res.add(tjRules);
+ }
+ }
+ }
+ } else if ("1".equals(tjRules.getRuleType())) {
+ if (keyWord!=null){
+ if (tjRules.getRuleStr().contains(keyWord)) {
+ res.add(tjRules);
+ }
+ }
+
+ }
+ }
+ if (res.size() > 0) {
+ //寤鸿璧嬪��
+ for (TjRules re : res) {
+ LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjRuleAdvice::getBz, re.getAid());
+ final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
+ re.setRuleAdvices(list1);
+ }
+ }
+ return AjaxResult.success(res);
+ }
+
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
index aafa685..881ab7c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
@@ -206,223 +206,20 @@
@TableField(exist = false)
private List<TjAskHistorys> tjAskHistorysList;
- public void setAskId(Long askId) {
- this.askId = askId;
- }
- public Long getAskId() {
- return askId;
- }
-
- public void setCusId(Long cusId) {
- this.cusId = cusId;
- }
-
- public Long getCusId() {
- return cusId;
- }
-
- public void setCusName(String cusName) {
- this.cusName = cusName;
- }
-
- public String getCusName() {
- return cusName;
- }
-
- public void setWork(String work) {
- this.work = work;
- }
-
- public String getWork() {
- return work;
- }
-
- public void setWorkStatus(String workStatus) {
- this.workStatus = workStatus;
- }
-
- public String getWorkStatus() {
- return workStatus;
- }
-
- public void setMedicalHistory(String medicalHistory) {
- this.medicalHistory = medicalHistory;
- }
-
- public String getMedicalHistory() {
- return medicalHistory;
- }
-
- public void setChuchao(String chuchao) {
- this.chuchao = chuchao;
- }
-
- public String getChuchao() {
- return chuchao;
- }
-
- public void setJingqi(String jingqi) {
- this.jingqi = jingqi;
- }
-
- public String getJingqi() {
- return jingqi;
- }
-
- public void setZhouqi(String zhouqi) {
- this.zhouqi = zhouqi;
- }
-
- public String getZhouqi() {
- return zhouqi;
- }
-
- public void setMociage(String mociage) {
- this.mociage = mociage;
- }
-
- public String getMociage() {
- return mociage;
- }
-
- public void setZinv(String zinv) {
- this.zinv = zinv;
- }
-
- public String getZinv() {
- return zinv;
- }
-
- public void setLiuchan(String liuchan) {
- this.liuchan = liuchan;
- }
-
- public String getLiuchan() {
- return liuchan;
- }
-
- public void setZaochan(String zaochan) {
- this.zaochan = zaochan;
- }
-
- public String getZaochan() {
- return zaochan;
- }
-
- public void setSichan(String sichan) {
- this.sichan = sichan;
- }
-
- public String getSichan() {
- return sichan;
- }
-
- public void setYichangtai(String yichangtai) {
- this.yichangtai = yichangtai;
- }
-
- public String getYichangtai() {
- return yichangtai;
- }
-
- public void setXiyan(String xiyan) {
- this.xiyan = xiyan;
- }
-
- public String getXiyan() {
- return xiyan;
- }
-
- public void setXiyanpinlv(String xiyanpinlv) {
- this.xiyanpinlv = xiyanpinlv;
- }
-
- public String getXiyanpinlv() {
- return xiyanpinlv;
- }
-
- public void setXiyanyear(String xiyanyear) {
- this.xiyanyear = xiyanyear;
- }
-
- public String getXiyanyear() {
- return xiyanyear;
- }
-
- public void setYinjiu(String yinjiu) {
- this.yinjiu = yinjiu;
- }
-
- public String getYinjiu() {
- return yinjiu;
- }
-
- public void setYinjiupinlv(String yinjiupinlv) {
- this.yinjiupinlv = yinjiupinlv;
- }
-
- public String getYinjiupinlv() {
- return yinjiupinlv;
- }
-
- public void setYinjiuyear(String yinjiuyear) {
- this.yinjiuyear = yinjiuyear;
- }
-
- public String getYinjiuyear() {
- return yinjiuyear;
- }
-
- public void setQita(String qita) {
- this.qita = qita;
- }
-
- public String getQita() {
- return qita;
- }
+ /**
+ * 鑱屼笟鍘嗗彶
+ */
+ @ApiModelProperty(value = "鑱屼笟鍘嗗彶")
+ @TableField(exist = false)
+ private List<TjAskWorkLog> workLogs;
- public List<TjAskHistorys> getTjAskHistorysList() {
- return tjAskHistorysList;
- }
+ /**
+ * 鎺ヨЕ姣掔墿
+ */
+ @ApiModelProperty(value = "鎺ヨЕ姣掔墿")
+ @Excel(name = "鎺ヨЕ姣掔墿")
+ private String contactPoison;
- public void setTjAskHistorysList(List<TjAskHistorys> tjAskHistorysList) {
- this.tjAskHistorysList = tjAskHistorysList;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("askId", getAskId())
- .append("cusId", getCusId())
- .append("cusName", getCusName())
- .append("work", getWork())
- .append("workStatus", getWorkStatus())
- .append("medicalHistory", getMedicalHistory())
- .append("chuchao", getChuchao())
- .append("jingqi", getJingqi())
- .append("zhouqi", getZhouqi())
- .append("mociage", getMociage())
- .append("zinv", getZinv())
- .append("liuchan", getLiuchan())
- .append("zaochan", getZaochan())
- .append("sichan", getSichan())
- .append("yichangtai", getYichangtai())
- .append("xiyan", getXiyan())
- .append("xiyanpinlv", getXiyanpinlv())
- .append("xiyanyear", getXiyanyear())
- .append("yinjiu", getYinjiu())
- .append("yinjiupinlv", getYinjiupinlv())
- .append("yinjiuyear", getYinjiuyear())
- .append("qita", getQita())
- .append("remark", getRemark())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("deleted", getDeleted())
- .append("tjAskHistorysList", getTjAskHistorysList())
- .toString();
- }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java
new file mode 100644
index 0000000..aa00659
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java
@@ -0,0 +1,110 @@
+package com.ltkj.hosp.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.annotation.Excel;
+import com.ltkj.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 闂瘖鑱屼笟鍙茶褰曞璞� tj_ask_work_log
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Data
+@ApiModel(value = "闂瘖鑱屼笟鍙茶褰曞璞�")
+@AllArgsConstructor
+@NoArgsConstructor
+public class TjAskWorkLog extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @TableId(type= IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 浣撴鍙�
+ */
+ @Excel(name = "浣撴鍙�")
+ private String tjNumber;
+
+ /**
+ * 瀹㈡埛
+ */
+ @Excel(name = "瀹㈡埛")
+ private Long cusId;
+
+ /**
+ * 瀹㈡埛鍚�
+ */
+ @Excel(name = "瀹㈡埛鍚�")
+ private String cusName;
+
+ /**
+ * 闂瘖id
+ */
+ @Excel(name = "闂瘖id")
+ private Long askId;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date beginTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date endTime;
+
+ /**
+ * 宸ヤ綔鍗曚綅
+ */
+ @Excel(name = "宸ヤ綔鍗曚綅")
+ private String workCompany;
+
+ /**
+ * 閮ㄩ棬
+ */
+ @Excel(name = "閮ㄩ棬")
+ private String workDept;
+
+ /**
+ * 宸ョ
+ */
+ @Excel(name = "宸ョ")
+ private String workType;
+
+ /**
+ * 闃叉姢鎺柦
+ */
+ @Excel(name = "闃叉姢鎺柦")
+ private String fangHu;
+
+
+ /**
+ * 鏈夊鍥犵礌
+ */
+ @ApiModelProperty(value = "鏈夊鍥犵礌")
+ @TableField(exist = false)
+ private List<TjHarmTypeLog> harmTypeLogs;
+
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java
new file mode 100644
index 0000000..df64ef9
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java
@@ -0,0 +1,83 @@
+package com.ltkj.hosp.domain;
+
+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 com.ltkj.common.annotation.Excel;
+import com.ltkj.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 鑱屼笟鐥呭璞� tj_harm_type
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Data
+@ApiModel(value = "闂瘖鑱屼笟鍙茶褰曞璞�")
+@AllArgsConstructor
+@NoArgsConstructor
+public class TjHarmType extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @TableId(type= IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String aid;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String harmpinyin;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String harmtype;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private Long sort;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String harminfo;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String externalcode;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String harmcode;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String type;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String protection;
+
+
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmTypeLog.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmTypeLog.java
new file mode 100644
index 0000000..9b09b90
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmTypeLog.java
@@ -0,0 +1,64 @@
+package com.ltkj.hosp.domain;
+
+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 com.ltkj.common.annotation.Excel;
+import com.ltkj.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 闂瘖鍗卞鍥犵礌鍏宠仈瀵硅薄 tj_harm_type_log
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Data
+@ApiModel(value = "闂瘖鑱屼笟鍙茶褰曞璞�")
+@AllArgsConstructor
+@NoArgsConstructor
+public class TjHarmTypeLog extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @TableId(type= IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 鍗卞鍥犵礌
+ */
+ @Excel(name = "鍗卞鍥犵礌")
+ private String aid;
+
+ /**
+ * 浣撴鍙�
+ */
+ @Excel(name = "浣撴鍙�")
+ private String tjNumber;
+
+ /**
+ * 瀹㈡埛
+ */
+ @Excel(name = "瀹㈡埛")
+ private Long cusId;
+
+ /**
+ * 瀹㈡埛鍚�
+ */
+ @Excel(name = "瀹㈡埛鍚�")
+ private String cusName;
+
+ /**
+ * 鑱屼笟鍙瞚d
+ */
+ @Excel(name = "鑱屼笟鍙瞚d")
+ private Long workId;
+
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskWorkLogMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskWorkLogMapper.java
new file mode 100644
index 0000000..74d773c
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskWorkLogMapper.java
@@ -0,0 +1,65 @@
+package com.ltkj.hosp.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjAskMedicalHistory;
+import com.ltkj.hosp.domain.TjAskWorkLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 闂瘖鑱屼笟鍙茶褰昅apper鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Mapper
+public interface TjAskWorkLogMapper extends BaseMapper<TjAskWorkLog> {
+ /**
+ * 鏌ヨ闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param id 闂瘖鑱屼笟鍙茶褰曚富閿�
+ * @return 闂瘖鑱屼笟鍙茶褰�
+ */
+ public TjAskWorkLog selectTjAskWorkLogById(Long id);
+
+ /**
+ * 鏌ヨ闂瘖鑱屼笟鍙茶褰曞垪琛�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 闂瘖鑱屼笟鍙茶褰曢泦鍚�
+ */
+ public List<TjAskWorkLog> selectTjAskWorkLogList(TjAskWorkLog tjAskWorkLog);
+
+ /**
+ * 鏂板闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 缁撴灉
+ */
+ public int insertTjAskWorkLog(TjAskWorkLog tjAskWorkLog);
+
+ /**
+ * 淇敼闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 缁撴灉
+ */
+ public int updateTjAskWorkLog(TjAskWorkLog tjAskWorkLog);
+
+ /**
+ * 鍒犻櫎闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param id 闂瘖鑱屼笟鍙茶褰曚富閿�
+ * @return 缁撴灉
+ */
+ public int deleteTjAskWorkLogById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteTjAskWorkLogByIds(Long[] ids);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeLogMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeLogMapper.java
new file mode 100644
index 0000000..def8881
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeLogMapper.java
@@ -0,0 +1,65 @@
+package com.ltkj.hosp.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjHarmTypeLog;
+import com.ltkj.hosp.domain.TjHzLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 闂瘖鍗卞鍥犵礌鍏宠仈Mapper鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Mapper
+public interface TjHarmTypeLogMapper extends BaseMapper<TjHarmTypeLog> {
+ /**
+ * 鏌ヨ闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param id 闂瘖鍗卞鍥犵礌鍏宠仈涓婚敭
+ * @return 闂瘖鍗卞鍥犵礌鍏宠仈
+ */
+ public TjHarmTypeLog selectTjHarmTypeLogById(Long id);
+
+ /**
+ * 鏌ヨ闂瘖鍗卞鍥犵礌鍏宠仈鍒楄〃
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 闂瘖鍗卞鍥犵礌鍏宠仈闆嗗悎
+ */
+ public List<TjHarmTypeLog> selectTjHarmTypeLogList(TjHarmTypeLog tjHarmTypeLog);
+
+ /**
+ * 鏂板闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 缁撴灉
+ */
+ public int insertTjHarmTypeLog(TjHarmTypeLog tjHarmTypeLog);
+
+ /**
+ * 淇敼闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 缁撴灉
+ */
+ public int updateTjHarmTypeLog(TjHarmTypeLog tjHarmTypeLog);
+
+ /**
+ * 鍒犻櫎闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param id 闂瘖鍗卞鍥犵礌鍏宠仈涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteTjHarmTypeLogById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteTjHarmTypeLogByIds(Long[] ids);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeMapper.java
new file mode 100644
index 0000000..88d5419
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeMapper.java
@@ -0,0 +1,65 @@
+package com.ltkj.hosp.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjHarmType;
+import com.ltkj.hosp.domain.TjHzLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 鑱屼笟鐥匨apper鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Mapper
+public interface TjHarmTypeMapper extends BaseMapper<TjHarmType> {
+ /**
+ * 鏌ヨ鑱屼笟鐥�
+ *
+ * @param aid 鑱屼笟鐥呬富閿�
+ * @return 鑱屼笟鐥�
+ */
+ public TjHarmType selectTjHarmTypeByAid(String aid);
+
+ /**
+ * 鏌ヨ鑱屼笟鐥呭垪琛�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 鑱屼笟鐥呴泦鍚�
+ */
+ public List<TjHarmType> selectTjHarmTypeList(TjHarmType tjHarmType);
+
+ /**
+ * 鏂板鑱屼笟鐥�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 缁撴灉
+ */
+ public int insertTjHarmType(TjHarmType tjHarmType);
+
+ /**
+ * 淇敼鑱屼笟鐥�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 缁撴灉
+ */
+ public int updateTjHarmType(TjHarmType tjHarmType);
+
+ /**
+ * 鍒犻櫎鑱屼笟鐥�
+ *
+ * @param aid 鑱屼笟鐥呬富閿�
+ * @return 缁撴灉
+ */
+ public int deleteTjHarmTypeByAid(String aid);
+
+ /**
+ * 鎵归噺鍒犻櫎鑱屼笟鐥�
+ *
+ * @param aids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteTjHarmTypeByAids(String[] aids);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskWorkLogService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskWorkLogService.java
new file mode 100644
index 0000000..baa96a3
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskWorkLogService.java
@@ -0,0 +1,63 @@
+package com.ltkj.hosp.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjAskMedicalHistory;
+import com.ltkj.hosp.domain.TjAskWorkLog;
+
+/**
+ * 闂瘖鑱屼笟鍙茶褰昐ervice鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+public interface ITjAskWorkLogService extends IService<TjAskWorkLog> {
+ /**
+ * 鏌ヨ闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param id 闂瘖鑱屼笟鍙茶褰曚富閿�
+ * @return 闂瘖鑱屼笟鍙茶褰�
+ */
+ public TjAskWorkLog selectTjAskWorkLogById(Long id);
+
+ /**
+ * 鏌ヨ闂瘖鑱屼笟鍙茶褰曞垪琛�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 闂瘖鑱屼笟鍙茶褰曢泦鍚�
+ */
+ public List<TjAskWorkLog> selectTjAskWorkLogList(TjAskWorkLog tjAskWorkLog);
+
+ /**
+ * 鏂板闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 缁撴灉
+ */
+ public int insertTjAskWorkLog(TjAskWorkLog tjAskWorkLog);
+
+ /**
+ * 淇敼闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 缁撴灉
+ */
+ public int updateTjAskWorkLog(TjAskWorkLog tjAskWorkLog);
+
+ /**
+ * 鎵归噺鍒犻櫎闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑闂瘖鑱屼笟鍙茶褰曚富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteTjAskWorkLogByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎闂瘖鑱屼笟鍙茶褰曚俊鎭�
+ *
+ * @param id 闂瘖鑱屼笟鍙茶褰曚富閿�
+ * @return 缁撴灉
+ */
+ public int deleteTjAskWorkLogById(Long id);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeLogService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeLogService.java
new file mode 100644
index 0000000..315fc47
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeLogService.java
@@ -0,0 +1,63 @@
+package com.ltkj.hosp.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjGroupingPro;
+import com.ltkj.hosp.domain.TjHarmTypeLog;
+
+/**
+ * 闂瘖鍗卞鍥犵礌鍏宠仈Service鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+public interface ITjHarmTypeLogService extends IService<TjHarmTypeLog> {
+ /**
+ * 鏌ヨ闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param id 闂瘖鍗卞鍥犵礌鍏宠仈涓婚敭
+ * @return 闂瘖鍗卞鍥犵礌鍏宠仈
+ */
+ public TjHarmTypeLog selectTjHarmTypeLogById(Long id);
+
+ /**
+ * 鏌ヨ闂瘖鍗卞鍥犵礌鍏宠仈鍒楄〃
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 闂瘖鍗卞鍥犵礌鍏宠仈闆嗗悎
+ */
+ public List<TjHarmTypeLog> selectTjHarmTypeLogList(TjHarmTypeLog tjHarmTypeLog);
+
+ /**
+ * 鏂板闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 缁撴灉
+ */
+ public int insertTjHarmTypeLog(TjHarmTypeLog tjHarmTypeLog);
+
+ /**
+ * 淇敼闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 缁撴灉
+ */
+ public int updateTjHarmTypeLog(TjHarmTypeLog tjHarmTypeLog);
+
+ /**
+ * 鎵归噺鍒犻櫎闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑闂瘖鍗卞鍥犵礌鍏宠仈涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteTjHarmTypeLogByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎闂瘖鍗卞鍥犵礌鍏宠仈淇℃伅
+ *
+ * @param id 闂瘖鍗卞鍥犵礌鍏宠仈涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteTjHarmTypeLogById(Long id);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeService.java
new file mode 100644
index 0000000..93c48a2
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeService.java
@@ -0,0 +1,63 @@
+package com.ltkj.hosp.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjGroupingPro;
+import com.ltkj.hosp.domain.TjHarmType;
+
+/**
+ * 鑱屼笟鐥匰ervice鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+public interface ITjHarmTypeService extends IService<TjHarmType> {
+ /**
+ * 鏌ヨ鑱屼笟鐥�
+ *
+ * @param aid 鑱屼笟鐥呬富閿�
+ * @return 鑱屼笟鐥�
+ */
+ public TjHarmType selectTjHarmTypeByAid(String aid);
+
+ /**
+ * 鏌ヨ鑱屼笟鐥呭垪琛�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 鑱屼笟鐥呴泦鍚�
+ */
+ public List<TjHarmType> selectTjHarmTypeList(TjHarmType tjHarmType);
+
+ /**
+ * 鏂板鑱屼笟鐥�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 缁撴灉
+ */
+ public int insertTjHarmType(TjHarmType tjHarmType);
+
+ /**
+ * 淇敼鑱屼笟鐥�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 缁撴灉
+ */
+ public int updateTjHarmType(TjHarmType tjHarmType);
+
+ /**
+ * 鎵归噺鍒犻櫎鑱屼笟鐥�
+ *
+ * @param aids 闇�瑕佸垹闄ょ殑鑱屼笟鐥呬富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteTjHarmTypeByAids(String[] aids);
+
+ /**
+ * 鍒犻櫎鑱屼笟鐥呬俊鎭�
+ *
+ * @param aid 鑱屼笟鐥呬富閿�
+ * @return 缁撴灉
+ */
+ public int deleteTjHarmTypeByAid(String aid);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java
index 955e5e4..03442f7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskMedicalHistoryServiceImpl.java
@@ -4,15 +4,20 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
+import com.ltkj.hosp.domain.TjAskWorkLog;
import com.ltkj.hosp.domain.TjChargingStandard;
+import com.ltkj.hosp.mapper.TjAskWorkLogMapper;
import com.ltkj.hosp.mapper.TjChargingStandardMapper;
+import com.ltkj.hosp.service.ITjAskWorkLogService;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
- import java.util.ArrayList;
- import com.ltkj.common.utils.StringUtils;
- import org.springframework.transaction.annotation.Transactional;
- import com.ltkj.hosp.domain.TjAskHistorys;
+import java.util.ArrayList;
+
+import com.ltkj.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.ltkj.hosp.domain.TjAskHistorys;
import com.ltkj.hosp.mapper.TjAskMedicalHistoryMapper;
import com.ltkj.hosp.domain.TjAskMedicalHistory;
import com.ltkj.hosp.service.ITjAskMedicalHistoryService;
@@ -24,9 +29,12 @@
* @date 2023-04-11
*/
@Service
-public class TjAskMedicalHistoryServiceImpl extends ServiceImpl<TjAskMedicalHistoryMapper, TjAskMedicalHistory> implements ITjAskMedicalHistoryService {
+public class TjAskMedicalHistoryServiceImpl extends ServiceImpl<TjAskMedicalHistoryMapper, TjAskMedicalHistory> implements ITjAskMedicalHistoryService {
@Autowired
private TjAskMedicalHistoryMapper tjAskMedicalHistoryMapper;
+
+ @Autowired
+ private TjAskWorkLogMapper tjAskWorkLogMapper;
/**
* 鏌ヨ闂瘖
@@ -56,13 +64,13 @@
* @param tjAskMedicalHistory 闂瘖
* @return 缁撴灉
*/
- @Transactional
+ @Transactional
@Override
public int insertTjAskMedicalHistory(TjAskMedicalHistory tjAskMedicalHistory) {
- tjAskMedicalHistory.setCreateTime(DateUtils.getNowDate());
- int rows = tjAskMedicalHistoryMapper.insertTjAskMedicalHistory(tjAskMedicalHistory);
- insertTjAskHistorys(tjAskMedicalHistory);
- return rows;
+ tjAskMedicalHistory.setCreateTime(DateUtils.getNowDate());
+ int rows = tjAskMedicalHistoryMapper.insertTjAskMedicalHistory(tjAskMedicalHistory);
+ insertTjAskHistorys(tjAskMedicalHistory);
+ return rows;
}
/**
@@ -71,13 +79,13 @@
* @param tjAskMedicalHistory 闂瘖
* @return 缁撴灉
*/
- @Transactional
+ @Transactional
@Override
public int updateTjAskMedicalHistory(TjAskMedicalHistory tjAskMedicalHistory) {
- tjAskMedicalHistory.setUpdateTime(DateUtils.getNowDate());
- tjAskMedicalHistoryMapper.deleteTjAskHistorysByAskId(tjAskMedicalHistory.getAskId())
- ;
- insertTjAskHistorys(tjAskMedicalHistory);
+ tjAskMedicalHistory.setUpdateTime(DateUtils.getNowDate());
+ tjAskMedicalHistoryMapper.deleteTjAskHistorysByAskId(tjAskMedicalHistory.getAskId())
+ ;
+ insertTjAskHistorys(tjAskMedicalHistory);
return tjAskMedicalHistoryMapper.updateTjAskMedicalHistory(tjAskMedicalHistory);
}
@@ -87,10 +95,10 @@
* @param askIds 闇�瑕佸垹闄ょ殑闂瘖涓婚敭
* @return 缁撴灉
*/
- @Transactional
+ @Transactional
@Override
public int deleteTjAskMedicalHistoryByAskIds(Long[] askIds) {
- tjAskMedicalHistoryMapper.deleteTjAskHistorysByAskIds(askIds);
+ tjAskMedicalHistoryMapper.deleteTjAskHistorysByAskIds(askIds);
return tjAskMedicalHistoryMapper.deleteTjAskMedicalHistoryByAskIds(askIds);
}
@@ -100,36 +108,34 @@
* @param askId 闂瘖涓婚敭
* @return 缁撴灉
*/
- @Transactional
+ @Transactional
@Override
public int deleteTjAskMedicalHistoryByAskId(Long askId) {
- tjAskMedicalHistoryMapper.deleteTjAskHistorysByAskId(askId);
+ tjAskMedicalHistoryMapper.deleteTjAskHistorysByAskId(askId);
return tjAskMedicalHistoryMapper.deleteTjAskMedicalHistoryByAskId(askId);
}
@Override
- public boolean updateTjAskMedicalHistoryByCusId(String tjNum, String userName, String userId,String cusId) {
- return tjAskMedicalHistoryMapper.updateTjAskMedicalHistoryByCusId(tjNum,userName,userId,cusId);
+ public boolean updateTjAskMedicalHistoryByCusId(String tjNum, String userName, String userId, String cusId) {
+ return tjAskMedicalHistoryMapper.updateTjAskMedicalHistoryByCusId(tjNum, userName, userId, cusId);
}
/**
- * 鏂板${subTable.functionName}淇℃伅
- *
- * @param tjAskMedicalHistory 闂瘖瀵硅薄
- */
- public void insertTjAskHistorys(TjAskMedicalHistory tjAskMedicalHistory) {
- List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
- Long askId = tjAskMedicalHistory.getAskId();
- if (StringUtils.isNotNull(tjAskHistorysList)) {
- List<TjAskHistorys> list = new ArrayList<TjAskHistorys>();
- for (TjAskHistorys tjAskHistorys :tjAskHistorysList)
- {
- tjAskHistorys.setAskId(askId);
- list.add(tjAskHistorys);
- }
- if (list.size() > 0) {
- tjAskMedicalHistoryMapper.batchTjAskHistorys(list);
- }
+ * @param tjAskMedicalHistory 闂瘖瀵硅薄
+ */
+ public void insertTjAskHistorys(TjAskMedicalHistory tjAskMedicalHistory) {
+ List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
+ Long askId = tjAskMedicalHistory.getAskId();
+ if (StringUtils.isNotNull(tjAskHistorysList)) {
+ List<TjAskHistorys> list = new ArrayList<TjAskHistorys>();
+ for (TjAskHistorys tjAskHistorys : tjAskHistorysList) {
+ tjAskHistorys.setAskId(askId);
+ list.add(tjAskHistorys);
+ }
+ if (list.size() > 0) {
+ tjAskMedicalHistoryMapper.batchTjAskHistorys(list);
}
}
+
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskWorkLogServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskWorkLogServiceImpl.java
new file mode 100644
index 0000000..4ee37ca
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskWorkLogServiceImpl.java
@@ -0,0 +1,90 @@
+package com.ltkj.hosp.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjAskMedicalHistory;
+import com.ltkj.hosp.mapper.TjAskMedicalHistoryMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ltkj.hosp.mapper.TjAskWorkLogMapper;
+import com.ltkj.hosp.domain.TjAskWorkLog;
+import com.ltkj.hosp.service.ITjAskWorkLogService;
+
+/**
+ * 闂瘖鑱屼笟鍙茶褰昐ervice涓氬姟灞傚鐞�
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Service
+public class TjAskWorkLogServiceImpl extends ServiceImpl<TjAskWorkLogMapper, TjAskWorkLog> implements ITjAskWorkLogService {
+ @Autowired
+ private TjAskWorkLogMapper tjAskWorkLogMapper;
+
+ /**
+ * 鏌ヨ闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param id 闂瘖鑱屼笟鍙茶褰曚富閿�
+ * @return 闂瘖鑱屼笟鍙茶褰�
+ */
+ @Override
+ public TjAskWorkLog selectTjAskWorkLogById(Long id) {
+ return tjAskWorkLogMapper.selectTjAskWorkLogById(id);
+ }
+
+ /**
+ * 鏌ヨ闂瘖鑱屼笟鍙茶褰曞垪琛�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 闂瘖鑱屼笟鍙茶褰�
+ */
+ @Override
+ public List<TjAskWorkLog> selectTjAskWorkLogList(TjAskWorkLog tjAskWorkLog) {
+ return tjAskWorkLogMapper.selectTjAskWorkLogList(tjAskWorkLog);
+ }
+
+ /**
+ * 鏂板闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertTjAskWorkLog(TjAskWorkLog tjAskWorkLog) {
+ return tjAskWorkLogMapper.insertTjAskWorkLog(tjAskWorkLog);
+ }
+
+ /**
+ * 淇敼闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param tjAskWorkLog 闂瘖鑱屼笟鍙茶褰�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateTjAskWorkLog(TjAskWorkLog tjAskWorkLog) {
+ return tjAskWorkLogMapper.updateTjAskWorkLog(tjAskWorkLog);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎闂瘖鑱屼笟鍙茶褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑闂瘖鑱屼笟鍙茶褰曚富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjAskWorkLogByIds(Long[] ids) {
+ return tjAskWorkLogMapper.deleteTjAskWorkLogByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎闂瘖鑱屼笟鍙茶褰曚俊鎭�
+ *
+ * @param id 闂瘖鑱屼笟鍙茶褰曚富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjAskWorkLogById(Long id) {
+ return tjAskWorkLogMapper.deleteTjAskWorkLogById(id);
+ }
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeLogServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeLogServiceImpl.java
new file mode 100644
index 0000000..fca43cf
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeLogServiceImpl.java
@@ -0,0 +1,88 @@
+package com.ltkj.hosp.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ltkj.hosp.mapper.TjHarmTypeLogMapper;
+import com.ltkj.hosp.domain.TjHarmTypeLog;
+import com.ltkj.hosp.service.ITjHarmTypeLogService;
+
+/**
+ * 闂瘖鍗卞鍥犵礌鍏宠仈Service涓氬姟灞傚鐞�
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Service
+public class TjHarmTypeLogServiceImpl extends ServiceImpl<TjHarmTypeLogMapper,TjHarmTypeLog> implements ITjHarmTypeLogService {
+ @Autowired
+ private TjHarmTypeLogMapper tjHarmTypeLogMapper;
+
+ /**
+ * 鏌ヨ闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param id 闂瘖鍗卞鍥犵礌鍏宠仈涓婚敭
+ * @return 闂瘖鍗卞鍥犵礌鍏宠仈
+ */
+ @Override
+ public TjHarmTypeLog selectTjHarmTypeLogById(Long id) {
+ return tjHarmTypeLogMapper.selectTjHarmTypeLogById(id);
+ }
+
+ /**
+ * 鏌ヨ闂瘖鍗卞鍥犵礌鍏宠仈鍒楄〃
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 闂瘖鍗卞鍥犵礌鍏宠仈
+ */
+ @Override
+ public List<TjHarmTypeLog> selectTjHarmTypeLogList(TjHarmTypeLog tjHarmTypeLog) {
+ return tjHarmTypeLogMapper.selectTjHarmTypeLogList(tjHarmTypeLog);
+ }
+
+ /**
+ * 鏂板闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertTjHarmTypeLog(TjHarmTypeLog tjHarmTypeLog) {
+ return tjHarmTypeLogMapper.insertTjHarmTypeLog(tjHarmTypeLog);
+ }
+
+ /**
+ * 淇敼闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param tjHarmTypeLog 闂瘖鍗卞鍥犵礌鍏宠仈
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateTjHarmTypeLog(TjHarmTypeLog tjHarmTypeLog) {
+ return tjHarmTypeLogMapper.updateTjHarmTypeLog(tjHarmTypeLog);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎闂瘖鍗卞鍥犵礌鍏宠仈
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑闂瘖鍗卞鍥犵礌鍏宠仈涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjHarmTypeLogByIds(Long[] ids) {
+ return tjHarmTypeLogMapper.deleteTjHarmTypeLogByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎闂瘖鍗卞鍥犵礌鍏宠仈淇℃伅
+ *
+ * @param id 闂瘖鍗卞鍥犵礌鍏宠仈涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjHarmTypeLogById(Long id) {
+ return tjHarmTypeLogMapper.deleteTjHarmTypeLogById(id);
+ }
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeServiceImpl.java
new file mode 100644
index 0000000..c33800a
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeServiceImpl.java
@@ -0,0 +1,90 @@
+package com.ltkj.hosp.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjGroupingPro;
+import com.ltkj.hosp.mapper.TjGroupingProMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ltkj.hosp.mapper.TjHarmTypeMapper;
+import com.ltkj.hosp.domain.TjHarmType;
+import com.ltkj.hosp.service.ITjHarmTypeService;
+
+/**
+ * 鑱屼笟鐥匰ervice涓氬姟灞傚鐞�
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-12-06
+ */
+@Service
+public class TjHarmTypeServiceImpl extends ServiceImpl<TjHarmTypeMapper, TjHarmType> implements ITjHarmTypeService {
+ @Autowired
+ private TjHarmTypeMapper tjHarmTypeMapper;
+
+ /**
+ * 鏌ヨ鑱屼笟鐥�
+ *
+ * @param aid 鑱屼笟鐥呬富閿�
+ * @return 鑱屼笟鐥�
+ */
+ @Override
+ public TjHarmType selectTjHarmTypeByAid(String aid) {
+ return tjHarmTypeMapper.selectTjHarmTypeByAid(aid);
+ }
+
+ /**
+ * 鏌ヨ鑱屼笟鐥呭垪琛�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 鑱屼笟鐥�
+ */
+ @Override
+ public List<TjHarmType> selectTjHarmTypeList(TjHarmType tjHarmType) {
+ return tjHarmTypeMapper.selectTjHarmTypeList(tjHarmType);
+ }
+
+ /**
+ * 鏂板鑱屼笟鐥�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertTjHarmType(TjHarmType tjHarmType) {
+ return tjHarmTypeMapper.insertTjHarmType(tjHarmType);
+ }
+
+ /**
+ * 淇敼鑱屼笟鐥�
+ *
+ * @param tjHarmType 鑱屼笟鐥�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateTjHarmType(TjHarmType tjHarmType) {
+ return tjHarmTypeMapper.updateTjHarmType(tjHarmType);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鑱屼笟鐥�
+ *
+ * @param aids 闇�瑕佸垹闄ょ殑鑱屼笟鐥呬富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjHarmTypeByAids(String[] aids) {
+ return tjHarmTypeMapper.deleteTjHarmTypeByAids(aids);
+ }
+
+ /**
+ * 鍒犻櫎鑱屼笟鐥呬俊鎭�
+ *
+ * @param aid 鑱屼笟鐥呬富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjHarmTypeByAid(String aid) {
+ return tjHarmTypeMapper.deleteTjHarmTypeByAid(aid);
+ }
+}
--
Gitblit v1.8.0