csx 4 years ago
parent
commit
b049f24f0f
82 changed files with 355 additions and 340 deletions
  1. 5 7
      conf/app.conf
  2. 3 3
      controllers/admin_api_controllers/admin_api_base_controller.go
  3. 3 3
      controllers/admin_api_controllers/analysis_api_controller.go
  4. 2 2
      controllers/admin_api_controllers/login_api_controller.go
  5. 2 2
      controllers/base_api_controller.go
  6. 1 1
      controllers/base_controller.go
  7. 4 4
      controllers/data_api_controller.go
  8. 4 4
      controllers/device_api_controller.go
  9. 4 4
      controllers/dialysis_api_controller.go
  10. 3 3
      controllers/dialysis_board_api_controller.go
  11. 8 8
      controllers/dialysis_record_api_controller.go
  12. 1 1
      controllers/district_api_controller.go
  13. 3 3
      controllers/doctors_api_controller.go
  14. 4 4
      controllers/gobal_config_api_controller.go
  15. 4 4
      controllers/inspection_api_controller.go
  16. 40 40
      controllers/integration_config_api_controller.go
  17. 3 3
      controllers/invoice_api_controller.go
  18. 99 99
      controllers/manage_api_controller.go
  19. 3 3
      controllers/mobile_api_controllers/admin_user_api_controller.go
  20. 3 3
      controllers/mobile_api_controllers/check_api_controller.go
  21. 5 8
      controllers/mobile_api_controllers/check_weight_api_controller.go
  22. 4 4
      controllers/mobile_api_controllers/dialysis_api_controller.go
  23. 4 4
      controllers/mobile_api_controllers/dialysis_api_controller_extend.go
  24. 4 4
      controllers/mobile_api_controllers/doctor_advice_api_controller.go
  25. 1 1
      controllers/mobile_api_controllers/doctor_api_controller.go
  26. 13 4
      controllers/mobile_api_controllers/login_api_controller.go
  27. 4 4
      controllers/mobile_api_controllers/mobile_api_base_controller.go
  28. 4 4
      controllers/mobile_api_controllers/patient_api_controller.go
  29. 2 2
      controllers/mobile_api_controllers/qiniiu_api_controller.go
  30. 2 2
      controllers/mobile_api_controllers/stock_api_controller.go
  31. 4 4
      controllers/orginfo_api_controller.go
  32. 4 4
      controllers/patient_api_controller.go
  33. 4 4
      controllers/patient_dataconfig_api_controller.go
  34. 3 3
      controllers/pay_api_controller.go
  35. 3 3
      controllers/print_data_api_controller.go
  36. 2 2
      controllers/public_api_controller.go
  37. 3 3
      controllers/qcd_api_controller.go
  38. 2 2
      controllers/qiniiu_api_controller.go
  39. 3 3
      controllers/role_controller.go
  40. 4 4
      controllers/schedule_api_controller.go
  41. 5 5
      controllers/schedule_template_api_controller.go
  42. 3 3
      controllers/sign_weigh_api_controller.go
  43. 1 1
      controllers/statistics_api_controller.go
  44. 4 4
      controllers/stock_api_controller.go
  45. 3 3
      controllers/stock_good_api_controller.go
  46. 5 5
      controllers/stock_in_api_controller.go
  47. 4 4
      controllers/verify_login_controller.go
  48. 2 2
      service/admin_service.go
  49. 1 1
      service/app_version.go
  50. 2 2
      service/auto_clear_schedules_service.go
  51. 2 2
      service/auto_create_week_disinfection.go
  52. 2 2
      service/auto_create_week_plan.go
  53. 2 2
      service/auto_create_week_schedules_service.go
  54. 1 1
      service/data.go
  55. 2 2
      service/db_err_service.go
  56. 1 1
      service/device_service.go
  57. 1 1
      service/dialysis_service.go
  58. 1 1
      service/district_service.go
  59. 1 1
      service/doctor_advice_service.go
  60. 1 1
      service/gobal_config_service.go
  61. 1 1
      service/inspection_service.go
  62. 1 1
      service/integration_service.go
  63. 1 1
      service/invoice_service.go
  64. 1 1
      service/manage_service.go
  65. 1 1
      service/mobile_dialysis_service.go
  66. 1 1
      service/orginfo_service.go
  67. 1 1
      service/patient_dataconfig_service.go
  68. 2 2
      service/patient_schedule_template_service.go
  69. 1 1
      service/patient_service.go
  70. 1 1
      service/pay_service.go
  71. 3 3
      service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go
  72. 1 1
      service/qcd_service.go
  73. 2 2
      service/role_service.go
  74. 1 1
      service/schedule_service.go
  75. 1 1
      service/sign_weigh_service.go
  76. 1 1
      service/sms_service.go
  77. 1 1
      service/statistics_service.go
  78. 1 1
      service/stock_service.go
  79. 1 1
      service/subscibe_service.go
  80. 1 1
      service/user_service.go
  81. 2 2
      service/verify_login_token_service.go
  82. 11 0
      utils/login_token.go

+ 5 - 7
conf/app.conf View File

@@ -8,7 +8,7 @@ sessionon = true
8 8
 sessiongcmaxlifetime = 64800
9 9
 
10 10
 tokencookiemaxlifetime = 7200
11
-
11
+mobile_token_expiration_second = 86400
12 12
 enablexsrf = false
13 13
 xsrfkey = 61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o
14 14
 xsrfexpire = 3600
@@ -18,6 +18,8 @@ qiniu_secretkey = DmZSp_Bmnp-9aUB7xUvoyViZpzmx1Rs2RL69GvlW
18 18
 qiniu_domain = https://images.shengws.com/
19 19
 qiniu_bucket = syhclub-storage
20 20
 
21
+
22
+
21 23
 aes_key = "xuetou-201807319"
22 24
 
23 25
 wxtoken = gh_ac6cd0cdde3d
@@ -150,17 +152,13 @@ writemiddleuser = root
150 152
 writemiddlepass = 1Q2W3e4r!@#$
151 153
 writemiddlename = ky_xt_middle
152 154
 
153
-
154
-
155
-
156 155
 #redishost = 120.77.235.13
157
-redishost = 127.0.0.1
156
+#redishost = 112.74.16.180
157
+redishost = localhost
158 158
 redisport = 6379
159 159
 redispasswrod = syh@#$%123456!
160 160
 redisdb = 0
161 161
 
162
-
163
-
164 162
 niprocart =  83
165 163
 jms = 80
166 164
 fistula_needle_set = 81

+ 3 - 3
controllers/admin_api_controllers/admin_api_base_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package admin_api_controllers
2 2
 
3 3
 import (
4
-	"XT/controllers"
5
-	"XT/enums"
6
-	"XT/models/admin_models"
4
+	"XT_New/controllers"
5
+	"XT_New/enums"
6
+	"XT_New/models/admin_models"
7 7
 )
8 8
 
9 9
 type AdminBaseAPIController struct {

+ 3 - 3
controllers/admin_api_controllers/analysis_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package admin_api_controllers
2 2
 
3 3
 import (
4
-	"XT/models"
5
-	"XT/service"
6
-	"XT/utils"
4
+	"XT_New/models"
5
+	"XT_New/service"
6
+	"XT_New/utils"
7 7
 	"time"
8 8
 )
9 9
 

+ 2 - 2
controllers/admin_api_controllers/login_api_controller.go View File

@@ -1,8 +1,8 @@
1 1
 package admin_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/service"
6 6
 )
7 7
 
8 8
 type LoginAPIController struct {

+ 2 - 2
controllers/base_api_controller.go View File

@@ -1,8 +1,8 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/service"
6 6
 )
7 7
 
8 8
 type BaseAPIController struct {

+ 1 - 1
controllers/base_controller.go View File

@@ -1,7 +1,7 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/service"
4
+	"XT_New/service"
5 5
 
6 6
 	"github.com/astaxie/beego"
7 7
 )

+ 4 - 4
controllers/data_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"fmt"
10 10
 	"reflect"

+ 4 - 4
controllers/device_api_controller.go View File

@@ -1,12 +1,12 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/utils"
4
+	"XT_New/utils"
5 5
 	"time"
6 6
 
7
-	"XT/enums"
8
-	"XT/models"
9
-	"XT/service"
7
+	"XT_New/enums"
8
+	"XT_New/models"
9
+	"XT_New/service"
10 10
 
11 11
 	"fmt"
12 12
 	"github.com/astaxie/beego"

+ 4 - 4
controllers/dialysis_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/models"
5
-	"XT/service"
6
-	"XT/utils"
4
+	"XT_New/models"
5
+	"XT_New/service"
6
+	"XT_New/utils"
7 7
 	"encoding/json"
8 8
 	"fmt"
9 9
 	"github.com/jinzhu/gorm"
@@ -15,7 +15,7 @@ import (
15 15
 	//"strings"
16 16
 	"time"
17 17
 
18
-	"XT/enums"
18
+	"XT_New/enums"
19 19
 
20 20
 	"github.com/astaxie/beego"
21 21
 )

+ 3 - 3
controllers/dialysis_board_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/service"
6
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/service"
6
+	"XT_New/utils"
7 7
 	"time"
8 8
 
9 9
 	"github.com/astaxie/beego"

+ 8 - 8
controllers/dialysis_record_api_controller.go View File

@@ -1,7 +1,7 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"encoding/json"
6 6
 	"github.com/jinzhu/gorm"
7 7
 	"math"
@@ -9,9 +9,9 @@ import (
9 9
 	"strings"
10 10
 	"time"
11 11
 
12
-	"XT/enums"
13
-	"XT/service"
14
-	"XT/utils"
12
+	"XT_New/enums"
13
+	"XT_New/service"
14
+	"XT_New/utils"
15 15
 
16 16
 	"fmt"
17 17
 	"github.com/astaxie/beego"
@@ -489,10 +489,10 @@ func (this *DialysisRecordAPIController) EditMonitor() {
489 489
 			MonitoringNurse:          adminUserInfo.AdminUser.Id,
490 490
 			Conductivity:             monitorParam.Conductivity,
491 491
 			DisplacementFlowQuantity: monitorParam.DisplacementFlowQuantity,
492
-			Status:                   1,
493
-			CreatedTime:              time.Now().Unix(),
494
-			UpdatedTime:              time.Now().Unix(),
495
-			BloodOxygenSaturation:    monitorParam.BloodOxygenSaturation,
492
+			Status:                1,
493
+			CreatedTime:           time.Now().Unix(),
494
+			UpdatedTime:           time.Now().Unix(),
495
+			BloodOxygenSaturation: monitorParam.BloodOxygenSaturation,
496 496
 		}
497 497
 		createErr := service.CreateMonitor(&monitor)
498 498
 		if createErr != nil {

+ 1 - 1
controllers/district_api_controller.go View File

@@ -1,7 +1,7 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/service"
4
+	"XT_New/service"
5 5
 
6 6
 	"github.com/astaxie/beego"
7 7
 )

+ 3 - 3
controllers/doctors_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/service"
4
+	"XT_New/service"
5 5
 
6
-	"XT/models"
7
-	"XT/utils"
6
+	"XT_New/models"
7
+	"XT_New/utils"
8 8
 	"fmt"
9 9
 	"github.com/astaxie/beego"
10 10
 	"github.com/jinzhu/gorm"

+ 4 - 4
controllers/gobal_config_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"bytes"
9 9
 	"encoding/json"
10 10
 	"fmt"

+ 4 - 4
controllers/inspection_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"fmt"
10 10
 	"github.com/astaxie/beego"

+ 40 - 40
controllers/integration_config_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7 7
 	"github.com/astaxie/beego"
8 8
 	"time"
9 9
 )
@@ -89,31 +89,31 @@ func (c *IntegrationConfigApiController) CreatePatientHis() {
89 89
 	}
90 90
 
91 91
 	hisPatient := &models.HisPatients{
92
-		UserOrgId:                    adminUserInfo.CurrentOrgId,
93
-		UserId:                       patient.UserId,
94
-		Avatar:                       patient.Avatar,
95
-		PatientType:                  patient.PatientType,
96
-		DialysisNo:                   patient.DialysisNo,
97
-		AdmissionNumber:              patient.AdmissionNumber,
98
-		Source:                       patient.Source,
99
-		Lapseto:                      patient.Lapseto,
100
-		PartitionId:                  patient.PartitionId,
101
-		BedId:                        patient.BedId,
102
-		Name:                         patient.Name,
103
-		Alias:                        patient.Alias,
104
-		Gender:                       patient.Gender,
105
-		Nation:                       patient.Nation,
106
-		NativePlace:                  patient.NativePlace,
107
-		MaritalStatus:                patient.MaritalStatus,
108
-		IdCardNo:                     patient.IdCardNo,
109
-		Birthday:                     patient.Birthday,
110
-		ReimbursementWayId:           patient.ReimbursementWayId,
111
-		HealthCareType:               patient.HealthCareType,
112
-		HealthCareNo:                 patient.HealthCareNo,
113
-		HealthCareDueDate:            patient.HealthCareDueDate,
114
-		Height:                       patient.Height,
115
-		BloodType:                    patient.BloodType,
116
-		Rh:                           patient.Rh,
92
+		UserOrgId:          adminUserInfo.CurrentOrgId,
93
+		UserId:             patient.UserId,
94
+		Avatar:             patient.Avatar,
95
+		PatientType:        patient.PatientType,
96
+		DialysisNo:         patient.DialysisNo,
97
+		AdmissionNumber:    patient.AdmissionNumber,
98
+		Source:             patient.Source,
99
+		Lapseto:            patient.Lapseto,
100
+		PartitionId:        patient.PartitionId,
101
+		BedId:              patient.BedId,
102
+		Name:               patient.Name,
103
+		Alias:              patient.Alias,
104
+		Gender:             patient.Gender,
105
+		Nation:             patient.Nation,
106
+		NativePlace:        patient.NativePlace,
107
+		MaritalStatus:      patient.MaritalStatus,
108
+		IdCardNo:           patient.IdCardNo,
109
+		Birthday:           patient.Birthday,
110
+		ReimbursementWayId: patient.ReimbursementWayId,
111
+		HealthCareType:     patient.HealthCareType,
112
+		HealthCareNo:       patient.HealthCareNo,
113
+		HealthCareDueDate:  patient.HealthCareDueDate,
114
+		Height:             patient.Height,
115
+		BloodType:          patient.BloodType,
116
+		Rh:                 patient.Rh,
117 117
 		HealthCareDueAlertDate:       patient.HealthCareDueAlertDate,
118 118
 		EducationLevel:               patient.EducationLevel,
119 119
 		Profession:                   patient.Profession,
@@ -155,18 +155,18 @@ func (c *IntegrationConfigApiController) CreatePatientHis() {
155 155
 		CreatedTime:                  time.Now().Unix(),
156 156
 		UpdatedTime:                  time.Now().Unix(),
157 157
 		Age:                          patient.Age,
158
-		InfectiousNextRecordTime:     patient.InfectiousNextRecordTime,
159
-		IsInfectious:                 patient.IsInfectious,
160
-		RemindCycle:                  patient.RemindCycle,
161
-		ResponseResult:               patient.ResponseResult,
162
-		IsOpenRemind:                 patient.IsOpenRemind,
163
-		DialysisAge:                  patient.DialysisAge,
164
-		ExpenseKind:                  patient.ExpenseKind,
165
-		TellPhone:                    patient.TellPhone,
166
-		FirstTreatmentDate:           patient.FirstTreatmentDate,
167
-		ContactName:                  patient.ContactName,
168
-		HisUserId:                    his_user_id,
169
-		XtPatientId:                  patient.ID,
158
+		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
159
+		IsInfectious:             patient.IsInfectious,
160
+		RemindCycle:              patient.RemindCycle,
161
+		ResponseResult:           patient.ResponseResult,
162
+		IsOpenRemind:             patient.IsOpenRemind,
163
+		DialysisAge:              patient.DialysisAge,
164
+		ExpenseKind:              patient.ExpenseKind,
165
+		TellPhone:                patient.TellPhone,
166
+		FirstTreatmentDate:       patient.FirstTreatmentDate,
167
+		ContactName:              patient.ContactName,
168
+		HisUserId:                his_user_id,
169
+		XtPatientId:              patient.ID,
170 170
 	}
171 171
 
172 172
 	err := service.CreatePatientsHis(hisPatient)

+ 3 - 3
controllers/invoice_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7 7
 	"encoding/json"
8 8
 	"fmt"
9 9
 	"github.com/astaxie/beego"

+ 99 - 99
controllers/manage_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"fmt"
10 10
 	"github.com/astaxie/beego"
@@ -1146,38 +1146,38 @@ func (this *MachineApiController) SaveInformation() {
1146 1146
 	fmt.Print("information", information)
1147 1147
 	if errinfor == gorm.ErrRecordNotFound {
1148 1148
 		infor := models.DeviceInformation{
1149
-			Date:                  startdate,
1150
-			Class:                 classtype,
1151
-			Zone:                  zone,
1152
-			BedNumber:             bednumber,
1153
-			PatientId:             patient_time,
1154
-			Contagion:             contagion,
1155
-			DialysisMode:          dialysis_mode,
1156
-			StartTime:             startDate.Unix(),
1157
-			EndTime:               endDate.Unix(),
1158
-			DialysisHour:          dialysis_time,
1159
-			Hyperfiltratio:        hyperfiletration,
1160
-			WeightLoss:            weight_loss,
1161
-			WarningValue:          warining_value,
1162
-			UserTotal:             user_total,
1163
-			Move:                  run,
1164
-			FailureStage:          failure_stage,
1165
-			FaultDescription:      falult_desciription,
1166
-			CodeInformation:       code_information,
1167
-			DisinfectantType:      disinfectant_type,
1168
-			DisinfectType:         disinfect_type,
1169
-			Disinfection:          disinfection,
1170
-			MachineRun:            machine_run,
1171
-			FluidPath:             fluid_path,
1172
-			Disinfectant:          disinfectant,
1173
-			DisinfectionStatus:    disinfection_status,
1174
-			DisinfectionResidue:   disinfection_residue,
1175
-			LongTime:              longtime,
1176
-			DisinfecStartime:      start_Date.Unix(),
1177
-			DisinfecEndtime:       end_Date.Unix(),
1178
-			DialysisChecked:       dialysis_checked,
1179
-			DialysisName:          dialysis_name,
1180
-			Norms:                 norms,
1149
+			Date:                startdate,
1150
+			Class:               classtype,
1151
+			Zone:                zone,
1152
+			BedNumber:           bednumber,
1153
+			PatientId:           patient_time,
1154
+			Contagion:           contagion,
1155
+			DialysisMode:        dialysis_mode,
1156
+			StartTime:           startDate.Unix(),
1157
+			EndTime:             endDate.Unix(),
1158
+			DialysisHour:        dialysis_time,
1159
+			Hyperfiltratio:      hyperfiletration,
1160
+			WeightLoss:          weight_loss,
1161
+			WarningValue:        warining_value,
1162
+			UserTotal:           user_total,
1163
+			Move:                run,
1164
+			FailureStage:        failure_stage,
1165
+			FaultDescription:    falult_desciription,
1166
+			CodeInformation:     code_information,
1167
+			DisinfectantType:    disinfectant_type,
1168
+			DisinfectType:       disinfect_type,
1169
+			Disinfection:        disinfection,
1170
+			MachineRun:          machine_run,
1171
+			FluidPath:           fluid_path,
1172
+			Disinfectant:        disinfectant,
1173
+			DisinfectionStatus:  disinfection_status,
1174
+			DisinfectionResidue: disinfection_residue,
1175
+			LongTime:            longtime,
1176
+			DisinfecStartime:    start_Date.Unix(),
1177
+			DisinfecEndtime:     end_Date.Unix(),
1178
+			DialysisChecked:     dialysis_checked,
1179
+			DialysisName:        dialysis_name,
1180
+			Norms:               norms,
1181 1181
 			DialysisConcentration: dialysis_concentration,
1182 1182
 			GermChecked:           germ_checked,
1183 1183
 			GermName:              germ_name,
@@ -1198,38 +1198,38 @@ func (this *MachineApiController) SaveInformation() {
1198 1198
 		})
1199 1199
 	} else if errinfor == nil {
1200 1200
 		infor := models.DeviceInformation{
1201
-			Date:                  startdate,
1202
-			Class:                 classtype,
1203
-			Zone:                  zone,
1204
-			BedNumber:             bednumber,
1205
-			PatientId:             patient_time,
1206
-			Contagion:             contagion,
1207
-			DialysisMode:          dialysis_mode,
1208
-			StartTime:             startDate.Unix(),
1209
-			EndTime:               endDate.Unix(),
1210
-			DialysisHour:          dialysis_time,
1211
-			Hyperfiltratio:        hyperfiletration,
1212
-			WeightLoss:            weight_loss,
1213
-			WarningValue:          warining_value,
1214
-			UserTotal:             user_total,
1215
-			Move:                  run,
1216
-			FailureStage:          failure_stage,
1217
-			FaultDescription:      falult_desciription,
1218
-			CodeInformation:       code_information,
1219
-			DisinfectantType:      disinfectant_type,
1220
-			DisinfectType:         disinfect_type,
1221
-			Disinfection:          disinfection,
1222
-			MachineRun:            machine_run,
1223
-			FluidPath:             fluid_path,
1224
-			Disinfectant:          disinfectant,
1225
-			DisinfectionStatus:    disinfection_status,
1226
-			DisinfectionResidue:   disinfection_residue,
1227
-			LongTime:              longtime,
1228
-			DisinfecStartime:      start_Date.Unix(),
1229
-			DisinfecEndtime:       end_Date.Unix(),
1230
-			DialysisChecked:       dialysis_checked,
1231
-			DialysisName:          dialysis_name,
1232
-			Norms:                 norms,
1201
+			Date:                startdate,
1202
+			Class:               classtype,
1203
+			Zone:                zone,
1204
+			BedNumber:           bednumber,
1205
+			PatientId:           patient_time,
1206
+			Contagion:           contagion,
1207
+			DialysisMode:        dialysis_mode,
1208
+			StartTime:           startDate.Unix(),
1209
+			EndTime:             endDate.Unix(),
1210
+			DialysisHour:        dialysis_time,
1211
+			Hyperfiltratio:      hyperfiletration,
1212
+			WeightLoss:          weight_loss,
1213
+			WarningValue:        warining_value,
1214
+			UserTotal:           user_total,
1215
+			Move:                run,
1216
+			FailureStage:        failure_stage,
1217
+			FaultDescription:    falult_desciription,
1218
+			CodeInformation:     code_information,
1219
+			DisinfectantType:    disinfectant_type,
1220
+			DisinfectType:       disinfect_type,
1221
+			Disinfection:        disinfection,
1222
+			MachineRun:          machine_run,
1223
+			FluidPath:           fluid_path,
1224
+			Disinfectant:        disinfectant,
1225
+			DisinfectionStatus:  disinfection_status,
1226
+			DisinfectionResidue: disinfection_residue,
1227
+			LongTime:            longtime,
1228
+			DisinfecStartime:    start_Date.Unix(),
1229
+			DisinfecEndtime:     end_Date.Unix(),
1230
+			DialysisChecked:     dialysis_checked,
1231
+			DialysisName:        dialysis_name,
1232
+			Norms:               norms,
1233 1233
 			DialysisConcentration: dialysis_concentration,
1234 1234
 			GermChecked:           germ_checked,
1235 1235
 			GermName:              germ_name,
@@ -2367,37 +2367,37 @@ func (this *MachineApiController) UpdateForm() {
2367 2367
 	fmt.Println("签名", sign_name)
2368 2368
 
2369 2369
 	information := models.DeviceInformation{
2370
-		Date:                  startdate,
2371
-		Class:                 classtype,
2372
-		Zone:                  zone,
2373
-		BedNumber:             bednumber,
2374
-		Contagion:             contagion,
2375
-		DialysisMode:          dialysis_mode,
2376
-		StartTime:             startDate.Unix(),
2377
-		EndTime:               endDate.Unix(),
2378
-		DialysisHour:          dialysis_time,
2379
-		Hyperfiltratio:        hyperfiletration,
2380
-		WeightLoss:            weight_loss,
2381
-		WarningValue:          warining_value,
2382
-		UserTotal:             user_total,
2383
-		Move:                  run,
2384
-		FailureStage:          failure_stage,
2385
-		FaultDescription:      falult_desciription,
2386
-		CodeInformation:       code_information,
2387
-		DisinfectantType:      disinfectant_type,
2388
-		DisinfectType:         disinfect_type,
2389
-		Disinfection:          disinfection,
2390
-		MachineRun:            machine_run,
2391
-		FluidPath:             fluid_path,
2392
-		Disinfectant:          disinfectant,
2393
-		DisinfectionStatus:    disinfection_status,
2394
-		DisinfectionResidue:   disinfection_residue,
2395
-		LongTime:              longtime,
2396
-		DisinfecStartime:      distartime,
2397
-		DisinfecEndtime:       diendtime,
2398
-		DialysisChecked:       dialysis_checked,
2399
-		DialysisName:          dialysis_name,
2400
-		Norms:                 norms,
2370
+		Date:                startdate,
2371
+		Class:               classtype,
2372
+		Zone:                zone,
2373
+		BedNumber:           bednumber,
2374
+		Contagion:           contagion,
2375
+		DialysisMode:        dialysis_mode,
2376
+		StartTime:           startDate.Unix(),
2377
+		EndTime:             endDate.Unix(),
2378
+		DialysisHour:        dialysis_time,
2379
+		Hyperfiltratio:      hyperfiletration,
2380
+		WeightLoss:          weight_loss,
2381
+		WarningValue:        warining_value,
2382
+		UserTotal:           user_total,
2383
+		Move:                run,
2384
+		FailureStage:        failure_stage,
2385
+		FaultDescription:    falult_desciription,
2386
+		CodeInformation:     code_information,
2387
+		DisinfectantType:    disinfectant_type,
2388
+		DisinfectType:       disinfect_type,
2389
+		Disinfection:        disinfection,
2390
+		MachineRun:          machine_run,
2391
+		FluidPath:           fluid_path,
2392
+		Disinfectant:        disinfectant,
2393
+		DisinfectionStatus:  disinfection_status,
2394
+		DisinfectionResidue: disinfection_residue,
2395
+		LongTime:            longtime,
2396
+		DisinfecStartime:    distartime,
2397
+		DisinfecEndtime:     diendtime,
2398
+		DialysisChecked:     dialysis_checked,
2399
+		DialysisName:        dialysis_name,
2400
+		Norms:               norms,
2401 2401
 		DialysisConcentration: dialysis_concentration,
2402 2402
 		GermChecked:           germ_checked,
2403 2403
 		GermName:              germ_name,

+ 3 - 3
controllers/mobile_api_controllers/admin_user_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7 7
 	"encoding/json"
8 8
 	"fmt"
9 9
 	"time"

+ 3 - 3
controllers/mobile_api_controllers/check_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7 7
 	"time"
8 8
 )
9 9
 

+ 5 - 8
controllers/mobile_api_controllers/check_weight_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	_ "XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	_ "XT_New/utils"
8 8
 	_ "encoding/json"
9 9
 	"fmt"
10 10
 	_ "github.com/astaxie/beego"
@@ -338,11 +338,11 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
338 338
 		var mode_id int64
339 339
 
340 340
 		dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
341
-		lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.Org.Id, id, schedual.ModeId)
342 341
 		if schedual != nil {
343 342
 			// 获取透析模版
344 343
 			dialysisSolution, _ = service.MobileGetDialysisSolutionByModeId(adminUserInfo.Org.Id, id, schedual.ModeId)
345 344
 			system_dialysisPrescribe, _ = service.MobileGetSystemDialysisPrescribeByModeId(adminUserInfo.Org.Id, schedual.ModeId)
345
+			lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.Org.Id, id, schedual.ModeId)
346 346
 			mode_id = schedual.ModeId
347 347
 		} else {
348 348
 			// 获取透析模版
@@ -467,9 +467,6 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
467 467
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
468 468
 				}
469 469
 			} else if system_dialysisPrescribe != nil {
470
-				fmt.Println(dewater_amount)
471
-				fmt.Println("22111111")
472
-
473 470
 				var newprescribe models.DialysisPrescription
474 471
 				newprescribe.UserOrgId = system_dialysisPrescribe.UserOrgId
475 472
 				newprescribe.PatientId = id

+ 4 - 4
controllers/mobile_api_controllers/dialysis_api_controller.go View File

@@ -10,10 +10,10 @@ import (
10 10
 	"strings"
11 11
 	"time"
12 12
 
13
-	"XT/enums"
14
-	"XT/models"
15
-	"XT/service"
16
-	"XT/utils"
13
+	"XT_New/enums"
14
+	"XT_New/models"
15
+	"XT_New/service"
16
+	"XT_New/utils"
17 17
 	"math"
18 18
 )
19 19
 

+ 4 - 4
controllers/mobile_api_controllers/dialysis_api_controller_extend.go View File

@@ -1,10 +1,10 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"fmt"
9 9
 	"github.com/jinzhu/gorm"
10 10
 	"time"

+ 4 - 4
controllers/mobile_api_controllers/doctor_advice_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 )
9 9
 
10 10
 type DoctorAdviceAPIController struct {

+ 1 - 1
controllers/mobile_api_controllers/doctor_api_controller.go View File

@@ -1,7 +1,7 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/service"
4
+	"XT_New/service"
5 5
 )
6 6
 
7 7
 type DoctorsApiController struct {

+ 13 - 4
controllers/mobile_api_controllers/login_api_controller.go View File

@@ -1,15 +1,16 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
+	"XT_New/enums"
4 5
 	"encoding/json"
6
+	"fmt"
5 7
 	"io/ioutil"
6 8
 	"net/http"
7 9
 	"net/url"
8 10
 
9
-	"XT/enums"
10
-	"XT/models"
11
-	"XT/service"
12
-	"XT/utils"
11
+	"XT_New/models"
12
+	"XT_New/service"
13
+	"XT_New/utils"
13 14
 
14 15
 	"github.com/astaxie/beego"
15 16
 )
@@ -280,6 +281,14 @@ func (this *LoginAPIController) LoginByPwd() {
280 281
 		}
281 282
 		this.SetSession("mobile_admin_user_info", mobileAdminUserInfo)
282 283
 
284
+		//= utils.GenerateLoginToken(mobile)
285
+		token := utils.GenerateLoginToken(mobile)
286
+		expiration, _ := beego.AppConfig.Int64("mobile_token_expiration_second")
287
+		this.Ctx.SetCookie("token_cookie", token, expiration, "/")
288
+
289
+		fmt.Println(token)
290
+		fmt.Println(this.Ctx.GetCookie("token_cookie"))
291
+
283 292
 		configList, _ := service.GetConfigList(org.Id)
284 293
 
285 294
 		var FiledList []*models.FiledConfig

+ 4 - 4
controllers/mobile_api_controllers/mobile_api_base_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/controllers"
5
-	"XT/enums"
6
-	"XT/models"
7
-	"XT/service"
4
+	"XT_New/controllers"
5
+	"XT_New/enums"
6
+	"XT_New/models"
7
+	"XT_New/service"
8 8
 )
9 9
 
10 10
 type MobileBaseAPIController struct {

+ 4 - 4
controllers/mobile_api_controllers/patient_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"fmt"
10 10
 	"strings"

+ 2 - 2
controllers/mobile_api_controllers/qiniiu_api_controller.go View File

@@ -1,8 +1,8 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/service"
6 6
 	"fmt"
7 7
 )
8 8
 

+ 2 - 2
controllers/mobile_api_controllers/stock_api_controller.go View File

@@ -1,8 +1,8 @@
1 1
 package mobile_api_controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/service"
6 6
 	"github.com/astaxie/beego"
7 7
 )
8 8
 

+ 4 - 4
controllers/orginfo_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"reflect"
10 10
 	"time"

+ 4 - 4
controllers/patient_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"reflect"
10 10
 	"strconv"

+ 4 - 4
controllers/patient_dataconfig_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"strconv"
9 9
 	"strings"
10 10
 	"time"

+ 3 - 3
controllers/pay_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7 7
 	"bytes"
8 8
 	"crypto/md5"
9 9
 	"encoding/hex"

+ 3 - 3
controllers/print_data_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	service "XT/service/print_data_service/schedule_dialysis"
6
-	"XT/utils"
4
+	"XT_New/enums"
5
+	service "XT_New/service/print_data_service/schedule_dialysis"
6
+	"XT_New/utils"
7 7
 	"fmt"
8 8
 	"strings"
9 9
 	"time"

+ 2 - 2
controllers/public_api_controller.go View File

@@ -1,8 +1,8 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/service"
6 6
 	"encoding/json"
7 7
 	"fmt"
8 8
 	"strings"

+ 3 - 3
controllers/qcd_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/service"
6
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/service"
6
+	"XT_New/utils"
7 7
 	"time"
8 8
 
9 9
 	"github.com/astaxie/beego"

+ 2 - 2
controllers/qiniiu_api_controller.go View File

@@ -1,8 +1,8 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/service"
6 6
 	"fmt"
7 7
 
8 8
 	"github.com/astaxie/beego"

+ 3 - 3
controllers/role_controller.go View File

@@ -5,9 +5,9 @@ import (
5 5
 	"strings"
6 6
 	"time"
7 7
 
8
-	"XT/enums"
9
-	"XT/models"
10
-	"XT/service"
8
+	"XT_New/enums"
9
+	"XT_New/models"
10
+	"XT_New/service"
11 11
 
12 12
 	"github.com/astaxie/beego"
13 13
 )

+ 4 - 4
controllers/schedule_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"fmt"
10 10
 	"reflect"

+ 5 - 5
controllers/schedule_template_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"time"
10 10
 
@@ -136,7 +136,7 @@ func (this *PatientScheduleTemplateAPIController) InitData() {
136 136
 // @param mode:int 0.不启用模板 1.单周模板 2.双周模板
137 137
 func (this *PatientScheduleTemplateAPIController) SetMode() {
138 138
 	mode, _ := this.GetInt8("mode")
139
-	if mode != 1 && mode != 2 && mode != 0 {
139
+	if mode != 1 && mode != 2 && mode != 0 && mode != 3 && mode != 4 {
140 140
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
141 141
 		return
142 142
 	}

+ 3 - 3
controllers/sign_weigh_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7 7
 	"encoding/json"
8 8
 	"fmt"
9 9
 	"github.com/astaxie/beego"

+ 1 - 1
controllers/statistics_api_controller.go View File

@@ -1,7 +1,7 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/service"
4
+	"XT_New/service"
5 5
 	"github.com/astaxie/beego"
6 6
 	"time"
7 7
 )

+ 4 - 4
controllers/stock_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"github.com/astaxie/beego"
9 9
 	"strconv"
10 10
 	"time"

+ 3 - 3
controllers/stock_good_api_controller.go View File

@@ -1,9 +1,9 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7 7
 	"fmt"
8 8
 	"github.com/astaxie/beego"
9 9
 	"strconv"

+ 5 - 5
controllers/stock_in_api_controller.go View File

@@ -1,10 +1,10 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/enums"
5
-	"XT/models"
6
-	"XT/service"
7
-	"XT/utils"
4
+	"XT_New/enums"
5
+	"XT_New/models"
6
+	"XT_New/service"
7
+	"XT_New/utils"
8 8
 	"encoding/json"
9 9
 	"fmt"
10 10
 	"github.com/astaxie/beego"
@@ -1376,7 +1376,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
1376 1376
 
1377 1377
 				} else {
1378 1378
 					warehouseOutInfo := &models.WarehouseOutInfo{
1379
-						ID:                      id,
1379
+						ID: id,
1380 1380
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
1381 1381
 						WarehouseOutId:          warehouseOut.ID,
1382 1382
 						GoodId:                  good_id,

+ 4 - 4
controllers/verify_login_controller.go View File

@@ -1,13 +1,13 @@
1 1
 package controllers
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"fmt"
6 6
 	"net/url"
7 7
 
8
-	"XT/enums"
9
-	"XT/service"
10
-	"XT/utils"
8
+	"XT_New/enums"
9
+	"XT_New/service"
10
+	"XT_New/utils"
11 11
 
12 12
 	"github.com/astaxie/beego"
13 13
 )

+ 2 - 2
service/admin_service.go View File

@@ -3,8 +3,8 @@
3 3
 package service
4 4
 
5 5
 import (
6
-	"XT/models"
7
-	"XT/models/admin_models"
6
+	"XT_New/models"
7
+	"XT_New/models/admin_models"
8 8
 	"time"
9 9
 
10 10
 	"github.com/jinzhu/gorm"

+ 1 - 1
service/app_version.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"github.com/jinzhu/gorm"
6 6
 )
7 7
 

+ 2 - 2
service/auto_clear_schedules_service.go View File

@@ -1,8 +1,8 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
5
-	"XT/utils"
4
+	"XT_New/models"
5
+	"XT_New/utils"
6 6
 	"time"
7 7
 
8 8
 	"github.com/robfig/cron"

+ 2 - 2
service/auto_create_week_disinfection.go View File

@@ -1,8 +1,8 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
5
-	"XT/utils"
4
+	"XT_New/models"
5
+	"XT_New/utils"
6 6
 	"fmt"
7 7
 	"github.com/jinzhu/gorm"
8 8
 	"github.com/robfig/cron"

+ 2 - 2
service/auto_create_week_plan.go View File

@@ -1,8 +1,8 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
5
-	"XT/utils"
4
+	"XT_New/models"
5
+	"XT_New/utils"
6 6
 	"fmt"
7 7
 	"github.com/jinzhu/gorm"
8 8
 	"github.com/robfig/cron"

+ 2 - 2
service/auto_create_week_schedules_service.go View File

@@ -5,8 +5,8 @@ import (
5 5
 	"strings"
6 6
 	"time"
7 7
 
8
-	"XT/models"
9
-	"XT/utils"
8
+	"XT_New/models"
9
+	"XT_New/utils"
10 10
 
11 11
 	"github.com/jinzhu/gorm"
12 12
 	"github.com/robfig/cron"

+ 1 - 1
service/data.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	_ "github.com/astaxie/beego"
6 6
 	_ "strconv"
7 7
 	_ "strings"

+ 2 - 2
service/db_err_service.go View File

@@ -4,8 +4,8 @@ import (
4 4
 	"fmt"
5 5
 	"time"
6 6
 
7
-	"XT/models"
8
-	"XT/utils"
7
+	"XT_New/models"
8
+	"XT_New/utils"
9 9
 )
10 10
 
11 11
 func CreateDBErrorRecord(orgID int64, decsFormat string, v ...interface{}) {

+ 1 - 1
service/device_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"fmt"
6 6
 	"github.com/jinzhu/gorm"
7 7
 	"strings"

+ 1 - 1
service/dialysis_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"fmt"
6 6
 	"time"
7 7
 

+ 1 - 1
service/district_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 )
6 6
 
7 7
 func GetDistrictsByUpid(id int64) (dis []*models.District, err error) {

+ 1 - 1
service/doctor_advice_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"strings"
6 6
 	"time"
7 7
 

+ 1 - 1
service/gobal_config_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"github.com/jinzhu/gorm"
6 6
 )
7 7
 

+ 1 - 1
service/inspection_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"errors"
6 6
 	"strings"
7 7
 	"time"

+ 1 - 1
service/integration_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"github.com/jinzhu/gorm"
6 6
 	"time"
7 7
 )

+ 1 - 1
service/invoice_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"github.com/jinzhu/gorm"
6 6
 	"strconv"
7 7
 )

+ 1 - 1
service/manage_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"fmt"
6 6
 	"github.com/jinzhu/gorm"
7 7
 	"strings"

+ 1 - 1
service/mobile_dialysis_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"fmt"
6 6
 	"github.com/jinzhu/gorm"
7 7
 	"time"

+ 1 - 1
service/orginfo_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"time"
6 6
 )
7 7
 

+ 1 - 1
service/patient_dataconfig_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"time"
6 6
 
7 7
 	"github.com/jinzhu/gorm"

+ 2 - 2
service/patient_schedule_template_service.go View File

@@ -5,8 +5,8 @@ import (
5 5
 	"strings"
6 6
 	"time"
7 7
 
8
-	"XT/models"
9
-	"XT/utils"
8
+	"XT_New/models"
9
+	"XT_New/utils"
10 10
 
11 11
 	"github.com/jinzhu/gorm"
12 12
 )

+ 1 - 1
service/patient_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"strconv"
6 6
 	"strings"
7 7
 	"time"

+ 1 - 1
service/pay_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"github.com/jinzhu/gorm"
6 6
 	"strconv"
7 7
 	"time"

+ 3 - 3
service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go View File

@@ -1,9 +1,9 @@
1 1
 package schedule_dialysis
2 2
 
3 3
 import (
4
-	"XT/models"
5
-	p_service "XT/service"
6
-	"XT/utils"
4
+	"XT_New/models"
5
+	p_service "XT_New/service"
6
+	"XT_New/utils"
7 7
 	"time"
8 8
 
9 9
 	"github.com/jinzhu/gorm"

+ 1 - 1
service/qcd_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"fmt"
6 6
 	"time"
7 7
 )

+ 2 - 2
service/role_service.go View File

@@ -3,8 +3,8 @@ package service
3 3
 import (
4 4
 	"time"
5 5
 
6
-	"XT/models"
7
-	"XT/utils"
6
+	"XT_New/models"
7
+	"XT_New/utils"
8 8
 
9 9
 	"github.com/jinzhu/gorm"
10 10
 )

+ 1 - 1
service/schedule_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 
6 6
 	"github.com/jinzhu/gorm"
7 7
 )

+ 1 - 1
service/sign_weigh_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"fmt"
6 6
 	"github.com/jinzhu/gorm"
7 7
 )

+ 1 - 1
service/sms_service.go View File

@@ -9,7 +9,7 @@ import (
9 9
 	"strings"
10 10
 	"time"
11 11
 
12
-	"XT/utils"
12
+	"XT_New/utils"
13 13
 
14 14
 	"github.com/astaxie/beego"
15 15
 )

+ 1 - 1
service/statistics_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 )
6 6
 
7 7
 func GetDayDialysisCount(orgID, date int64) (total int64) {

+ 1 - 1
service/stock_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"fmt"
6 6
 	"github.com/jinzhu/gorm"
7 7
 	"strconv"

+ 1 - 1
service/subscibe_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 	"errors"
6 6
 	"time"
7 7
 )

+ 1 - 1
service/user_service.go View File

@@ -1,7 +1,7 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"XT/models"
4
+	"XT_New/models"
5 5
 
6 6
 	"fmt"
7 7
 	"github.com/jinzhu/gorm"

+ 2 - 2
service/verify_login_token_service.go View File

@@ -8,8 +8,8 @@ import (
8 8
 	"strconv"
9 9
 	"time"
10 10
 
11
-	"XT/models"
12
-	"XT/utils"
11
+	"XT_New/models"
12
+	"XT_New/utils"
13 13
 
14 14
 	"fmt"
15 15
 	"github.com/astaxie/beego"

+ 11 - 0
utils/login_token.go View File

@@ -0,0 +1,11 @@
1
+package utils
2
+
3
+import (
4
+	"strings"
5
+	"time"
6
+)
7
+
8
+func GenerateLoginToken(account string) string {
9
+	nowStr := time.Now().Format("20060102150405")
10
+	return strings.Join([]string{nowStr, RandomString(10), account}, "")
11
+}