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

pz-admin/src/main/java/com/pz/web/task/InsertTestOrderTask.java

@@ -72,21 +72,23 @@ public class InsertTestOrderTask {
 
     private final FalseDataMapper falseDataMapper;
 
+    private final DepartmentMapper departmentMapper;
+
     public static List<Integer> businessIds = Arrays.asList(1, 2, 3, 4, 5, 6);
 
     public static Map<Integer, Integer> orderNumMap = new HashMap<>();
 
     static {
-        //上海
-        orderNumMap.put(5, 53);
+//        //上海
+//        orderNumMap.put(5, 53);
         //北京
         orderNumMap.put(15, 50);
-        //杭州
-        orderNumMap.put(14, 48);
+//        //杭州
+//        orderNumMap.put(14, 48);
         //合肥
         orderNumMap.put(17, 32);
-        //长沙
-        orderNumMap.put(18, 38);
+//        //长沙
+//        orderNumMap.put(18, 38);
         //贵阳
         orderNumMap.put(19, 25);
         //西安
@@ -117,7 +119,7 @@ public class InsertTestOrderTask {
         List<Company> companies = companyMapper.selectList();
         for (Company company : companies) {
             FalseData falseData2 = falseDataMapper.selectOne(new LambdaQueryWrapper<FalseData>().eq(FalseData::getCompanyId, company.getId()));
-            if(null == falseData2){
+            if (null == falseData2) {
                 continue;
             }
             falseData2.setId(1L);
@@ -153,12 +155,17 @@ public class InsertTestOrderTask {
                     List<Services> services = servicesMapper.selectList(Wrappers.<Services>lambdaQuery().eq(Services::getBid, businessId).eq(Services::getCityId, company.getCityId()));
                     //随机服务
                     Services service = getRandomElement(services);
+
+
                     Long orderId = saveTotalOrder(businessId, element.getId(), company.getCityId().intValue(), company.getId(), service);
                     List<Hospital> hospitals = hospitalMapper.selectList(Wrappers.<Hospital>lambdaQuery().eq(Hospital::getCityId, company.getCityId()).last("limit 50"));
                     //随机医院
                     Hospital hospital = getRandomElement(hospitals);
+                    //随机科室
+                    List<Department> departments = departmentMapper.selectList();
+                    Department randomElement = getRandomElement(departments);
                     //新增业务
-                    randomOrder(businessId, orderId.intValue(), 2, hospital.getId(), vsitor.getId(), element);
+                    randomOrder(businessId, orderId.intValue(), 2, hospital.getId(), vsitor.getId(), element, randomElement.getTitle());
                 }
             });
         }
@@ -166,7 +173,7 @@ public class InsertTestOrderTask {
         executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
     }
 
-    public void randomOrder(Integer businessId, Integer orderId, Integer status, Integer hid, Integer vid, Employees element) {
+    public void randomOrder(Integer businessId, Integer orderId, Integer status, Integer hid, Integer vid, Employees element, String title) {
         Date dateStr = randomTime();
         Date date = subtractMinutes(dateStr, 31);
         switch (businessId) {
@@ -190,6 +197,7 @@ public class InsertTestOrderTask {
                 yypzOrder.setStatus(status);
                 yypzOrder.setVisitTime(dateStr);
                 yypzOrder.setHid(hid);
+                yypzOrder.setDidName(title);
                 yypzOrder.setVisitor(vid);
                 yypzOrder.setCreateTime(date);
                 yypzOrderMapper.insert(yypzOrder);
@@ -202,6 +210,7 @@ public class InsertTestOrderTask {
                 dbghOrder.setVisitTime(dateStr);
                 dbghOrder.setVisitor(vid);
                 dbghOrder.setCreateTime(date);
+                dbghOrder.setDidName(title);
                 dbghOrderMapper.insert(dbghOrder);
                 break;
             case 3:
@@ -216,6 +225,7 @@ public class InsertTestOrderTask {
                 dbwzOrder.setPostTreatmentCondition("电话沟通");
                 dbwzOrder.setRelatedReports("电话沟通");
                 dbwzOrder.setServiceRequirements("电话沟通");
+                dbwzOrder.setDidName("电话沟通");
                 dbwzOrder.setVisitor(vid);
                 dbwzOrder.setCreateTime(date);
                 dbwzOrderMapper.insert(dbwzOrder);
@@ -232,6 +242,7 @@ public class InsertTestOrderTask {
                 zyphOrder.setStartDay(formattedDate);
                 zyphOrder.setEndDay(format);
                 zyphOrder.setOverTime(dateStr);
+                zyphOrder.setDidName(title);
                 zyphOrder.setCreateTime(date);
                 zyphOrderMapper.insert(zyphOrder);
                 break;
@@ -253,6 +264,7 @@ public class InsertTestOrderTask {
                 zqghOrder.setHid(hid);
                 zqghOrder.setStatus(status);
                 zqghOrder.setOverTime(dateStr);
+                zqghOrder.setDidName(title);
                 zqghOrder.setDoctorId(1);
                 zqghOrder.setCreateTime(date);
                 zqghOrderMapper.insert(zqghOrder);
@@ -269,7 +281,6 @@ public class InsertTestOrderTask {
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
         calendar.set(Calendar.MILLISECOND, 0);
-
         long startMillis = calendar.getTimeInMillis(); // 获取开始时间的毫秒数
 
         calendar.set(Calendar.HOUR_OF_DAY, 18); // 设置结束时间为晚上6点