Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/OrderDetailsWapper.java

@@ -1,5 +1,6 @@
 package com.diagbot.entity.wrapper;
 
+import com.diagbot.util.DateUtil;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -64,4 +65,12 @@ public class OrderDetailsWapper {
     private Long orgId;//机构ID
 
     private String orgName;//机构名称
+
+    public String getStartTime() {
+        return DateUtil.formatDate(startTime);
+    }
+
+    public String getEndTime() {
+        return DateUtil.formatDate(endTime);
+    }
 }

diagbotman-service/src/main/resources/mapper/LantoneProductMapper.xml

@@ -44,7 +44,7 @@
     </resultMap>
 
     <select id="productLines" resultType="com.diagbot.dto.ProductLineDTO">
-        SELECT * FROM `diag_lantone_product` WHERE is_deleted = 'N'
+        SELECT * FROM `diag_lantone_product` WHERE is_deleted = 'N' AND  service_status = 1
     </select>
 
     <!--根据产品名称分页查询-->