feat:修正错误

family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/OrderListReqDTO.java

@@ -35,7 +35,6 @@ public class OrderListReqDTO extends PageDTO {
     @ApiModelProperty("结束时间")
     private String endTime;
 
-    @NotNull(message = "订单类型不能为空")
     @ApiModelProperty("订单类型 1-签约订单 2-值班医生问诊订单")
-    private String singStatus;
+    private Integer singStatus = 1;
 }

family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/vo/OrderListResVo.java

 package com.ebaiyihui.family.doctor.common.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,9 +17,11 @@ public class OrderListResVo {
     private String admId;
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     @ApiModelProperty("平台code")
@@ -70,6 +73,7 @@ public class OrderListResVo {
     private String packageOrderId;
 
     @ApiModelProperty("签名结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date signEndTime;
 
     @ApiModelProperty("签约关联id")

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/OrderManagementServiceImpl.java

@@ -137,7 +137,7 @@ public class OrderManagementServiceImpl implements OrderManagementService {
         orderInfo.setPatientName(patient.getPatientName());
         orderInfo.setPatientAge(IDCardUtil.getAge(patient.getCredNo()));
         orderInfo.setDoctorPhone(doctorInfo.getData().getPhoneNum());
-        orderInfo.setDoctorPhone(patientSignEntity.getDoctorName());
+        orderInfo.setDoctorName(patientSignEntity.getDoctorName());
         orderInfo.setDoctorTitle(doctorInfo.getData().getTitle());
         orderInfo.setHospital(patientSignEntity.getOrganName());
         orderInfo.setFirstDepartment(patientSignEntity.getDeptName());

family-doctor-server/src/main/resources/mapper/PatientSignMapper.xml

@@ -7,13 +7,23 @@
         patient_phone, cred_no, doctor_id, doctor_name,dept_id, dept_name, sign_status, sub_status,
         status, package_order_id, sign_end_time, sign_id,clinic_code
     </sql>
-    <select id="countSumOrder" resultType="com.ebaiyihui.family.doctor.common.vo.QueryOrderTotalVo">
+    <select id="countSumOrder" parameterType="com.ebaiyihui.family.doctor.common.dto.OrderListReqDTO"
+            resultType="com.ebaiyihui.family.doctor.common.vo.QueryOrderTotalVo">
         SELECT
             COUNT(*) AS sumOrder,
             SUM(CASE WHEN status = 2 THEN 1 ELSE 0 END) AS sumProcessing,
             SUM(CASE WHEN status = 3 THEN 1 ELSE 0 END) AS sumCompleted
         FROM
-            patient_sign;
+            patient_sign
+        where 1 = 1
+        <if test="singStatus!=null and singStatus!=''">
+            <if test="singStatus == 1">
+                and sign_status = 1 or sign_status = 2
+            </if>
+            <if test="singStatus == 2">
+                and sign_status = 3
+            </if>
+        </if>
     </select>
 
     <select id="orderList" parameterType="com.ebaiyihui.family.doctor.common.dto.OrderListReqDTO"
@@ -52,7 +62,7 @@
                 and sign_status = 3
             </if>
         </if>
-        order by create_time asc
+        order by create_time desc
         LIMIT #{pageNum}, #{pageSize}
     </select>