1

lige

2023-12-06 e44fea2d4845aed7848f163152da532f19ccce41

1

 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);
                    }

 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) {

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskWorkLogController.java

New file
@@ -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;

/**
 * 问诊职业史记录Controller
 *
 * @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)));
    }
}

 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);

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java

New file
@@ -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;

/**
 * 职业病Controller
 *
 * @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)));
    }
}

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeLogController.java

New file
@@ -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)));
    }
}

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java

@@ -1391,4 +1391,12 @@
        }
        return AjaxResult.error("暂无历史报告");
    }








}

 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();
                }
            }
        }
    }



}

 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);
    }


}

 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();
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java

New file
@@ -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;

}

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java

New file
@@ -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;


}

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmTypeLog.java

New file
@@ -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;

    /**
     * 职业史id
     */
    @Excel(name = "职业史id")
    private Long workId;

}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAskWorkLogMapper.java

New file
@@ -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;

/**
 * 问诊职业史记录Mapper接口
 *
 * @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);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeLogMapper.java

New file
@@ -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);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHarmTypeMapper.java

New file
@@ -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;

/**
 * 职业病Mapper接口
 *
 * @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);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjAskWorkLogService.java

New file
@@ -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;

/**
 * 问诊职业史记录Service接口
 *
 * @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);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeLogService.java

New file
@@ -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);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHarmTypeService.java

New file
@@ -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;

/**
 * 职业病Service接口
 *
 * @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);
}

 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);
            }
        }

    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAskWorkLogServiceImpl.java

New file
@@ -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;

/**
 * 问诊职业史记录Service业务层处理
 *
 * @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);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeLogServiceImpl.java

New file
@@ -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);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHarmTypeServiceImpl.java

New file
@@ -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;

/**
 * 职业病Service业务层处理
 *
 * @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);
    }
}