浏览代码

sql-merge

fuyu 4 年之前
父节点
当前提交
72bfb2b94b
共有 4 个文件被更改,包括 45 次插入6 次删除
  1. 24 0
      src/dao_new/Institution.js
  2. 9 0
      src/dao_new/index.js
  3. 3 3
      src/modules/api/controller.js
  4. 9 3
      src/service/move.js

+ 24 - 0
src/dao_new/Institution.js

@@ -0,0 +1,24 @@
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-22 19:10:00
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-23 18:59:46
+ * @FilePath: /202103/code/sql_merge/src/dao_new/Institution.js
+ */
+
+const Sequelize = require('sequelize');
+import sequelize from './db/sequelize';
+/**
+* 患者信息
+*/
+// primaryKey: true
+// defaultValue: null
+
+const Institution = sequelize.define('institution', {
+  id: {type: Sequelize.STRING(32), allowNull: false, primaryKey: true}, // id,
+  }, {
+  freezeTableName: true,
+  charset: 'utf8',
+});
+Institution.sync({ force: false }).then(function() {});
+export default Institution;

+ 9 - 0
src/dao_new/index.js

@@ -1,7 +1,15 @@
+/*
+ * @Author: fuyu
+ * @Date: 2021-03-22 19:16:50
+ * @LastEditors: fuyu
+ * @LastEditTime: 2021-03-23 18:59:06
+ * @FilePath: /202103/code/sql_merge/src/dao_new/index.js
+ */
 import ApplicationProgressLog from './ApplicationProgressLog'
 import Bbs from './Bbs'
 import Exams from './Exams'
 import Images from './Images'
+import Institution from './Institution'
 import PatientInfos from './PatientInfos'
 import QualityCause from './QualityCause'
 import QualityControl from './QualityControl'
@@ -18,6 +26,7 @@ export {
   Bbs,
   Exams,
   Images,
+  Institution,
   PatientInfos,
   QualityCause,
   QualityControl,

+ 3 - 3
src/modules/api/controller.js

@@ -2,10 +2,10 @@
  * @Author: fuyu
  * @Date: 2021-03-23 11:56:31
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-23 13:48:50
+ * @LastEditTime: 2021-03-23 18:56:55
  * @FilePath: /202103/code/sql_merge/src/modules/api/controller.js
  */
-import {moveSingle} from '../../service/move'
+import {moveAll} from '../../service/move'
 export async function move(ctx) {
-  await moveSingle('73090004')
+  await moveAll()
 }

+ 9 - 3
src/service/move.js

@@ -2,16 +2,22 @@
  * @Author: fuyu
  * @Date: 2021-03-23 12:00:09
  * @LastEditors: fuyu
- * @LastEditTime: 2021-03-23 17:42:37
+ * @LastEditTime: 2021-03-23 19:02:50
  * @FilePath: /202103/code/sql_merge/src/service/move.js
  */
 
 import {limit} from '../../config'
 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 {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'
+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'
 
-export async function moveSingle(institution_id) {
+export async function moveAll() {
+  const ids = await Institution.findAll({attributes: ['id']})
+  for(let i = 0; i < ids.length; i++) {
+    await moveSingle(ids[i]['id'])
+  }
+}
+const moveSingle = async institution_id => {
   let count = limit, sum = 0
   while(count === limit) {
     count = await moveExams(institution_id)