28169 hace 1 mes
padre
commit
0d906621a1

BIN
XT_New.exe Ver fichero


+ 4 - 4
controllers/base_api_controller.go Ver fichero

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
83 83
 		userAdmin.ModifyTime = 1530786071
84 84
 		var subscibe models.ServeSubscibe
85 85
 		subscibe.ID = 11
86
-		subscibe.OrgId = 10567 //机构id
86
+		subscibe.OrgId = 10164 //机构id
87 87
 		subscibe.PeriodStart = 1547447814
88 88
 		subscibe.PeriodEnd = 1550039814
89 89
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
93 93
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
94 94
 		subscibes[4] = &subscibe
95 95
 		var adminUserInfo service.AdminUserInfo
96
-		adminUserInfo.CurrentOrgId = 10567 //机构id小英9675或4
96
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
97 97
 		adminUserInfo.CurrentAppId = 10697 //4
98 98
 		adminUserInfo.AdminUser = &userAdmin
99 99
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
329 329
 		userAdmin.ModifyTime = 1530786071
330 330
 		var subscibe models.ServeSubscibe
331 331
 		subscibe.ID = 11
332
-		subscibe.OrgId = 10567 //机构id小英9675或4
332
+		subscibe.OrgId = 10164 //机构id小英9675或4
333 333
 		subscibe.PeriodStart = 1538035409
334 334
 		subscibe.PeriodEnd = 1569571409
335 335
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
339 339
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
340 340
 		subscibes[4] = &subscibe
341 341
 		var adminUserInfo service.AdminUserInfo
342
-		adminUserInfo.CurrentOrgId = 10567 //机构id小英9675或4
342
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
343 343
 		adminUserInfo.CurrentAppId = 16787 //4
344 344
 		adminUserInfo.AdminUser = &userAdmin
345 345
 		adminUserInfo.Subscibes = subscibes

+ 13 - 0
controllers/dialysis_api_controller.go Ver fichero

@@ -6114,6 +6114,13 @@ func (this *DialysisApiController) SaveDialysisSetting() {
6114 6114
 	blood_access_set, _ := this.GetInt64("blood_access_set")
6115 6115
 	dialyzer_perfusion_apparatus_set, _ := this.GetInt64("dialyzer_perfusion_apparatus_set")
6116 6116
 	displace_liqui_part_set, _ := this.GetInt64("displace_liqui_part_set")
6117
+
6118
+	cuhong_set, _ := this.GetInt64("cuhong_set")
6119
+	zuoka_set, _ := this.GetInt64("zuoka_set")
6120
+	difenzi_set, _ := this.GetInt64("difenzi_set")
6121
+	gansuna_set, _ := this.GetInt64("gansuna_set")
6122
+	zhetangtie_set, _ := this.GetInt64("zhetangtie_set")
6123
+	niaojimei_set, _ := this.GetInt64("niaojimei_set")
6117 6124
 	dialysisSetting := models.XtDialysisSetting{
6118 6125
 		Sodium:                     sodium_set,
6119 6126
 		Calcium:                    calcium_set,
@@ -6146,6 +6153,12 @@ func (this *DialysisApiController) SaveDialysisSetting() {
6146 6153
 		Glucose:                    glucose_set,
6147 6154
 		Ctime:                      time.Now().Unix(),
6148 6155
 		Mtime:                      time.Now().Unix(),
6156
+		CuhongSet:                  cuhong_set,
6157
+		ZuokaSet:                   zuoka_set,
6158
+		DifenziSet:                 difenzi_set,
6159
+		GansunaSet:                 gansuna_set,
6160
+		ZhetangtieSet:              zhetangtie_set,
6161
+		NiaojimeiSet:               niaojimei_set,
6149 6162
 	}
6150 6163
 	err := service.SaveDialysisSetting(dialysisSetting)
6151 6164
 	if err == nil {

+ 2 - 0
controllers/schedule_api_controller.go Ver fichero

@@ -4263,7 +4263,9 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
4263 4263
 	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
4264 4264
 	timenow := timeStringToTime.Unix()
4265 4265
 	for _, it := range patientList {
4266
+
4266 4267
 		service.UpdateScheduleByDeathTime(it.ID, timenow)
4268
+
4267 4269
 		service.UpdateScheduleItemByPatientId(it.ID)
4268 4270
 	}
4269 4271
 

+ 6 - 0
models/new_stock_models.go Ver fichero

@@ -213,6 +213,12 @@ type XtDialysisSetting struct {
213 213
 	BloodAccess                int64 `gorm:"column:blood_access" json:"blood_access" form:"blood_access"`
214 214
 	DialyzerPerfusionApparatus int64 `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
215 215
 	DisplaceLiquiPart          int64 `gorm:"column:displace_liqui_part" json:"displace_liqui_part" form:"displace_liqui_part"`
216
+	CuhongSet                  int64 `gorm:"column:cuhong_set" json:"cuhong_set" form:"cuhong_set"`
217
+	ZuokaSet                   int64 `gorm:"column:zuoka_set" json:"zuoka_set" form:"zuoka_set"`
218
+	DifenziSet                 int64 `gorm:"column:difenzi_set" json:"difenzi_set" form:"difenzi_set"`
219
+	GansunaSet                 int64 `gorm:"column:gansuna_set" json:"gansuna_set" form:"gansuna_set"`
220
+	ZhetangtieSet              int64 `gorm:"column:zhetangtie_set" json:"zhetangtie_set" form:"zhetangtie_set"`
221
+	NiaojimeiSet               int64 `gorm:"column:niaojimei_set" json:"niaojimei_set" form:"niaojimei_set"`
216 222
 }
217 223
 
218 224
 func (XtDialysisSetting) TableName() string {