csx 3 年 前
コミット
a49ef7c175
共有2 個のファイルを変更した8 個の追加0 個の削除を含む
  1. 3 0
      controllers/his_project_api_controller.go
  2. 5 0
      service/his_project_service.go

+ 3 - 0
controllers/his_project_api_controller.go ファイルの表示

1234
 	//hisPatient, _ := service.GetHisPatientById(patient_id)
1234
 	//hisPatient, _ := service.GetHisPatientById(patient_id)
1235
 	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, adminUserInfo.CurrentOrgId)
1235
 	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, adminUserInfo.CurrentOrgId)
1236
 
1236
 
1237
+	eles, _ := service.GetNewAdminUserES(adminUserInfo.CurrentOrgId)
1238
+
1237
 	if err != nil {
1239
 	if err != nil {
1238
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
1240
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
1239
 		return
1241
 		return
1245
 		"his":               his,
1247
 		"his":               his,
1246
 		"hisHospitalRecord": hisHospitalRecord,
1248
 		"hisHospitalRecord": hisHospitalRecord,
1247
 		"info":              prescriptionInfo,
1249
 		"info":              prescriptionInfo,
1250
+		"eles":              eles,
1248
 	})
1251
 	})
1249
 }
1252
 }
1250
 
1253
 

+ 5 - 0
service/his_project_service.go ファイルの表示

747
 	err = XTReadDB().Model(&models.HisPatient{}).Where("user_org_id = ? AND patient_id = ? and status = 1 AND patient_info <> ''", org_id, patient_id).First(&his).Error
747
 	err = XTReadDB().Model(&models.HisPatient{}).Where("user_org_id = ? AND patient_id = ? and status = 1 AND patient_info <> ''", org_id, patient_id).First(&his).Error
748
 	return
748
 	return
749
 }
749
 }
750
+
751
+func GetNewAdminUserES(orgID int64) (es []*models.AdminUserElectronicSignature, err error) {
752
+	err = readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("org_id=?  and status=1", orgID).Find(&es).Error
753
+	return
754
+}