bug fix

logs/exams.log

@@ -0,0 +1 @@
+{"time":"2021-03-24 14:45:13","count":1}

src/dao_new/Exams.js

@@ -2,8 +2,8 @@
  * @Author: fuyu
  * @Date: 2021-03-22 19:10:00
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-23 14:10:04
- * @FilePath: /202103/code/sql_merge/src/dao_new/Exams.js
+ * @LastEditTime: 2021-03-24 14:39:04
+ * @FilePath: /sql_merge/src/dao_new/Exams.js
  */
 
 const Sequelize = require('sequelize');
@@ -59,7 +59,7 @@ const Exams = sequelize.define('exams', {
   delivery_doctor: {type: Sequelize.STRING(255), allowNull: true, defaultValue: null}, // delivery_doctor, 送诊医生
   push_api: {type: Sequelize.STRING(255),  allowNull: true, defaultValue: null}, // push_api, 0 推送失败  1推送成功
   api_message: {type: Sequelize.STRING(500),  allowNull: true, defaultValue: null}, // api_message 失败返回信息
-  flag: {type: Sequelize.INTEGER(11),  allowNull: false, defaultValue: 1}, // flag 标识
+  flag: {type: Sequelize.INTEGER(11),  allowNull: false, defaultValue: 0}, // flag 标识
 }, {
   freezeTableName: true,
   charset: 'utf8',

src/dao_old/Exams.js

@@ -2,8 +2,8 @@
  * @Author: fuyu
  * @Date: 2021-03-22 19:10:00
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-23 14:10:12
- * @FilePath: /202103/code/sql_merge/src/dao_old/Exams.js
+ * @LastEditTime: 2021-03-24 14:38:49
+ * @FilePath: /sql_merge/src/dao_old/Exams.js
  */
 
 const Sequelize = require('sequelize');
@@ -59,7 +59,7 @@ const Exams = sequelize.define('exams', {
   delivery_doctor: {type: Sequelize.STRING(255), allowNull: true, defaultValue: null}, // delivery_doctor, 送诊医生
   push_api: {type: Sequelize.STRING(255),  allowNull: true, defaultValue: null}, // push_api, 0 推送失败  1推送成功
   api_message: {type: Sequelize.STRING(500),  allowNull: true, defaultValue: null}, // api_message 失败返回信息
-  flag: {type: Sequelize.INTEGER(11),  allowNull: false, defaultValue: 1}, // flag 标识
+  flag: {type: Sequelize.INTEGER(11),  allowNull: false, defaultValue: 0}, // flag 标识
 }, {
   freezeTableName: true,
   charset: 'utf8',

src/service/move.js

@@ -2,11 +2,12 @@
  * @Author: fuyu
  * @Date: 2021-03-23 12:00:09
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-23 19:02:50
- * @FilePath: /202103/code/sql_merge/src/service/move.js
+ * @LastEditTime: 2021-03-24 14:48:50
+ * @FilePath: /sql_merge/src/service/move.js
  */
 
-import {limit} from '../../config'
+import config from '../../config'
+const limit = config['limit']
 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'
@@ -24,12 +25,13 @@ const moveSingle = async institution_id => {
     sum += count
   }
   logSum(institution_id, sum)
-  return
 }
 
 const moveExams = async (institution_id) => {
   // offset: 5, limit: 5
+  console.log('limit',limit)
   let exmas = await OldExams.findAll({where: {institution_id, flag: 0}, limit})
+
   for(let i = 0; i < exmas.length; i++) {
     await moveExam(exmas[i])
   }
@@ -50,7 +52,7 @@ const fixExam = async(exam) => {
   // 同步登记
   await fixRegisters(exam.id)
   // 更新检查标识
-  return await updateExamFlag(exam)
+  await updateExamFlag(exam)
 }
 
 const fixCommon = async (NewClass, OldClass, where, cb) => {
@@ -141,8 +143,9 @@ const fixSerieChild = async serie => {
 }
 
 const updateExamFlag = async exam => {
-  exam.flag = 1;
-  await exam.save()
+  const old = await OldExams.findOne({where: {id: exam.id}})
+  old.flag = 1;
+  await old.save()
   const newExam = await NewExams.findOne({where: {id: exam.id}})
   newExam.flag = 1;
   await newExam.save()