Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/his/mapper/FsInquiryOrderReportMapper.java

@@ -102,19 +102,25 @@ public interface FsInquiryOrderReportMapper
 
     @Select("select ior.*,u.nick_name,u.phone,d.doctor_name,su.nick_name user_name,send.nick_name send_name,fio.status inquiry_status,fio. inquiry_sub_type,fio.company_user_remark FROM fs_inquiry_order_report ior  LEFT JOIN fs_user u ON u.user_id=ior.user_id LEFT JOIN fs_doctor d ON d.doctor_id=ior.doctor_id LEFT JOIN sys_user su ON su.user_id=ior.audit_user_id LEFT JOIN fs_inquiry_order fio ON fio.order_id=ior.order_id LEFT JOIN fs_user_coupon fuc ON fuc.business_type =1 AND fuc.business_id=ior.order_id LEFT JOIN sys_user send ON send.user_id=fuc.send_user_id  where ior.report_id=#{reportId}")
     FsInquiryOrderReportVO selectFsInquiryOrderReportByReportIdVO(Long reportId);
+
     @Select("select report_id FROM fs_inquiry_order_report WHERE order_id=#{id}")
     Integer selectFsInquiryOrderReportIdByOrderId(Long id);
+
     @Select("select * FROM fs_inquiry_order_report   where order_id=#{orderId}")
     FsInquiryOrderReport selectFsInquiryOrderReportByOrderId(Long orderId);
+
     @Select("select o.*,d.dept_id FROM fs_inquiry_order_report o  LEFT JOIN fs_doctor d ON d.doctor_id=o.doctor_id   where o.order_id=#{orderId}")
     FsInquiryOrderReportUVO selectFsInquiryOrderReportUVOByOrderId(Long orderId);
+
     @Select("select item_type_json FROM fs_test_temp WHERE temp_code ='C1694077002122'")
     String selectFsTestBody();
 
     @Select("select * from fs_inquiry_order_report where patient_json LIKE '%https://htj-1258038825.cos.ap-beijing.myqcloud.com%' order by report_id desc limit 2 ")
     List<FsInquiryOrderReport> selectFsInquiryOrderReportListByUpdate();
+
     @Select("select ior.*,u.nick_name,u.phone,d.doctor_name,su.nick_name user_name,send.nick_name send_name,fio.status inquiry_status,fio. inquiry_sub_type,fio.company_user_remark FROM fs_inquiry_order_report ior  LEFT JOIN fs_user u ON u.user_id=ior.user_id LEFT JOIN fs_doctor d ON d.doctor_id=ior.doctor_id LEFT JOIN sys_user su ON su.user_id=ior.audit_user_id LEFT JOIN fs_inquiry_order fio ON fio.order_id=ior.order_id LEFT JOIN fs_user_coupon fuc ON fuc.business_type =1 AND fuc.business_id=ior.order_id LEFT JOIN sys_user send ON send.user_id=fuc.send_user_id  where ior.order_id=#{orderId} limit 1")
     FsInquiryOrderReportVO selectFsInquiryOrderReportByOrderIdVO(Long orderId);
+
     @Select({"<script> " +
             "select count(1) FROM fs_inquiry_order_report ior  " +
             " LEFT JOIN fs_user u ON u.user_id=ior.user_id " +

fs-service/src/main/java/com/fs/his/param/FsInquiryOrderCreateParam.java

@@ -18,6 +18,8 @@ public class FsInquiryOrderCreateParam implements Serializable {
 
     @NotEmpty(message = "病情描述不能为空")
     private String title;
+
+    private String companyUserRemark;
 //    @NotEmpty(message = "患病时长不能为空")
     private String duration;
 //    @NotEmpty(message = "是否就诊不能为空")
@@ -25,9 +27,12 @@ public class FsInquiryOrderCreateParam implements Serializable {
 
     @NotNull(message = "问诊类型不能为空")
     private Integer inquiryType;
+
     private Integer inquirySubType;
+
     @NotNull(message = "订单类型不能为空")
     private Integer orderType;
+
     private Long doctorId;
     private String reportImages;//检测报告
     private String tongueImages;//舌苔

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java

@@ -532,7 +532,6 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         fsInquiryOrderLogsService.insertFsInquiryOrderLogs(log);
         return R.ok("操作成功");
     }
-
     @Override
     @Transactional
     public R createOrder(FsInquiryOrderCreateParam param) {
@@ -593,6 +592,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         order.setUserId(param.getUserId());
         order.setPatientId(patient.getPatientId());
         order.setInquirySubType(param.getInquirySubType());
+        order.setCompanyUserRemark(param.getCompanyUserRemark());
         if (param.getSource()!=null){
             order.setSource(param.getSource());
         }

fs-service/src/main/java/com/fs/sop/domain/SopUserLogsInfo.java

@@ -73,6 +73,14 @@ public class SopUserLogsInfo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String inComingETime;
 
+    /**
+     * 营期时间
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String startTime;
+
+
     @TableField(exist = false)
     private Integer level;
 

fs-service/src/main/java/com/fs/sop/mapper/SopUserLogsMapper.java

@@ -109,7 +109,7 @@ public interface SopUserLogsMapper {
 
     @DataSource(DataSourceType.SOP)
     @Select("<script>" +
-            "select li.sop_id,li.external_contact_id,li.qw_user_id,li.corp_id,li.external_id,li.external_user_name " +
+            "select li.sop_id,li.external_contact_id,li.qw_user_id,li.corp_id,li.external_id,li.external_user_name,li.fs_user_id,ul.start_time,li.is_days_not_study " +
             "from sop_user_logs ul  " +
             "left join  sop_user_logs_info li on ul.id=li.user_logs_id " +
             "        WHERE ul.id IN\n" +

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -805,7 +805,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                             break;
                         //小程序单独
                         case "4":
-                            addWatchLogIfNeeded(param.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), qwUserId, companyUserId, companyId, item.getExternalId(),param.getStartTime(),createTime );
+                            addWatchLogIfNeeded(item.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), qwUserId, companyUserId, companyId, item.getExternalId(),item.getStartTime(),createTime );
 
                             String linkByMiniApp = createLinkByMiniApp(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(),
                                     qwUserId, companyUserId, companyId, item.getExternalId(), config);
@@ -821,7 +821,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                             break;
                         //app
                         case "9":
-                            addWatchLogIfNeeded(param.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), qwUserId, companyUserId, companyId, item.getExternalId(),param.getStartTime(),createTime );
+                            addWatchLogIfNeeded(item.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), qwUserId, companyUserId, companyId, item.getExternalId(),item.getStartTime(),createTime );
 
                             QwCreateLinkByAppVO linkByApp = createLinkByApp(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(),
                                     qwUserId, companyUserId, companyId, item.getExternalId(), config,qwUser.getQwUserName(),contact.getFsUserId());
@@ -1144,8 +1144,8 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                 //小程序单独
                 case "4":
 
-                    addWatchLogIfNeeded(param.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), String.valueOf(qwUser.getId()), companyUserId, companyId,
-                            item.getExternalId(),param.getStartTime(),dataTime );
+                    addWatchLogIfNeeded(item.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), String.valueOf(qwUser.getId()), companyUserId, companyId,
+                            item.getExternalId(),item.getStartTime(),dataTime );
 
                     String linkByMiniApp = createLinkByMiniApp(st, param.getCorpId(), dataTime, param.getCourseId(), param.getVideoId(),
                             String.valueOf(qwUser.getId()), companyUserId, companyId, item.getExternalId(), config);