order

src/dao_new/Exams.js

@@ -64,7 +64,8 @@ const Exams = sequelize.define('exams', {
   freezeTableName: true,
   charset: 'utf8',
   indexes:[
-    {fields : ['institution_id', 'flag']}
+    {fields : ['institution_id', 'flag']},
+    {fields : ['createdAt']}
   ],
 });
 Exams.sync({ force: false }).then(function() {});

src/dao_old/Exams.js

@@ -2,7 +2,7 @@
  * @Author: fuyu
  * @Date: 2021-03-22 19:10:00
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-25 11:52:46
+ * @LastEditTime: 2021-03-25 13:05:31
  * @FilePath: /202103/code/sql_merge/src/dao_old/Exams.js
  */
 
@@ -64,7 +64,8 @@ const Exams = sequelize.define('exams', {
   freezeTableName: true,
   charset: 'utf8',
   indexes:[
-    {fields : ['institution_id', 'flag']}
+    {fields : ['institution_id', 'flag']},
+    {fields : ['createdAt']}
   ],
 });
 Exams.sync({ force: false }).then(function() {});

src/service/move.js

@@ -2,8 +2,8 @@
  * @Author: fuyu
  * @Date: 2021-03-23 12:00:09
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-25 10:40:59
- * @FilePath: /sql_merge/src/service/move.js
+ * @LastEditTime: 2021-03-25 13:07:43
+ * @FilePath: /202103/code/sql_merge/src/service/move.js
  */
 
 import config from '../../config'
@@ -11,7 +11,7 @@ const limit = config['limit']
 const FLAG_DELAULT = 0
 const FLAG_REPORT = 1
 const FLAG_PACS = 2
-
+const order = [['createdAt', 'DESC']]
 import {logSum, logSingle} from './log'
 import {RemoteApplication as OldRemoteApplication, ApplicationProgressLog as OldApplicationProgressLog, Bbs as OldBbs, RemoteOrder as OldRemoteOrder, RemoteWater as OldRemoteWater, Register as OldRegister, Exams as OldExams, PatientInfos as OldPatientInfos, Studies as OldStudies, Series as OldSeries, Images as OldImages, Report as OldReport, ReportRecord as OldReportRecord, QualityControl as OldQualityControl, QualityCause as OldQualityCause} from '../dao_old'
 import {Institution,  RemoteApplication as NewRemoteApplication, ApplicationProgressLog as NewApplicationProgressLog, Bbs as NewBbs, RemoteOrder as NewRemoteOrder, RemoteWater as NewRemoteWater, Register as NewRegister, Exams as NewExams, PatientInfos as NewPatientInfos, Studies as NewStudies, Series as NewSeries, Images as NewImages, Report as NewReport, ReportRecord as NewReportRecord, QualityControl as NewQualityControl, QualityCause as NewQualityCause} from '../dao_new'
@@ -40,7 +40,7 @@ const moveSinglePacs = async institution_id => {
 }
 
 const moveExamsPacs = async (institution_id) => {
-  let exmas = await OldExams.findAll({where: {institution_id, flag: FLAG_REPORT}, limit})
+  let exmas = await OldExams.findAll({where: {institution_id, flag: FLAG_REPORT}, limit, order})
   for(let i = 0; i < exmas.length; i++) {
     await moveExamPacs(exmas[i])
   }
@@ -62,7 +62,7 @@ const moveSingle = async institution_id => {
 }
 
 const moveExams = async (institution_id) => {
-  let exmas = await OldExams.findAll({where: {institution_id, flag: FLAG_DELAULT}, limit})
+  let exmas = await OldExams.findAll({where: {institution_id, flag: FLAG_DELAULT}, limit, order})
   for(let i = 0; i < exmas.length; i++) {
     await moveExam(exmas[i])
   }