2

lige

2023-12-09 894b091f0e9b6b501e408885ce28f6a391e43d7c

2

 ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java

@@ -10,6 +10,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -67,7 +68,7 @@

            if (order != null) {
                LambdaQueryWrapper<TjAskMedicalHistory> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjAskMedicalHistory::getCusId, order.getTjNumber());
                wq1.eq(TjAskMedicalHistory::getTjNum, order.getTjNumber());
                TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq1);
                if (one != null) {
                    one.setTjCategory(order.getTjCategory());
@@ -112,10 +113,11 @@
    }

    /**
     * 小程序修改问诊
     * 小程序新增修改问诊
     */
    @ApiOperation(value = "小程序端新增问诊记录信息接口")
    @PostMapping("/appEdit")
    @Transactional
    public AjaxResult appEdit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
        LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
        wq.eq(TjAskMedicalHistory::getTjNum, tjAskMedicalHistory.getTjNum());
@@ -130,13 +132,14 @@
                    for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
                        tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
                        if (!historysService.save(tjAskHistorys)) {
                            return AjaxResult.error();
                            return AjaxResult.error("添加失败");
                        }
                    }
                    //添加职业病史
                    final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs();
                    if (workLogs != null) {
                        for (TjAskWorkLog workLog : workLogs) {
                            workLog.setAskId(tjAskMedicalHistory.getAskId());
                            workLog.setCusId(tjAskMedicalHistory.getCusId());
                            workLog.setCusName(tjAskMedicalHistory.getCusName());
                            workLog.setTjNumber(tjAskMedicalHistory.getTjNum());
@@ -157,7 +160,7 @@
                                        log.setWorkId(workLog.getId());
                                        final boolean b = tjHarmTypeLogService.save(log);
                                        if (!b) {
                                            return AjaxResult.error();
                                            return AjaxResult.error("添加失败");
                                        }
                                    }
                                }
@@ -168,6 +171,21 @@
                return AjaxResult.success("添加成功!");
            }
        }else {
            //新增修改没问题  这块牵扯删除 没有更好的办法  所以采取先删后加
            //删除原来的职业和病史
            LambdaQueryWrapper<TjAskWorkLog> wq1 = new LambdaQueryWrapper<>();
            wq1.eq(TjAskWorkLog::getTjNumber, tjAskMedicalHistory.getTjNum());
            tjAskWorkLogService.remove(wq1);
            //删除原来的病史
            LambdaQueryWrapper<TjAskHistorys> wq2 = new LambdaQueryWrapper<>();
            wq2.eq(TjAskHistorys::getAskId, one.getAskId());
            historysService.remove(wq2);
            //删除原来的病史
            LambdaQueryWrapper<TjHarmTypeLog> wq3 = new LambdaQueryWrapper<>();
            wq3.eq(TjHarmTypeLog::getTjNumber, tjAskMedicalHistory.getTjNum());
            tjHarmTypeLogService.remove(wq3);


            tjAskMedicalHistory.setFromBy("小程序端");
            tjAskMedicalHistory.setUpdateId(String.valueOf(UserHoder.getWxuser().getId()));
            if (tjAskMedicalHistoryService.updateById(tjAskMedicalHistory)) {
@@ -176,21 +194,43 @@
                    //修改病史
                    for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
                        tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
                        if (!historysService.updateById(tjAskHistorys)) {
                            return AjaxResult.error();
                        if (!historysService.save(tjAskHistorys)) {
                            return AjaxResult.error("添加失败");
                        }
//                        if (tjAskHistorys.getDiseaseId()==null){
//                            if (!historysService.save(tjAskHistorys)) {
//                                return AjaxResult.error("添加失败");
//                            }
//                        }else {
//                            if (!historysService.updateById(tjAskHistorys)) {
//                                return AjaxResult.error("修改失败");
//                            }
//                        }

                    }
                    //修改职业病史
                    final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs();
                    if (workLogs != null) {
                        for (TjAskWorkLog workLog : workLogs) {
                            workLog.setAskId(tjAskMedicalHistory.getAskId());
                            workLog.setCusId(tjAskMedicalHistory.getCusId());
                            workLog.setCusName(tjAskMedicalHistory.getCusName());
                            workLog.setTjNumber(tjAskMedicalHistory.getTjNum());
                            final boolean save = tjAskWorkLogService.updateById(workLog);
                            final boolean save = tjAskWorkLogService.save(workLog);
                            if (!save) {
                                return AjaxResult.error();
                                return AjaxResult.error("添加失败");
                            }
//                            if (workLog.getId()==null){
//                                final boolean save = tjAskWorkLogService.save(workLog);
//                                if (!save) {
//                                    return AjaxResult.error("添加失败");
//                                }
//                            }else {
//                                final boolean save = tjAskWorkLogService.updateById(workLog);
//                                if (!save) {
//                                    return AjaxResult.error("修改失败");
//                                }
//                            }
                            List<String> harmTypeLogs = workLog.getHarmTypeLogs();
                            if (harmTypeLogs != null) {
                                for (String harmTypeLog : harmTypeLogs) {
@@ -202,10 +242,22 @@
                                        log.setCusName(tjAskMedicalHistory.getCusName());
                                        log.setTjNumber(tjAskMedicalHistory.getTjNum());
                                        log.setWorkId(workLog.getId());
                                        final boolean b = tjHarmTypeLogService.updateById(log);
                                        final boolean b = tjHarmTypeLogService.save(log);
                                        if (!b) {
                                            return AjaxResult.error();
                                            return AjaxResult.error("添加失败");
                                        }
//                                        if (log.getId()==null){
//                                            final boolean b = tjHarmTypeLogService.save(log);
//                                            if (!b) {
//                                                return AjaxResult.error("添加失败");
//                                            }
//                                        }else {
//                                            final boolean b = tjHarmTypeLogService.updateById(log);
//                                            if (!b) {
//                                                return AjaxResult.error("修改失败");
//                                            }
//                                        }

                                    }
                                }
                            }

 ltkj-hosp/src/main/resources/mapper/hosp/DictSfxmMapper.xml

@@ -62,7 +62,8 @@
                            and xmbm = #{xmbm}
                        </if>
                        <if test="xmmc != null  and xmmc != ''">
                            and xmmc like "%"#{xmmc}"%"
--                             and xmmc like "%"#{xmmc}"%"
                            and xmmc like CONCAT("%",#{xmmc},"%")
                        </if>
                        <if test="pym != null  and pym != ''">
                            and pym like "%"#{pym}"%"
@@ -436,4 +437,4 @@
            #{id}
        </foreach>
    </delete>
</mapper>
</mapper>