八院相关的调整

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

@@ -11,6 +11,7 @@ import api.entity.database.system.*;
 import api.entity.input.PageInput;
 import api.entity.input.order.TimeOutReportInput;
 import api.entity.input.order.TransOrderInput;
+import api.entity.view.order.ExportWorkOrderBaseView;
 import api.entity.view.order.TimeOutReportView;
 import api.entity.view.order.WorkOrderBaseView;
 import api.entity.view.system.DeptView;
@@ -96,9 +97,12 @@ public class WorkOrderBaseController extends BaseController {
     private IPatientService patientService;
     @Autowired
     private IUserService userService;
+    @Autowired
+    private IWorkOrderVisitLogService workordervisitlogService;
+
     //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6;7 超期列表
     @ApiOperation("列表 listType 0 综合查询列表 1（处理人）我的待处理；2 待交办;3 已办待审核；4 已办待回访；" +
-            "5 我的回复列表；6 组内工单7 超期列表 8 延期审核 9 我的待评价")
+            "5 我的回复列表；6 组内工单7 超期列表 8 延期审核 9 我的待评价,10 已回访")
     @Log(title = "查询wo_workorderbase列表", businessType = BusinessType.QUERY)
     @GetMapping
 
@@ -194,6 +198,9 @@ public class WorkOrderBaseController extends BaseController {
                 qw.eq(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dpj.getValue());
                 qw.eq(WorkOrderBase::getCallcode, CurrentUser().getUserName());
                 break;
+            case 10:
+                //已回访列表就是待评价列表
+                qw.gt(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dhf.getValue());
 
         }
 
@@ -492,6 +499,16 @@ public class WorkOrderBaseController extends BaseController {
     public WorkOrderBaseView trans(WorkOrderBase orderBase) {
 
         WorkOrderBaseView ov = JSON.parseObject(JSON.toJSONString(orderBase), WorkOrderBaseView.class);
+        if(orderBase.getWorkorderstate()>EnumOrderStatus.dhf.getValue()){
+            LambdaQueryWrapper<WorkOrderVisitLog> la=new LambdaQueryWrapper<>();
+            la.eq(WorkOrderVisitLog::getWorkordercode,orderBase.getWorkordercode());
+            WorkOrderVisitLog log=  workordervisitlogService.getEntity(la);
+            ov.setVisitName(log!=null?log.getOperatorname():"");
+            ov.setVisitTime(log!=null?log.getCreatetime():null);
+
+        }
+
+
         if(orderBase.getComplaintdept()!=null && orderBase.getComplaintdept()>0){
             DeptView ordertype = deptService.selectDeptNameById(orderBase.getComplaintdept() );
             if(ordertype!=null){
@@ -519,66 +536,13 @@ public class WorkOrderBaseController extends BaseController {
             }
 
         }
-//        switch(orderBase.getFirsttype().toString()) {
-//            case "1000":
-//                ov.setFirsttypename("咨询");
-//                break;
-//            case "2000":
-//                ov.setFirsttypename("建议");
-//                break;
-//            case "3000":
-//                ov.setFirsttypename("投诉");
-//                break;
-//
-//            case "4000":
-//                ov.setFirsttypename("患者转运");
-//                break;
-//            default:
-//                ov.setFirsttypename("");
-//                break;
-//        }
-
-
-
-
-
-        //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6;
-
-        switch(orderBase.getWorkorderstate().toString()){
-            case "1000":
-                ov.setWorkorderstatename("待交办");
-                break;
-            case "2000":
-                ov.setWorkorderstatename("待接单");
-                break;
-            case "3000":
-                ov.setWorkorderstatename("待处理");
-                break;
-
-            case "3100":
-                ov.setWorkorderstatename("待发车");
-                break;
-            case "3200":
-                ov.setWorkorderstatename("已发车");
-                break;
-            case "4000":
-                ov.setWorkorderstatename("待审核");
-                break;
-            case "5000":
-                ov.setWorkorderstatename("待回访");
-                break;
-            case "5100":
-                ov.setWorkorderstatename("待评价");
-                break;
-            case "6000":
-                ov.setWorkorderstatename("已完结");
-                break;
-                default:
-
-                ov.setWorkorderstatename("");
-                break;
+        if(orderBase.getWorkorderstate()>0)
+        {
+            ov.setWorkorderstatename(EnumOrderStatus.getNameByValue(orderBase.getWorkorderstate()));
+        }
+        else {
+            ov.setWorkorderstatename("");
         }
-
         if (!StringHelper.isEmpty(orderBase.getFile())) {
             String captchaEnabled = configService.getConfigValue("FileUrl");
             LambdaQueryWrapper<SysAccessories> qw = new LambdaQueryWrapper<>();
@@ -599,17 +563,17 @@ public class WorkOrderBaseController extends BaseController {
         }
         if(orderBase.getMyd()!=null)
         {
-            if (orderBase.getMyd()==0)
-            {
-                ov.setMydname("不满意");
-            }
-            else  if (orderBase.getMyd()==1)
+            if (orderBase.getMyd()==1)
             {
                 ov.setMydname("满意");
             }
             else  if (orderBase.getMyd()==2)
             {
-                ov.setMydname("非常满意");
+                ov.setMydname("基本满意");
+            }
+            else  if (orderBase.getMyd()==3)
+            {
+                ov.setMydname("不满意");
             }
 
         }
@@ -1078,6 +1042,140 @@ public class WorkOrderBaseController extends BaseController {
     }
 
 
+    @ApiOperation("导出Excel")
+    @Log(title = "导出Excel", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportExcel")
+    @Anonymous
+    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.like(!StringHelper.isEmpty(input.getWorkordercode()), WorkOrderBase::getWorkordercode, input.getWorkordercode());
+
+        qw.eq(input.getRestartsnum() != null && input.getRestartsnum() >= 0, WorkOrderBase::getRestartsnum, input.getRestartsnum());
+
+        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(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());
+
+
+        switch (listType) {
+            //综合查询列表 kfyy 和admin可以看全部工单，其他人只能看见自己创建的或者自己处理的工单
+            case 0:
+
+                break;
+            //（处理人）我的待处理
+            case 1:
+                qw.eq(WorkOrderBase::getDealuser, CurrentUser().getUserName());
+                Set<String> keys = roleService.selectRolePermissionByUserId(CurrentUser().getUserId());
+                if  (keys.contains("bmzg"))
+                {
+                    qw.and(wq->{
+                        wq.inSql(WorkOrderBase::getDealuser, "  select user_name from sys_user where (dept_id in(select dept_id from sys_dept where " +
+                                " ancestors REGEXP CONCAT((select  ancestors from sys_dept where dept_id="+CurrentUser().getDeptId()+"),',',"+CurrentUser().getDeptId()+"))" +
+                                " or dept_id="+CurrentUser().getDeptId()+")") ;
+                    });
+                }
+                else
+                {
+                    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;
+            case 10:
+                //已回访列表就是待评价列表
+                qw.gt(WorkOrderBase::getWorkorderstate, EnumOrderStatus.dhf.getValue());
+
+        }
+
+        var table = workorderbaseService.getList(qw);
+        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.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());
+
+            }
+            if(orderBase.getCreatetime().equals( orderBase.getEndtime() )){
+                orderBase.setDealmethod("立即完结");
+            }else {
+                orderBase.setDealmethod("转办");
+            }
+            if (orderBase.getWorkordercate() !=null && orderBase.getWorkordercate() > 0) {
+                WorkOrderTypeView ordertype = workrodertypeService.selectWorkroderTypeById(orderBase.getWorkordercate() );
+                if(ordertype!=null){
+                    orderBase.setWorkordercatename(ordertype.getAncestorsName());
+                }
+
+            }
+        }
+
+
+
+        List<ExportWorkOrderBaseView>  baseView=  JSON.parseArray(JSON.toJSONString(View),ExportWorkOrderBaseView.class);
+
+
+
+        ExcelHelper<ExportWorkOrderBaseView> excel = new ExcelHelper<>(ExportWorkOrderBaseView.class);
+        excel.exportExcel("xlsx", baseView);
+    }
 
 
     @ApiOperation("逾期数据导出Excel")

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

@@ -2,13 +2,17 @@ package api.controller.order;
 
 import api.entity.database.call.CallLog;
 import api.entity.database.call.Record;
+import api.entity.database.order.WorkOrderBase;
 import api.entity.view.order.WorkOrderVisitLogView;
 import api.service.call.ICallLogService;
 import api.service.call.IRecordService;
+import api.service.order.IWorkOrderBaseService;
 import api.service.system.IConfigService;
 import api.util.annotation.Anonymous;
+import api.util.helper.DateHelper;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import api.controller.BaseController;
@@ -20,12 +24,14 @@ import api.util.annotation.Log;
 import api.util.enums.BusinessType;
 import api.util.helper.StringHelper;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @Api(value = "wo_visitlog",tags = "wo_visitlog")
@@ -38,7 +44,8 @@ public class WorkOrderVisitLogController extends BaseController {
     private ICallLogService calllogService;
     @Autowired
     private IConfigService configService;
-
+    @Autowired
+    private IWorkOrderBaseService workorderbaseService;
     @ApiOperation("列表")
     @Log(title = "查询wo_visitlog列表",businessType = BusinessType.QUERY)
     @GetMapping
@@ -78,12 +85,38 @@ public class WorkOrderVisitLogController extends BaseController {
         return Success("成功", workordervisitlogService.getEntity(id));
     }
 
-    @ApiOperation("新增")
-    @Log(title = "新增wo_visitlog",businessType = BusinessType.INSERT)
+    @ApiOperation("回访操作")
+    @Log(title = "回访操作",businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody WorkOrderVisitLog input) {
+
+//        /** 回访结果*/
+//        @ApiModelProperty("回访结果")
+//        private String visitresult ;
+//
+//        /** 回访时间 */
+//        @ApiModelProperty("回访时间")
+//        private Date visittime ;
+//
+//
+//        /** 回访通话记录 */
+//        @ApiModelProperty("回访通话记录")
+//        private String  callvisitid ;
+
+
+        input.setOperator(CurrentUser().getUserName());
+        input.setOperatorname(CurrentUser().getNickName());
+        input.setCreatetime(DateHelper.getNowDate());
         boolean result = workordervisitlogService.insert(input);
         if (result) {
+            //更新工单表的回访数据
+            LambdaUpdateWrapper<WorkOrderBase> la=new LambdaUpdateWrapper<>();
+            la.eq(WorkOrderBase::getWorkordercode,input.getWorkordercode());
+            la.set( input.getMyd()!=null&& input.getMyd()>0,WorkOrderBase::getMyd,input.getMyd());
+            la.set(!StringHelper.isEmpty(input.getResult()),WorkOrderBase::getVisitresult,input.getResult());
+            la.set(!StringHelper.isEmpty(input.getCallid()),WorkOrderBase::getCallvisitid,input.getCallid());
+            la.set(WorkOrderBase::getVisittime,DateHelper.getNowDate());
+           workorderbaseService.updateBatch(la);
             return Success("成功");
         } else {
             return Error("新增失败");
@@ -132,17 +165,17 @@ public class WorkOrderVisitLogController extends BaseController {
 
         if(log.getMyd()!=null)
         {
-            if (log.getMyd()==0)
-            {
-                ov.setMydname("不满意");
-            }
-            else  if (log.getMyd()==1)
+            if (log.getMyd()==1)
             {
                 ov.setMydname("满意");
             }
             else  if (log.getMyd()==2)
             {
-                ov.setMydname("非常满意");
+                ov.setMydname("基本满意");
+            }
+            else  if (log.getMyd()==3)
+            {
+                ov.setMydname("不满意");
             }
 
         }

hjzx-entity/src/main/java/api/entity/database/order/WorkOrderBase.java

@@ -189,4 +189,16 @@ public class WorkOrderBase {
     /** 详细地址 */
     @ApiModelProperty("详细地址")
     private String address;
+
+    @ApiModelProperty("年龄")
+    private Long age;
+
+    @ApiModelProperty("年龄分组")
+    private String ageGroup;
+
+    @ApiModelProperty("是否需要回访0 不需要 1需要")
+    private Long isNeedVisit;
+
+    @ApiModelProperty("干预建议")
+    private String suggest;
 }

hjzx-entity/src/main/java/api/entity/database/order/WorkOrderVisitLog.java

@@ -21,7 +21,7 @@ public class WorkOrderVisitLog {
     @ApiModelProperty("workordercode")
     private String workordercode;
     /** myd */
-    @ApiModelProperty("myd")
+    @ApiModelProperty("满意度，1,2,3")
     private Long myd;
     /** content */
     @ApiModelProperty("content")
@@ -38,4 +38,7 @@ public class WorkOrderVisitLog {
     /** operatorname */
     @ApiModelProperty("operatorname")
     private String operatorname;
+
+    @ApiModelProperty("result")
+    private String result;
 }

hjzx-entity/src/main/java/api/entity/view/order/ExportWorkOrderBaseView.java

@@ -0,0 +1,67 @@
+package api.entity.view.order;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+@Data
+public class ExportWorkOrderBaseView {
+
+
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    private String workordercode;
+    /** 来电号码 */
+    @ApiModelProperty("来电号码")
+    private String callnum;
+    /** 来电人 */
+    @ApiModelProperty("来电人")
+    private String caller;
+
+
+
+    /** 工单内容 */
+    @ApiModelProperty("问题描述")
+    private String content;
+
+    /** 工单类型 */
+    @ApiModelProperty("工单类型")
+    private String workordercatename;
+
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createtime;
+
+
+    @ApiModelProperty("处理方式")
+    private String dealmethod;
+
+
+    @ApiModelProperty("年龄")
+    private Long age;
+
+    @ApiModelProperty("年龄分组")
+    private String ageGroup;
+
+    @ApiModelProperty("是否需要回访0 不需要 1需要")
+    private Long isNeedVisit;
+
+    @ApiModelProperty("干预建议")
+    private String suggest;
+
+    @ApiModelProperty("所在地区")
+    private  String areaName;
+    /** 详细地址 */
+    @ApiModelProperty("详细地址")
+    private String address;
+
+
+}

hjzx-entity/src/main/java/api/entity/view/order/WorkOrderBaseView.java

@@ -52,4 +52,12 @@ public class WorkOrderBaseView extends WorkOrderBase {
     /** 投诉部门 */
     @ApiModelProperty("投诉部门")
     private String complaintdeptname;
+
+    @ApiModelProperty("回访人")
+    private String visitName;
+
+    @ApiModelProperty("回访时间")
+    private Date visitTime;
+    private  String dealmethod;
+
 }

hjzx-util/src/main/java/api/util/enums/EnumOrderStatus.java

@@ -1,55 +1,72 @@
 package api.util.enums;
 
+import lombok.Getter;
+
 /**
  * 工单状态
  * 
  * @author jiayi
  */
 public enum EnumOrderStatus {
+
+
     /**
      * 待交办
      */
-    xgd(1000L),
+    xgd(1000L,"待交办"),
     /**
      * 待接单
      */
-    djd(2000L),
+    djd(2000L,"待接单"),
     /**
      * 待处理
      */
-    dcl(3000L),
+    dcl(3000L,"待处理"),
     /**
      * 待发车
      */
-    dfc(3100L),
+    dfc(3100L,"待发车"),
     /**
+     /**
      * 已发车
      */
-    yfc(3200L),
+    yfc(3200L,"已发车"),
     /**
      * 待审核
      */
-    dsh(4000L),
+    dsh(4000L,"待审核"),
     /**
      *待回访
      */
-    dhf(5000L),
+    dhf(5000L,"待回访"),
     /**
      *待评价
      */
-    dpj(5100),
+    dpj(5100,"待评价"),
     /**
      *已完结
      */
-    end(6000L);
+    end(6000L,"已完结");
 
     private final Long value;
-
-    EnumOrderStatus(long value)
+    @Getter
+    private final String name;
+    EnumOrderStatus(long value,String name)
     {
         this.value=value;
+        this.name=name;
     }
     public  long getValue(){
         return value;
     }
+
+    public  static  String getNameByValue(Long  value){
+
+        for (EnumOrderStatus enumOrderStatus : EnumOrderStatus.values()) {
+            if (enumOrderStatus.getValue()==value){
+                return enumOrderStatus.getName();
+            }
+        }
+        return "";
+    }
 }

hjzx-util/src/main/java/api/util/helper/ExcelHelper.java

@@ -318,7 +318,8 @@ public class ExcelHelper<T> {
             cellStyle.setBorderLeft(BorderStyle.THIN);
             cellStyle.setBorderRight(BorderStyle.THIN);
             cellStyle.setAlignment(HorizontalAlignment.CENTER);
-
+            cellStyle.setWrapText(true); // 启用自动换行
+          //  cell.setCellStyle(cellStyle);
 
             int limit=60000;
             int rowindex=0;
@@ -350,8 +351,12 @@ public class ExcelHelper<T> {
                         {
                             columnWidth = length;
                         }
+
+
+
                     }
                 }
+                columnWidth = Math.min(columnWidth, 255);
                 sheet.setColumnWidth(columnNum, columnWidth * 256);
             }