新乡的工单导出不让他们导。

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -37,10 +37,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.var;
+import org.elasticsearch.action.ActionRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
@@ -244,251 +246,276 @@ public class WorkOrderBaseController extends BaseController {
     @ApiOperation("导出Excel")
     @Log(title = "导出Excel", businessType = BusinessType.EXPORT)
     @PostMapping("/exportExcel")
-    public void exportExcel( WorkOrderBase input,Integer  listType) {
-        LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper();
-
-        qw.eq(input.getFirsttype()!=null && input.getFirsttype()>0,WorkOrderBase::getFirsttype, input.getFirsttype());
-        qw.like(!StringHelper.isEmpty(input.getCallnum()), WorkOrderBase::getCallnum, input.getCallnum());
-        qw.like(!StringHelper.isEmpty(input.getCaller()), WorkOrderBase::getCaller, input.getCaller());
-
-        qw.eq(!StringHelper.isEmpty(input.getSex()), WorkOrderBase::getSex, input.getSex());
-        qw.like(!StringHelper.isEmpty(input.getWorkordercode()), WorkOrderBase::getWorkordercode, input.getWorkordercode());
-
-        qw.eq(input.getRestartsnum() != null && input.getRestartsnum() >= 0, WorkOrderBase::getRestartsnum, input.getRestartsnum());
-        qw.eq(input.getProject() != null && input.getProject() > 0, WorkOrderBase::getProject, input.getProject());
-        qw.eq(input.getWorkordercate() != null && input.getWorkordercate() > 0, WorkOrderBase::getWorkordercate, input.getWorkordercate());
-        qw.eq(input.getWorkorderstate() != null && input.getWorkorderstate() >= 0, WorkOrderBase::getWorkorderstate, input.getWorkorderstate());
-        qw.like(!StringHelper.isEmpty(input.getDealuser()), WorkOrderBase::getDealuser, input.getDealuser());
-        qw.like(!StringHelper.isEmpty(input.getSource()), WorkOrderBase::getSource, input.getSource());
-
-        qw.eq(!StringHelper.isEmpty(input.getCustomerno()), WorkOrderBase::getCustomerno, input.getCustomerno());
-
-        qw.eq(!StringHelper.isEmpty(input.getCreateuser()), WorkOrderBase::getCreateuser, input.getCreateuser());
-
-        qw.eq(WorkOrderBase::getIsdelete, 0);
+    public AjaxResult exportExcel(WorkOrderBase input, Integer  listType) throws Exception {
+//void
 
-        //ge("age", 18)表示查询年龄大于等于18的记录。
-        qw.ge(input.getCreatetime() != null , WorkOrderBase::getCreatetime, input.getCreatetime());
-        qw.le(input.getEndtime() != null , WorkOrderBase::getCreatetime, input.getEndtime());
-
-//        qw.eq(input.getGrade() != null && input.getGrade() > 0, WorkOrderBase::getGrade, input.getGrade());
-//        qw.eq(input.getMaritalStatus() != null && input.getMaritalStatus() > 0, WorkOrderBase::getMaritalStatus, input.getMaritalStatus());
-//        qw.eq(input.getCareer() != null && input.getCareer() > 0, WorkOrderBase::getCareer, input.getCareer());
+        return  Error("导出异常");
+//        try {
+//            LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper();
 //
-//        qw.eq(input.getArea() != null && input.getArea() > 0, WorkOrderBase::getArea, input.getArea());
-//        qw.eq(input.getUseMedicine() != null && input.getUseMedicine() > 0, WorkOrderBase::getUseMedicine, input.getUseMedicine());
-//        qw.eq(input.getPreviousDiagnosis() != null && input.getPreviousDiagnosis() > 0, WorkOrderBase::getPreviousDiagnosis, input.getPreviousDiagnosis());
-//        qw.eq(input.getTreatNow() != null && input.getTreatNow() > 0, WorkOrderBase::getTreatNow, input.getTreatNow());
-//        qw.eq(input.getPreviousPsychotherapy() != null && input.getPreviousPsychotherapy() > 0, WorkOrderBase::getPreviousPsychotherapy, input.getPreviousPsychotherapy());
-//        qw.eq(input.getConcretePlan() != null && input.getConcretePlan() > 0, WorkOrderBase::getConcretePlan, input.getConcretePlan());
-//        qw.eq(input.getHandlingMeasures() != null && input.getHandlingMeasures() > 0, WorkOrderBase::getHandlingMeasures, input.getHandlingMeasures());
-
-
-        qw.eq(!StringHelper.isEmpty(input.getGrade()) , WorkOrderBase::getGrade, input.getGrade());
-        qw.eq(!StringHelper.isEmpty(input.getMaritalStatus())  , WorkOrderBase::getMaritalStatus, input.getMaritalStatus());
-        qw.eq(!StringHelper.isEmpty(input.getCareer())  , WorkOrderBase::getCareer, input.getCareer());
-        qw.eq(input.getArea() != null && input.getArea() > 0, WorkOrderBase::getArea, input.getArea());
-
-        qw.eq(!StringHelper.isEmpty(input.getUseMedicine())  , WorkOrderBase::getUseMedicine, input.getUseMedicine());
-        qw.eq(!StringHelper.isEmpty(input.getPreviousDiagnosis())  , WorkOrderBase::getPreviousDiagnosis, input.getPreviousDiagnosis());
-        qw.eq(!StringHelper.isEmpty(input.getTreatNow())  , WorkOrderBase::getTreatNow, input.getTreatNow());
-        qw.eq(!StringHelper.isEmpty(input.getPreviousPsychotherapy())  , WorkOrderBase::getPreviousPsychotherapy, input.getPreviousPsychotherapy());
-
-        qw.eq(!StringHelper.isEmpty(input.getConcretePlan())  , WorkOrderBase::getConcretePlan, input.getConcretePlan());
-        qw.eq(!StringHelper.isEmpty(input.getHandlingMeasures())  , WorkOrderBase::getHandlingMeasures, input.getHandlingMeasures());
-
-
-        if (listType!=null)
-        {
-            switch (listType) {
-                //综合查询列表 kfyy 和admin可以看全部工单，其他人只能看见自己创建的或者自己处理的工单
-                case 0:
-                    break;
-                //（处理人）我的待处理
-                case 1:
-                    qw.eq(WorkOrderBase::getDealuser, CurrentUser().getUserName());
-                    qw.lt(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dsh.getValue());
-
-                    qw.gt(WorkOrderBase::getWorkorderstate, EnumOrderStatus.djd.getValue());
-                    break;
-                case 2:
-                    qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.xgd.getValue());
-                    break;
-                case 3:
-                    qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dsh.getValue());
-                    break;
-                case 4:
-                    qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dhf.getValue());
-                    break;
-                //我的回复列表
-                case 5:
-                    // qw.gt(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dcl.getValue());
-                    qw.eq(WorkOrderBase::getDealuser, CurrentUser().getUserName());
-
-                    break;
-                //组内工单
-                //（办理人员）
-                case 6:
-
-                    qw.eq(WorkOrderBase::getDealdept, CurrentUser().getDeptId());
-                    break;
-                case 7:
-                    qw.apply("IFNULL(UNIX_TIMESTAMP(dealtime),UNIX_TIMESTAMP(NOW()))>UNIX_TIMESTAMP(deadline)");
-                    break;
-                case 8:
-                    qw.gt(WorkOrderBase::getDelayaudit,0);
-                    break;
-
-                case 9:
-                    qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dpj.getValue());
-                    qw.eq(WorkOrderBase::getCallcode, CurrentUser().getUserName());
-                    break;
-
-            }
-        }
-        var table = workorderbaseService.getList(qw);
-     List<  Map<String,String>> orderProblems= workorderbaseService.selectOrderProblem();
-        List<DictData> dictDatas= dictDataService.getList();
-        List<WorkOrderBaseView>  View=  JSON.parseArray(JSON.toJSONString(table),WorkOrderBaseView.class);
-List<WorkOrderType> typelist=workrodertypeService.getList();
-
-        for   (WorkOrderBaseView orderBase:View){
-
-            if(orderBase.getCreatetime().equals( orderBase.getEndtime() )){
-                orderBase.setDealmethod("立即完结");
-            }else {
-                orderBase.setDealmethod("转办");
-            }
-            if (orderBase.getWorkordercate() !=null && orderBase.getWorkordercate() > 0) {
-                orderBase.setWorkordercatename(typelist.stream().filter(x-> Objects.equals(x.getId(), orderBase.getWorkordercate()))
-                         .findFirst()
-                        .map(WorkOrderType::getAllTypeName)
-                        .orElse(null));
-
-                }
-
-
-            if(orderBase.getArea()!=null && orderBase.getArea()>0){
-                Area area=   areaService.getEntity(orderBase.getArea());
-                orderBase.setAreaName(area.getAncestorsName());
-
-            }
-            //根据工单编号找orderproblem
-
-         var tt=   orderProblems.stream()
-                    .filter(map -> orderBase.getWorkordercode() .equals(map.get("key"))).collect(Collectors.toList());
-
-
-            String value = orderProblems.stream()
-                    .filter(map -> orderBase.getWorkordercode() .equals(map.get("key")))
-                    .map(map -> map.get("value"))
-                    .filter(Objects::nonNull)
-                    .findFirst()
-                    .orElse(""); // 如果找不到返回 null，可以替换为默认值
-            orderBase.setStrOrderProblems(value);
-
-          //  List<OrderProblem> problemslist=  orderProblems.stream().filter(x->x.getWorkordercode()==orderBase.getWorkordercode()).collect(Collectors.toList());
-
-//            LambdaQueryWrapper<OrderProblem> orderproblemqw = new LambdaQueryWrapper();
-//            orderproblemqw.eq(OrderProblem::getWorkordercode,orderBase.getWorkordercode()).eq(OrderProblem::getIsDelete,0L);
-//          List<OrderProblem> problemslist=  orderProblemService.getList(orderproblemqw);
-
-//            if(problemslist!=null && problemslist.size()>0){
-//                orderBase.setStrOrderProblems( problemslist.stream()
-//                        .map(problem -> problem.getAllName() + "-患病" + problem.getYears()+'年')
-//                        .collect(Collectors.joining(",")));
+//            qw.eq(input.getFirsttype() != null && input.getFirsttype() > 0, WorkOrderBase::getFirsttype, input.getFirsttype());
+//            qw.like(!StringHelper.isEmpty(input.getCallnum()), WorkOrderBase::getCallnum, input.getCallnum());
+//            qw.like(!StringHelper.isEmpty(input.getCaller()), WorkOrderBase::getCaller, input.getCaller());
+//
+//            qw.eq(!StringHelper.isEmpty(input.getSex()), WorkOrderBase::getSex, input.getSex());
+//            qw.like(!StringHelper.isEmpty(input.getWorkordercode()), WorkOrderBase::getWorkordercode, input.getWorkordercode());
+//
+//            qw.eq(input.getRestartsnum() != null && input.getRestartsnum() >= 0, WorkOrderBase::getRestartsnum, input.getRestartsnum());
+//            qw.eq(input.getProject() != null && input.getProject() > 0, WorkOrderBase::getProject, input.getProject());
+//            qw.eq(input.getWorkordercate() != null && input.getWorkordercate() > 0, WorkOrderBase::getWorkordercate, input.getWorkordercate());
+//            qw.eq(input.getWorkorderstate() != null && input.getWorkorderstate() >= 0, WorkOrderBase::getWorkorderstate, input.getWorkorderstate());
+//            qw.like(!StringHelper.isEmpty(input.getDealuser()), WorkOrderBase::getDealuser, input.getDealuser());
+//            qw.like(!StringHelper.isEmpty(input.getSource()), WorkOrderBase::getSource, input.getSource());
+//
+//            qw.eq(!StringHelper.isEmpty(input.getCustomerno()), WorkOrderBase::getCustomerno, input.getCustomerno());
+//
+//            qw.eq(!StringHelper.isEmpty(input.getCreateuser()), WorkOrderBase::getCreateuser, input.getCreateuser());
+//
+//            qw.eq(WorkOrderBase::getIsdelete, 0);
+//
+//            //ge("age", 18)表示查询年龄大于等于18的记录。
+//            qw.ge(input.getCreatetime() != null, WorkOrderBase::getCreatetime, input.getCreatetime());
+//            qw.le(input.getEndtime() != null, WorkOrderBase::getCreatetime, input.getEndtime());
+//
+////        qw.eq(input.getGrade() != null && input.getGrade() > 0, WorkOrderBase::getGrade, input.getGrade());
+////        qw.eq(input.getMaritalStatus() != null && input.getMaritalStatus() > 0, WorkOrderBase::getMaritalStatus, input.getMaritalStatus());
+////        qw.eq(input.getCareer() != null && input.getCareer() > 0, WorkOrderBase::getCareer, input.getCareer());
+////
+////        qw.eq(input.getArea() != null && input.getArea() > 0, WorkOrderBase::getArea, input.getArea());
+////        qw.eq(input.getUseMedicine() != null && input.getUseMedicine() > 0, WorkOrderBase::getUseMedicine, input.getUseMedicine());
+////        qw.eq(input.getPreviousDiagnosis() != null && input.getPreviousDiagnosis() > 0, WorkOrderBase::getPreviousDiagnosis, input.getPreviousDiagnosis());
+////        qw.eq(input.getTreatNow() != null && input.getTreatNow() > 0, WorkOrderBase::getTreatNow, input.getTreatNow());
+////        qw.eq(input.getPreviousPsychotherapy() != null && input.getPreviousPsychotherapy() > 0, WorkOrderBase::getPreviousPsychotherapy, input.getPreviousPsychotherapy());
+////        qw.eq(input.getConcretePlan() != null && input.getConcretePlan() > 0, WorkOrderBase::getConcretePlan, input.getConcretePlan());
+////        qw.eq(input.getHandlingMeasures() != null && input.getHandlingMeasures() > 0, WorkOrderBase::getHandlingMeasures, input.getHandlingMeasures());
+//
+//
+//            qw.eq(!StringHelper.isEmpty(input.getGrade()), WorkOrderBase::getGrade, input.getGrade());
+//            qw.eq(!StringHelper.isEmpty(input.getMaritalStatus()), WorkOrderBase::getMaritalStatus, input.getMaritalStatus());
+//            qw.eq(!StringHelper.isEmpty(input.getCareer()), WorkOrderBase::getCareer, input.getCareer());
+//            qw.eq(input.getArea() != null && input.getArea() > 0, WorkOrderBase::getArea, input.getArea());
+//
+//            qw.eq(!StringHelper.isEmpty(input.getUseMedicine()), WorkOrderBase::getUseMedicine, input.getUseMedicine());
+//            qw.eq(!StringHelper.isEmpty(input.getPreviousDiagnosis()), WorkOrderBase::getPreviousDiagnosis, input.getPreviousDiagnosis());
+//            qw.eq(!StringHelper.isEmpty(input.getTreatNow()), WorkOrderBase::getTreatNow, input.getTreatNow());
+//            qw.eq(!StringHelper.isEmpty(input.getPreviousPsychotherapy()), WorkOrderBase::getPreviousPsychotherapy, input.getPreviousPsychotherapy());
+//
+//            qw.eq(!StringHelper.isEmpty(input.getConcretePlan()), WorkOrderBase::getConcretePlan, input.getConcretePlan());
+//            qw.eq(!StringHelper.isEmpty(input.getHandlingMeasures()), WorkOrderBase::getHandlingMeasures, input.getHandlingMeasures());
+//
+//
+//            if (listType != null) {
+//                switch (listType) {
+//                    //综合查询列表 kfyy 和admin可以看全部工单，其他人只能看见自己创建的或者自己处理的工单
+//                    case 0:
+//                        break;
+//                    //（处理人）我的待处理
+//                    case 1:
+//                        qw.eq(WorkOrderBase::getDealuser, CurrentUser().getUserName());
+//                        qw.lt(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dsh.getValue());
+//
+//                        qw.gt(WorkOrderBase::getWorkorderstate, EnumOrderStatus.djd.getValue());
+//                        break;
+//                    case 2:
+//                        qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.xgd.getValue());
+//                        break;
+//                    case 3:
+//                        qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dsh.getValue());
+//                        break;
+//                    case 4:
+//                        qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dhf.getValue());
+//                        break;
+//                    //我的回复列表
+//                    case 5:
+//                        // qw.gt(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dcl.getValue());
+//                        qw.eq(WorkOrderBase::getDealuser, CurrentUser().getUserName());
+//
+//                        break;
+//                    //组内工单
+//                    //（办理人员）
+//                    case 6:
+//
+//                        qw.eq(WorkOrderBase::getDealdept, CurrentUser().getDeptId());
+//                        break;
+//                    case 7:
+//                        qw.apply("IFNULL(UNIX_TIMESTAMP(dealtime),UNIX_TIMESTAMP(NOW()))>UNIX_TIMESTAMP(deadline)");
+//                        break;
+//                    case 8:
+//                        qw.gt(WorkOrderBase::getDelayaudit, 0);
+//                        break;
+//
+//                    case 9:
+//                        qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dpj.getValue());
+//                        qw.eq(WorkOrderBase::getCallcode, CurrentUser().getUserName());
+//                        break;
+//
+//                }
 //            }
-//            else{
-//                orderBase.setStrOrderProblems("");
+//            var table = workorderbaseService.getList(qw);
+//            List<Map<String, String>> orderProblems = workorderbaseService.selectOrderProblem();
+//            //   List<DictData> dictDatas= dictDataService.getList();
+//            List<WorkOrderBaseView> View = JSON.parseArray(JSON.toJSONString(table), WorkOrderBaseView.class);
+//            List<WorkOrderType> typelist = workrodertypeService.getList();
+//            List<Area> areaList = areaService.getList();
+//            Map<String, String> dicdatamap = dictDataService.getDicDataMap();
+//            for (WorkOrderBaseView orderBase : View) {
+//
+//                if (orderBase.getCreatetime().equals(orderBase.getEndtime())) {
+//                    orderBase.setDealmethod("立即完结");
+//                } else {
+//                    orderBase.setDealmethod("转办");
+//                }
+//                if (orderBase.getWorkordercate() != null && orderBase.getWorkordercate() > 0) {
+//                    orderBase.setWorkordercatename(typelist.stream().filter(x -> Objects.equals(x.getId(), orderBase.getWorkordercate()))
+//                            .findFirst()
+//                            .map(WorkOrderType::getAllTypeName)
+//                            .orElse(null));
+//
+//                }
+//
+//
+//                if (orderBase.getArea() != null && orderBase.getArea() > 0) {
+//
+//                    orderBase.setAreaName(areaList.stream().filter(x -> Objects.equals(x.getId(), orderBase.getArea()))
+//                            .findFirst().map(Area::getAncestorsName).orElse(null)
+//                    );
+//
+//                }
+//                //根据工单编号找orderproblem
+//
+////         var tt=   orderProblems.stream()
+////                    .filter(map -> orderBase.getWorkordercode() .equals(map.get("key"))).collect(Collectors.toList());
+////
+//
+//                String value = orderProblems.stream()
+//                        .filter(map -> orderBase.getWorkordercode().equals(map.get("key")))
+//                        .map(map -> map.get("value"))
+//                        .filter(Objects::nonNull)
+//                        .findFirst()
+//                        .orElse(""); // 如果找不到返回 null，可以替换为默认值
+//                orderBase.setStrOrderProblems(value);
+//
+//                //  List<OrderProblem> problemslist=  orderProblems.stream().filter(x->x.getWorkordercode()==orderBase.getWorkordercode()).collect(Collectors.toList());
+//
+////            LambdaQueryWrapper<OrderProblem> orderproblemqw = new LambdaQueryWrapper();
+////            orderproblemqw.eq(OrderProblem::getWorkordercode,orderBase.getWorkordercode()).eq(OrderProblem::getIsDelete,0L);
+////          List<OrderProblem> problemslist=  orderProblemService.getList(orderproblemqw);
+//
+////            if(problemslist!=null && problemslist.size()>0){
+////                orderBase.setStrOrderProblems( problemslist.stream()
+////                        .map(problem -> problem.getAllName() + "-患病" + problem.getYears()+'年')
+////                        .collect(Collectors.joining(",")));
+////            }
+////            else{
+////                orderBase.setStrOrderProblems("");
+////            }
+//
+//
+//                if (!StringHelper.isEmpty(orderBase.getGrade())) {
+//
+//                    String name = dicdatamap.get("order_grade/" + orderBase.getGrade());
+//                    orderBase.setGradeName(name);
+//
+//
+////                orderBase.setGradeName(dictDatas.stream()
+////                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getGrade()))
+////                        .findFirst()
+////                        .map(DictData::getDictLabel)
+////                        .orElse(null)); // 或者提供一个默认值);
+//                }
+//                if (!StringHelper.isEmpty(orderBase.getMaritalStatus())) {
+//                    String name = dicdatamap.get("order_marital_status/" + orderBase.getMaritalStatus());
+//                    orderBase.setMaritalStatusName(name);
+////                orderBase.setMaritalStatusName(dictDatas.stream()
+////                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getMaritalStatus()))
+////                        .findFirst()
+////                        .map(DictData::getDictLabel)
+////                        .orElse(null)); // 或者提供一个默认值);
+//                }
+//
+//                if (!StringHelper.isEmpty(orderBase.getCareer())) {
+//                    String name = dicdatamap.get("order_career/" + orderBase.getCareer());
+//                    orderBase.setCareerName(name);
+////                orderBase.setCareerName(dictDatas.stream()
+////                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getCareer()))
+////                        .findFirst()
+////                        .map(DictData::getDictLabel)
+////                        .orElse(null)); // 或者提供一个默认值);
+//                }
+//                if (!StringHelper.isEmpty(orderBase.getUseMedicine())) {
+//                    String name = dicdatamap.get("order_use_medicine/" + orderBase.getUseMedicine());
+//                    orderBase.setUseMedicineName(name);
+////                orderBase.setUseMedicineName(dictDatas.stream()
+////                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getUseMedicine()))
+////                        .findFirst()
+////                        .map(DictData::getDictLabel)
+////                        .orElse(null)); // 或者提供一个默认值);
+//                }
+//
+//                if (!StringHelper.isEmpty(orderBase.getPreviousDiagnosis())) {
+//                    String name = dicdatamap.get("order_previous_diagnosis/" + orderBase.getPreviousDiagnosis());
+//                    orderBase.setPreviousDiagnosisName(name);
+////                orderBase.setPreviousDiagnosisName(dictDatas.stream()
+////                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getPreviousDiagnosis()))
+////                        .findFirst()
+////                        .map(DictData::getDictLabel)
+////                        .orElse(null));
+//                }
+//                if (!StringHelper.isEmpty(orderBase.getTreatNow())) {
+//                    String name = dicdatamap.get("order_treat_now/" + orderBase.getTreatNow());
+//                    orderBase.setTreatNowName(name);
+////                orderBase.setTreatNowName(dictDatas.stream()
+////                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getTreatNow()))
+////                        .findFirst()
+////                        .map(DictData::getDictLabel)
+////                        .orElse(null) );
+//                }
+//                if (!StringHelper.isEmpty(orderBase.getPreviousPsychotherapy())) {
+//                    String name = dicdatamap.get("order_previous_psychotherapy/" + orderBase.getPreviousPsychotherapy());
+//                    orderBase.setPreviousPsychotherapyName(name);
+////                orderBase.setPreviousPsychotherapyName(dictDatas.stream()
+////                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getPreviousPsychotherapy()))
+////                        .findFirst()
+////                        .map(DictData::getDictLabel)
+////                        .orElse(null) );
+//
+//                }
+//                if (!StringHelper.isEmpty(orderBase.getConcretePlan())) {
+//                    String name = dicdatamap.get("order_concrete_plan/" + orderBase.getConcretePlan());
+//                    orderBase.setConcretePlanName(name);
+////                orderBase.setConcretePlanName(dictDatas.stream()
+////                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getConcretePlan()))
+////                        .findFirst()
+////                        .map(DictData::getDictLabel)
+////                        .orElse(null) );
+//                }
+//
+//                if (!StringHelper.isEmpty(orderBase.getHandlingMeasures())) {
+//                    String name = Arrays.stream(orderBase.getHandlingMeasures().split(","))
+//                            .map(String::trim)
+//                            .map(key -> "order_handling_measures/" + key)  // 构造完整 key
+//                            .map(dicdatamap::get)  // 获取 value
+//                            .filter(Objects::nonNull)  // 过滤 null
+//                            .collect(Collectors.joining(","));  // 拼接成字符串
+//
+//                    orderBase.setHandlingMeasuresName(name);
+//
+////                // 通过Stream过滤并生成新List
+////                String[] targetNames = orderBase.getHandlingMeasures().split(",");
+////                // 转换为Set以提高查询效率
+////                Set<String> targetSet = new HashSet<>(Arrays.asList(targetNames));
+////                orderBase.setHandlingMeasuresName(dictDatas.stream()
+////                        .filter(obj -> targetSet.contains(obj.getDictValue()))
+////                        .map(DictData::getDictLabel)
+////                        .collect(Collectors.joining(",")));
+//                }
 //            }
-
-
-
-
-            if(!StringHelper.isEmpty(orderBase.getGrade())){
-                //  if(orderBase.getGrade()!=null && orderBase.getGrade()>0){
-                orderBase.setGradeName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getGrade()))
-                        .findFirst()
-                        .map(DictData::getDictLabel)
-                        .orElse(null)); // 或者提供一个默认值);
-            }
-            if(!StringHelper.isEmpty(orderBase.getMaritalStatus())){
-                //  if(orderBase.getMaritalStatus()!=null && orderBase.getMaritalStatus()>0){
-                orderBase.setMaritalStatusName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getMaritalStatus()))
-                        .findFirst()
-                        .map(DictData::getDictLabel)
-                        .orElse(null)); // 或者提供一个默认值);
-            }
-
-            if(!StringHelper.isEmpty(orderBase.getCareer())){
-                //  if(orderBase.getCareer()!=null && orderBase.getCareer()>0){
-                orderBase.setCareerName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getCareer()))
-                        .findFirst()
-                        .map(DictData::getDictLabel)
-                        .orElse(null)); // 或者提供一个默认值);
-            }
-            if(!StringHelper.isEmpty(orderBase.getUseMedicine())){
-                // if(orderBase.getUseMedicine()!=null && orderBase.getUseMedicine()>0){
-                orderBase.setUseMedicineName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getUseMedicine()))
-                        .findFirst()
-                        .map(DictData::getDictLabel)
-                        .orElse(null)); // 或者提供一个默认值);
-            }
-
-            if(!StringHelper.isEmpty(orderBase.getPreviousDiagnosis())){
-                //if(orderBase.getPreviousDiagnosis()!=null && orderBase.getPreviousDiagnosis()>0){
-                orderBase.setPreviousDiagnosisName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getPreviousDiagnosis()))
-                        .findFirst()
-                        .map(DictData::getDictLabel)
-                        .orElse(null));
-            }
-            if(!StringHelper.isEmpty(orderBase.getTreatNow())){
-                //     if(orderBase.getTreatNow()!=null && orderBase.getTreatNow()>0){
-                orderBase.setTreatNowName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getTreatNow()))
-                        .findFirst()
-                        .map(DictData::getDictLabel)
-                        .orElse(null) );
-            }
-            if(!StringHelper.isEmpty(orderBase.getPreviousPsychotherapy())){
-                //  if(orderBase.getPreviousPsychotherapy()!=null && orderBase.getPreviousPsychotherapy()>0){
-                orderBase.setPreviousPsychotherapyName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getPreviousPsychotherapy()))
-                        .findFirst()
-                        .map(DictData::getDictLabel)
-                        .orElse(null) );
-
-            }
-            if(!StringHelper.isEmpty(orderBase.getConcretePlan())){
-                //if(orderBase.getConcretePlan()!=null && orderBase.getConcretePlan()>0){
-                orderBase.setConcretePlanName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getConcretePlan()))
-                        .findFirst()
-                        .map(DictData::getDictLabel)
-                        .orElse(null) );
-            }
-            if(!StringHelper.isEmpty(orderBase.getHandlingMeasures())){
-                // 通过Stream过滤并生成新List
-                String[] targetNames = orderBase.getHandlingMeasures().split(",");
-                // 转换为Set以提高查询效率
-                Set<String> targetSet = new HashSet<>(Arrays.asList(targetNames));
-                orderBase.setHandlingMeasuresName(dictDatas.stream()
-                        .filter(obj -> targetSet.contains(obj.getDictValue()))
-                        .map(DictData::getDictLabel)
-                        .collect(Collectors.joining(",")));
-            }
-        }
-
-
-
-        List<ExportWorkOrderBaseView>  baseView=  JSON.parseArray(JSON.toJSONString(View),ExportWorkOrderBaseView.class);
-        ExcelHelper<ExportWorkOrderBaseView> excel = new ExcelHelper<>(ExportWorkOrderBaseView.class);
-        excel.exportExcel("xlsx", baseView);
+//
+//
+//            List<ExportWorkOrderBaseView> baseView = JSON.parseArray(JSON.toJSONString(View), ExportWorkOrderBaseView.class);
+//            ExcelHelper<ExportWorkOrderBaseView> excel = new ExcelHelper<>(ExportWorkOrderBaseView.class);
+//            excel.exportExcel("xlsx", baseView);
+//        }
     }
 
     @ApiOperation("详情")

hjzx-service/src/main/java/api/service/system/IDictDataService.java

@@ -3,5 +3,8 @@ package api.service.system;
 import api.entity.database.system.DictData;
 import api.service.IBaseService;
 
+import java.util.Map;
+
 public interface IDictDataService extends IBaseService<DictData> {
+    Map<String, String> getDicDataMap() ;
 }

hjzx-service/src/main/java/api/service/system/impl/DictDataServiceImpl.java

@@ -9,6 +9,10 @@ import api.service.system.IDictDataService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @Transactional
 @Service
 public class DictDataServiceImpl  extends BaseServiceImpl<DictDataMapper, DictData>   implements IDictDataService {
@@ -16,6 +20,18 @@ public class DictDataServiceImpl  extends BaseServiceImpl<DictDataMapper, DictDa
     public DictDataServiceImpl() {
         super(false);
     }
+
+    @Override
+    public Map<String, String> getDicDataMap() {
+        List<DictData> dataList = this.getList();// .selectAllDicData();
+        return dataList.stream()
+                .collect(Collectors.toMap(
+                        data -> data.getDictType() + "/" + data.getDictValue(),
+                        DictData::getDictLabel,
+                        // 处理重复键：保留最新值（可根据需求调整）
+                        (existingValue, newValue) -> newValue
+                ));
+    }
 }