zjh 2024-08-16

zjh

2024-08-16 e72583cdcc3300dd922480594ff630b867c3a846

zjh 2024-08-16

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

@@ -1322,7 +1322,10 @@
            List<String> summaryList = orderRemark.getSummaryList();
            if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null) ) {
                orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
            }else {
                orderRemark.setSummary(null);
            }
            if(StringUtils.isBlank(orderRemark.getRemark()))orderRemark.setRemark(null);
            LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
            qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
            TjOrder order = orderService.getOne(qw);
@@ -1380,8 +1383,9 @@
                    one.setRemark(orderRemark.getRemark());
                    if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
                        one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                    }else {
                        one.setSummary(null);
                    }
//                    one.setDeptId(orderRemark.getDeptId());
                    one.setDoctorName(orderRemark.getDoctorName());
                    one.setType(1);
                    remarkService.updateById(one);
@@ -1579,17 +1583,11 @@
            return AjaxResult.error("获取用户信息错误");
        }

//        if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
//            Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
//            return AjaxResult.success(mapValue);
//        }

        TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);

//        List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
        List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);

        if (null == proParentList || proParentList.size()==0) {
        if (null == proParentList || proParentList.isEmpty()) {
            Map<String, Object> map = new HashMap<>();
            map.put("xiaoJieIds", null);
            map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
@@ -1605,73 +1603,17 @@
        List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
        List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
        TjCustomer customer = tjCustomerService.getById(one.getUserId());
        if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
        if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject project = projectService.getById(tjOrderDetail.getProId());
                //判断该项目是否需要打印报告
                if ("N".equals(project.getNeedReport())){
                    continue;
                }
                //病种回显
//                LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
//                wq.eq(TjOrderDetailRules::getProId,project.getProId());
//                wq.eq(TjOrderDetailRules::getTjNumber,tjNumber);
//                List<TjOrderDetailRules> list = tjOrderDetailRulesService.list(wq);
//                List<TjRules> res=new ArrayList<>();
//                for (TjOrderDetailRules orderDetailRules : list) {
//                    final TjRules byId = tjRulesService.getById(orderDetailRules.getAid());
//                    res.add(byId);
//                }
                List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
                tjOrderDetail.setRulesList(rulesList);

                //查标准和单位----start
//                List<TjStandard> list26 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
//                if (list26.size() == 0) {
//                    project.setProMetering("/");
//                    project.setProScope("/");
//                } else if (list26.size() == 1) {
//                    project.setProMetering(list26.get(0).getCompany() == null ? " " : list26.get(0).getCompany());
//                    project.setProScope((list26.get(0).getTjStandardLtValue() == null ? " " : list26.get(0).getTjStandardLtValue()) + "-" + (list26.get(0).getTjStandardGtValue() == null ? " " : list26.get(0).getTjStandardGtValue()));
//                } else {
//                    Long cusSex = customer.getCusSex();
//                    Date cusBrithday = customer.getCusBrithday();
//                    int age = DateUtil.ageOfNow(cusBrithday);
//                    for (TjStandard tjStandard : list26) {
//                        LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
//                        if (tjStandard.getTjSex() != null) {
//                            wq8.eq(TjStandard::getTjSex, cusSex);
//                        }
//                        if (tjStandard.getTjType() != null) {
//                            wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(age));
//                        }
//                        TjStandard standard = tjStandardService.getOne(wq8);
//                        project.setProMetering(standard.getCompany());
//                        project.setProScope((standard.getTjStandardLtValue() == null ? " " : standard.getTjStandardLtValue()) + "-" + (standard.getTjStandardGtValue() == null ? " " : standard.getTjStandardGtValue()));
//                    }
//                }
                //查标准和单位-----end
                tjOrderDetail.setProject(project);
//                List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(project.getProId()));
//                if (list2.size() == 0) {
//                    tjOrderDetail.setStandard(null);
//                } else if (list2.size() == 1) {
//                    tjOrderDetail.setStandard(list2.get(0));
//                } else {
//                    for (TjStandard tjStandard : list2) {
//                        LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
//                        if (tjStandard.getTjSex() != null) {
//                            wq8.eq(TjStandard::getTjSex, customer.getCusSex());
//                        }
//                        if (tjStandard.getTjType() != null) {
//                            wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
//                        }
//                        TjStandard standard = tjStandardService.getOne(wq8);
//                        tjOrderDetail.setStandard(standard);
//                    }
//                }
                if (null != remark.getDoctorName()) {
                    //lg0412
                    SysUser byId = userService.getById(remark.getDoctorName());
                    if (byId != null) {
                        tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
@@ -1686,11 +1628,6 @@
        List<TjAdvice> adviceList = new ArrayList<>();
        if (null != remark) {
            String[] strings = StringUtils.split(remark.getSummary(), ";");
//            if (null != strings && strings.length > 0) {
//                for (String string : strings) {
//                    adviceList.add(tjAdviceService.getById(string));
//                }
//            }
            if(null !=strings && strings.length>0){
                List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
                adviceList.addAll(list);

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

@@ -1,9 +1,6 @@
package com.ltkj.hosp.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -63,6 +60,7 @@
     */
    @Excel(name = "备注详情")
    @ApiModelProperty("备注详情")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String remark;

    /**
@@ -81,6 +79,7 @@


    @ApiModelProperty("小结")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String summary;