新增科室名称字段

ae2594b7 · sdif · c2148f25 · ae2594b7 · ae2594b7 · ae2594b7
Commit ae2594b7 authored Oct 25, 2023 by sdif
12 changed files
--- a/pz-system/src/main/java/com/pz/system/domain/DbghOrder.java
+++ b/pz-system/src/main/java/com/pz/system/domain/DbghOrder.java
@@ -47,6 +47,10 @@ public class DbghOrder extends BaseEntity {
     */
    private Integer did;
    /**
+     * 科室名称
+     */
+    private String didName;
+    /**
     * 当前状态
     */
    private Integer status;

--- a/pz-system/src/main/java/com/pz/system/domain/DbwzOrder.java
+++ b/pz-system/src/main/java/com/pz/system/domain/DbwzOrder.java
@@ -43,6 +43,10 @@ public class DbwzOrder extends BaseEntity {
     */
    private Integer did;
    /**
+     * 科室名称
+     */
+    private String didName;
+    /**
     * 主诉
     */
    private String chiefComplaint;

--- a/pz-system/src/main/java/com/pz/system/domain/YypzOrder.java
+++ b/pz-system/src/main/java/com/pz/system/domain/YypzOrder.java
@@ -43,6 +43,10 @@ public class YypzOrder extends BaseEntity {
     */
    private Integer did;
    /**
+     * 科室名称
+     */
+    private String didName;
+    /**
     * 就诊时间
     */
    private Date visitTime;

--- a/pz-system/src/main/java/com/pz/system/domain/ZqghOrder.java
+++ b/pz-system/src/main/java/com/pz/system/domain/ZqghOrder.java
@@ -39,6 +39,10 @@ public class ZqghOrder extends BaseEntity {
     */
    private Integer did;
    /**
+     * 科室名称
+     */
+    private String didName;
+    /**
     * 医生
     */
    private Integer doctorId;

--- a/pz-system/src/main/java/com/pz/system/domain/ZyphOrder.java
+++ b/pz-system/src/main/java/com/pz/system/domain/ZyphOrder.java
@@ -39,6 +39,10 @@ public class ZyphOrder extends BaseEntity {
     */
    private Integer did;
    /**
+     * 科室名称
+     */
+    private String didName;
+    /**
     * 就诊人员
     */
    private Integer visitor;

--- a/pz-system/src/main/java/com/pz/system/domain/bo/CreateOrderBo.java
+++ b/pz-system/src/main/java/com/pz/system/domain/bo/CreateOrderBo.java
@@ -206,4 +206,9 @@ public class CreateOrderBo extends BaseEntity {
     * 城市id
     */
    private Integer cityId;
+    /**
+     * 科室名称
+     */
+    private String didName;
 }
--- a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
@@ -176,9 +176,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            Optional.ofNullable(userVsitorMapper.selectById(yypzOrder.getVisitor()))
                .map(UserVsitor::getName)
                .ifPresent(totalOrderVo::setVisitor);
-            Optional.ofNullable(departmentMapper.selectById(yypzOrder.getDid()))
+            /*Optional.ofNullable(departmentMapper.selectById(yypzOrder.getDid()))
                .map(Department::getTitle)
-                .ifPresent(totalOrderVo::setDepartment);
+                .ifPresent(totalOrderVo::setDepartment);*/
            // totalOrderVo.setHospital(hospitalMapper.selectById(yypzOrder.getHid()).getName());
            // totalOrderVo.setVisitor(userVsitorMapper.selectById(yypzOrder.getVisitor()).getName());
            // totalOrderVo.setDepartment(departmentMapper.selectById(yypzOrder.getDid()).getTitle());
@@ -187,6 +187,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            totalOrderVo.setOverTime(yypzOrder.getOverTime());
            totalOrderVo.setVoucher(yypzOrder.getVoucher());
            totalOrderVo.setPzRemark(yypzOrder.getRemark());
+            totalOrderVo.setDepartment(yypzOrder.getDidName());
        } else if (totalOrderVo.getBusinessId() == 2) {// 代办挂号
@@ -202,9 +203,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            Optional.ofNullable(userVsitorMapper.selectById(dbghOrder.getVisitor()))
                .map(UserVsitor::getName)
                .ifPresent(totalOrderVo::setVisitor);
-            Optional.ofNullable(departmentMapper.selectById(dbghOrder.getDid()))
+            /*Optional.ofNullable(departmentMapper.selectById(dbghOrder.getDid()))
                .map(Department::getTitle)
-                .ifPresent(totalOrderVo::setDepartment);
+                .ifPresent(totalOrderVo::setDepartment);*/
            /*totalOrderVo.setHospital(hospitalMapper.selectById(dbghOrder.getHid()).getName());
            totalOrderVo.setDepartment(departmentMapper.selectById(dbghOrder.getDid()).getTitle());
            totalOrderVo.setVisitor(userVsitorMapper.selectById(dbghOrder.getVisitor()).getName());*/
@@ -212,6 +213,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            totalOrderVo.setOverTime(dbghOrder.getOverTime());
            totalOrderVo.setVoucher(dbghOrder.getVoucher());
            totalOrderVo.setPzRemark(dbghOrder.getRemark());
+            totalOrderVo.setDepartment(dbghOrder.getDidName());
        } else if (totalOrderVo.getBusinessId() == 3) {// 代办问诊
@@ -227,9 +229,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            Optional.ofNullable(userVsitorMapper.selectById(dbwzOrder.getVisitor()))
                .map(UserVsitor::getName)
                .ifPresent(totalOrderVo::setVisitor);
-            Optional.ofNullable(departmentMapper.selectById(dbwzOrder.getDid()))
+            /*Optional.ofNullable(departmentMapper.selectById(dbwzOrder.getDid()))
                .map(Department::getTitle)
-                .ifPresent(totalOrderVo::setDepartment);
+                .ifPresent(totalOrderVo::setDepartment);*/
           /* totalOrderVo.setProject(servicesMapper.selectVoById(totalOrderVo.getServiceId()).getName());
            totalOrderVo.setDepartment(departmentMapper.selectById(dbwzOrder.getDid()).getTitle());
            totalOrderVo.setVisitor(userVsitorMapper.selectById(dbwzOrder.getVisitor()).getName());*/
@@ -245,6 +247,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            totalOrderVo.setVoucher(dbwzOrder.getVoucher());
            totalOrderVo.setPzRemark(dbwzOrder.getRemark());
            totalOrderVo.setIndications(dbwzOrder.getIndications());
+            totalOrderVo.setDepartment(dbwzOrder.getDidName());
        } else if (totalOrderVo.getBusinessId() == 4) {// 住院陪护
@@ -259,9 +262,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            Optional.ofNullable(userVsitorMapper.selectById(zyphOrder.getVisitor()))
                .map(UserVsitor::getName)
                .ifPresent(totalOrderVo::setVisitor);
-            Optional.ofNullable(departmentMapper.selectById(zyphOrder.getDid()))
+            /*Optional.ofNullable(departmentMapper.selectById(zyphOrder.getDid()))
                .map(Department::getTitle)
-                .ifPresent(totalOrderVo::setDepartment);
+                .ifPresent(totalOrderVo::setDepartment);*/
            /*totalOrderVo.setHospital(hospitalMapper.selectById(zyphOrder.getHid()).getName());
            totalOrderVo.setVisitor(userVsitorMapper.selectById(zyphOrder.getVisitor()).getName());
            totalOrderVo.setDepartment(departmentMapper.selectById(zyphOrder.getDid()).getTitle());*/
@@ -270,6 +273,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            totalOrderVo.setOverTime(zyphOrder.getOverTime());
            totalOrderVo.setVoucher(zyphOrder.getVoucher());
            totalOrderVo.setPzRemark(zyphOrder.getRemark());
+            totalOrderVo.setDepartment(zyphOrder.getDidName());
        } else if (totalOrderVo.getBusinessId() == 5) {// 代办买药
@@ -304,9 +308,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            /*Optional.ofNullable(userVsitorMapper.selectById(zqghOrder.getVisitor()))
                .map(UserVsitor::getName)
                .ifPresent(totalOrderVo::setVisitor);*/
-            Optional.ofNullable(departmentMapper.selectById(zqghOrder.getDid()))
+            /*Optional.ofNullable(departmentMapper.selectById(zqghOrder.getDid()))
                .map(Department::getTitle)
-                .ifPresent(totalOrderVo::setDepartment);
+                .ifPresent(totalOrderVo::setDepartment);*/
            Optional.ofNullable(doctorMapper.selectById(zqghOrder.getDoctorId()))
                .map(Doctor::getName)
                .ifPresent(totalOrderVo::setDoctor);
@@ -318,6 +322,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
            totalOrderVo.setOverTime(zqghOrder.getOverTime());
            totalOrderVo.setVoucher(zqghOrder.getVoucher());
            totalOrderVo.setPzRemark(zqghOrder.getRemark());
+            totalOrderVo.setDepartment(zqghOrder.getDidName());
        } else if (totalOrderVo.getBusinessId() == 0) {// 商城订单
@@ -508,6 +513,10 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
        totalOrderVo.setOrderSn(totalOrder.getId() + "");
        totalOrderVo.setPayMoney(bo.getPayMoney());
+        if(null != bo.getDepartmentId() && bo.getDepartmentId() != 0){
+            bo.setDidName(departmentMapper.selectById(bo.getDepartmentId()).getTitle());
+        }
        // 计算订单过期时间（当前时间加上30分钟）
        long expirationTime = System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(30);
        // 未付款的订单延迟24小时自动取消

--- a/pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml
+++ b/pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml
@@ -84,7 +84,7 @@
               CONVERT(services.price, decimal(10, 2)) as commission,
               user_vsitor.name                        as userName,
               hospital.name                           as hospital,
-               department.title                        as department,
+               dbgh_order.did_name                        as department,
               dbgh_order.visit_time,
               total_order.remark                      as description,
               dbgh_order.remark,

--- a/pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
+++ b/pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
@@ -86,7 +86,7 @@
               CONVERT(services.price, decimal (10, 2)) as commission,
               user_vsitor.name                         as userName,
               dbwz_order.visit_time,
-               department.title                         as department,
+               dbwz_order.did_name                         as department,
               dbwz_order.chief_complaint,
               dbwz_order.history_of_present_illness,
               dbwz_order.past_history,

--- a/pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml
+++ b/pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               CONVERT(services.price, decimal(10, 2)) as commission,
               user_vsitor.name                        as userName,
               hospital.name                           as hospital,
-               department.title                        as department,
+               yypz_order.did_name                        as department,
               yypz_order.remark,
               total_order.uid                         as userId,
               employees.uid                           as euserId

--- a/pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml
+++ b/pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml
@@ -72,7 +72,7 @@
               total_order.status             as orderStatus,
               zqgh_order.status              as serviceStatus,
               hospital.name                  as hospital,
-               department.title               as department,
+               zqgh_order.did_name               as department,
               zqgh_order.time_of_appointment as visitTime,
               total_order.uid                         as userId,
               doctor.name                    as doctor

--- a/pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml
+++ b/pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml
@@ -90,7 +90,7 @@
               CONVERT(services.price, decimal(10, 2))                   as commission,
               user_vsitor.name                                          as userName,
               hospital.name                                             as hospital,
-               department.title                                          as department,
+               zyph_order.did_name                                          as department,
               total_order.remark                                        as description,
               zyph_order.remark,
               concat(zyph_order.start_day, ' ~ ', zyph_order.end_day)   as visitDate,