调整兔灵erp物流同步回调接口

fs-doctor-app/src/main/java/com/fs/app/controller/FsPrescribeController.java

@@ -7,7 +7,9 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.domain.FsPatient;
 import com.fs.his.domain.FsPrescribe;
@@ -69,7 +71,15 @@ public class FsPrescribeController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsPrescribeParam fsPrescribe)
     {
-
+        //前后端时间参数命名不一致 这里统一处理
+        if (fsPrescribe.getBeginCreateTime()!=null&&fsPrescribe.getEndCreateTime()!=null){
+            fsPrescribe.setSTime(fsPrescribe.getBeginCreateTime());
+            fsPrescribe.setETime(fsPrescribe.getEndCreateTime());
+        }
+        if (fsPrescribe.getBeginAuditTime()!=null&&fsPrescribe.getEndAuditTime()!=null){
+            fsPrescribe.setAuditSTime(fsPrescribe.getBeginAuditTime());
+            fsPrescribe.setAuditETime(fsPrescribe.getEndAuditTime());
+        }
         startPage();
         List<FsPrescribeListVO> list = fsPrescribeService.selectFsPrescribeListVOWithConfirm(fsPrescribe);
         for (FsPrescribeListVO vo : list){

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

@@ -129,6 +129,18 @@ public class FsPrescribeParam {
 
     private String orderCode;
 
+    //创建开始时间
+    private Date beginCreateTime;
+
+    //创建结束时间
+    private Date endCreateTime;
+
+    //审核开始时间
+    private Date beginAuditTime;
+
+    //审核结束时间
+    private Date endAuditTime;
+
     private Long companyId;
 
     private Long companyUserId;