Browse Source

2024/6/17

28169 1 month ago
parent
commit
2b5f7e572e

BIN
XT_New.exe View File


+ 4 - 4
controllers/base_api_controller.go View File

@@ -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 = 10635 //机构id
86
+		subscibe.OrgId = 10727 //机构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 = 10635 //机构id小英9675或4
96
+		adminUserInfo.CurrentOrgId = 10727 //机构id小英9675或4
97 97
 		adminUserInfo.CurrentAppId = 18470 //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 = 10635 //机构id小英9675或4
332
+		subscibe.OrgId = 10727 //机构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 = 10635 //机构id小英9675或4
342
+		adminUserInfo.CurrentOrgId = 10727 //机构id小英9675或4
343 343
 		adminUserInfo.CurrentAppId = 18470 //4
344 344
 		adminUserInfo.AdminUser = &userAdmin
345 345
 		adminUserInfo.Subscibes = subscibes

+ 4 - 0
controllers/dialysis_api_controller.go View File

@@ -2940,6 +2940,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
2940 2940
 				newprescribe.TargetUltrafiltration = dewater_amount
2941 2941
 				newprescribe.PrescriptionWater = dewater_amount
2942 2942
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
2943
+				newprescribe.Amylaceum = dialysisSolution.Amylaceum
2943 2944
 				newprescribe.Status = 1
2944 2945
 
2945 2946
 				if adminUserInfo.CurrentOrgId == 10579 {
@@ -3013,6 +3014,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
3013 3014
 					newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
3014 3015
 					newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
3015 3016
 					newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
3017
+					newprescribe.Amylaceum = lastDialysisPrescribe.Amylaceum
3016 3018
 					newprescribe.CreatedTime = time.Now().Unix()
3017 3019
 					newprescribe.UpdatedTime = time.Now().Unix()
3018 3020
 					newprescribe.RecordDate = recordDate.Unix()
@@ -3301,6 +3303,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
3301 3303
 			newprescribe.TargetUltrafiltration = dewater_amount
3302 3304
 			newprescribe.PrescriptionWater = dewater_amount
3303 3305
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
3306
+			newprescribe.Amylaceum = dialysisSolution.Amylaceum
3304 3307
 			newprescribe.Status = 1
3305 3308
 			if adminUserInfo.CurrentOrgId == 10579 {
3306 3309
 				newprescribe.Modifier = 0
@@ -3379,6 +3382,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
3379 3382
 				newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
3380 3383
 				newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
3381 3384
 				newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
3385
+				newprescribe.Amylaceum = lastDialysisPrescribe.Amylaceum
3382 3386
 				newprescribe.Status = 1
3383 3387
 				if adminUserInfo.CurrentOrgId == 10579 {
3384 3388
 					newprescribe.Modifier = 0

+ 1 - 1
controllers/his_api_controller.go View File

@@ -3386,7 +3386,7 @@ func (c *HisApiController) CreateHisPrescription() {
3386 3386
 	var adviceList []models.HisDoctorAdviceInfo
3387 3387
 	var projectList []models.HisPrescriptionProject
3388 3388
 
3389
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 {
3389
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 {
3390 3390
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
3391 3391
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
3392 3392
 

+ 3 - 0
controllers/mobile_api_controllers/check_weight_api_controller.go View File

@@ -437,6 +437,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
437 437
 			newprescribe.Chaptalization = dialysisSolution.Chaptalization
438 438
 			newprescribe.PrescribingNumber = 1
439 439
 			newprescribe.BloodAccessPartId = dialysisSolution.BloodAccessPartId
440
+			newprescribe.Amylaceum = dialysisSolution.Amylaceum
440 441
 			newprescribe.Status = 1
441 442
 			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 && adminUserInfo.Org.Id != 10016 {
442 443
 				newprescribe.Remark = dialysisSolution.Remark
@@ -587,6 +588,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
587 588
 				newprescribe.BodyFluidOther = lastDialysisPrescribe.BodyFluidOther
588 589
 				newprescribe.TargetKtv = lastDialysisPrescribe.TargetKtv
589 590
 				newprescribe.BloodAccessPartId = lastDialysisPrescribe.BloodAccessPartId
591
+				newprescribe.Amylaceum = lastDialysisPrescribe.Amylaceum
590 592
 				newprescribe.CreatedTime = time.Now().Unix()
591 593
 				newprescribe.UpdatedTime = time.Now().Unix()
592 594
 				newprescribe.RecordDate = theAssessmentDateTime
@@ -713,6 +715,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
713 715
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
714 716
 				newprescribe.BloodAccessPartId = lastDialysisPrescribe.BloodAccessPartId
715 717
 				newprescribe.Status = 1
718
+				newprescribe.Amylaceum = lastDialysisPrescribe.Amylaceum
716 719
 				newprescribe.PrescribingNumber = 1
717 720
 
718 721
 				if adminUserInfo.Org.Id == 10340 {

+ 47 - 3
controllers/mobile_api_controllers/dialysis_api_controller.go View File

@@ -3937,7 +3937,15 @@ func (this *DialysisAPIController) StartDialysis() {
3937 3937
 
3938 3938
 			}
3939 3939
 
3940
-			if adminUserInfo.Org.Id == 10694 || adminUserInfo.Org.Id == 10697 || adminUserInfo.Org.Id == 10731 {
3940
+			if adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10731 {
3941
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
3942
+				ultrafiltration_rate = ultrafiltration_rate
3943
+
3944
+				ultrafiltration_rate_one = strconv.FormatFloat(ultrafiltration_rate, 'f', -1, 64)
3945
+
3946
+			}
3947
+
3948
+			if adminUserInfo.Org.Id == 10694 || adminUserInfo.Org.Id == 10697 {
3941 3949
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
3942 3950
 				ultrafiltration_rate = ultrafiltration_rate
3943 3951
 			}
@@ -3972,7 +3980,7 @@ func (this *DialysisAPIController) StartDialysis() {
3972 3980
 				}
3973 3981
 			}
3974 3982
 
3975
-			if adminUserInfo.Org.Id == 10702 {
3983
+			if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10731 || adminUserInfo.Org.Id == 10727 {
3976 3984
 				if prescription.ModeId == 2 {
3977 3985
 					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
3978 3986
 					if totalMin == 0 {
@@ -5168,6 +5176,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
5168 5176
 			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 || adminInfo.Org.Id == 10679 {
5169 5177
 				record.UltrafiltrationRate = 0
5170 5178
 			}
5179
+
5180
+			if adminInfo.Org.Id == 10727 || adminInfo.Org.Id == 10731 {
5181
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
5182
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
5183
+
5184
+				fmt.Println("record.UltrafiltrationRate ------------------------", record.UltrafiltrationRate)
5185
+			}
5171 5186
 			//if template.TemplateId == 47 {
5172 5187
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
5173 5188
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -5249,13 +5264,21 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
5249 5264
 
5250 5265
 	}
5251 5266
 
5267
+	//古镇乐生
5268
+	if adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10727 {
5269
+		if ultrafiltration_rate > 0 {
5270
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
5271
+			record.UltrafiltrationVolume = ultrafiltration_volume / 1000
5272
+		}
5273
+
5274
+	}
5275
+
5252 5276
 	if adminInfo.Org.Id == 10721 {
5253 5277
 		var replacement_rate float64
5254 5278
 		var displacement_quantity float64
5255 5279
 		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
5256 5280
 		replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*60) / 1000
5257 5281
 
5258
-		fmt.Println("replacement_rate--------------------------", replacement_rate)
5259 5282
 		record.ReplacementRate = replacement_rate
5260 5283
 
5261 5284
 		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
@@ -5264,6 +5287,27 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
5264 5287
 
5265 5288
 	}
5266 5289
 
5290
+	if adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10727 {
5291
+
5292
+		var replacement_rate float64
5293
+		var displacement_quantity float64
5294
+
5295
+		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
5296
+		if totalMin == 0 {
5297
+			totalMin = 240
5298
+		}
5299
+		if prescription.DisplaceLiquiValue == 0 {
5300
+			prescription.ReplacementTotal = 32
5301
+		}
5302
+
5303
+		//乘10 除10是为了保留一位小数
5304
+		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
5305
+
5306
+		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
5307
+		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
5308
+		record.DisplacementQuantity = displacement_quantity
5309
+	}
5310
+
5267 5311
 	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
5268 5312
 
5269 5313
 	this.ServeSuccessJSON(map[string]interface{}{

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

@@ -1375,7 +1375,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1375 1375
 
1376 1376
 							if medical.IsUse != 1 {
1377 1377
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
1378
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
1378
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 {
1379 1379
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
1380 1380
 										advice.ExecutionTime = 0
1381 1381
 										advice.ExecutionState = 2
@@ -1391,7 +1391,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1391 1391
 
1392 1392
 								}
1393 1393
 								if prescribing_number_total > total {
1394
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
1394
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 {
1395 1395
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
1396 1396
 										advice.ExecutionTime = 0
1397 1397
 										advice.ExecutionState = 2
@@ -1418,7 +1418,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1418 1418
 											//查询今日是否出库
1419 1419
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
1420 1420
 											if drugOutInfo.ID == 0 {
1421
-												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
1421
+												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
1422 1422
 													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
1423 1423
 												}
1424 1424
 
@@ -1428,7 +1428,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1428 1428
 										if pharmacyConfig.IsOpen != 1 {
1429 1429
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
1430 1430
 											if drugOutInfo.ID == 0 {
1431
-												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
1431
+												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
1432 1432
 													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
1433 1433
 												}
1434 1434
 
@@ -1455,7 +1455,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1455 1455
 									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
1456 1456
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
1457 1457
 										if drugOutInfo.ID == 0 {
1458
-											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
1458
+											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
1459 1459
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
1460 1460
 											}
1461 1461
 
@@ -1479,7 +1479,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1479 1479
 										service.CreateDrugError(drugError)
1480 1480
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
1481 1481
 										if drugOutInfo.ID == 0 {
1482
-											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
1482
+											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
1483 1483
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
1484 1484
 											}
1485 1485
 
@@ -1558,7 +1558,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1558 1558
 							}
1559 1559
 							if medical.IsUse != 1 {
1560 1560
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
1561
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
1561
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
1562 1562
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
1563 1563
 										advice.ExecutionTime = 0
1564 1564
 										advice.ExecutionState = 2
@@ -1572,7 +1572,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1572 1572
 									return
1573 1573
 								}
1574 1574
 								if prescribing_number_total > total {
1575
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
1575
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
1576 1576
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
1577 1577
 										advice.ExecutionTime = 0
1578 1578
 										advice.ExecutionState = 2
@@ -1591,7 +1591,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1591 1591
 									//查询今日是否出库
1592 1592
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
1593 1593
 									if drugOutInfo.ID == 0 {
1594
-										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
1594
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
1595 1595
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
1596 1596
 										}
1597 1597
 
@@ -1601,7 +1601,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
1601 1601
 									//查询今日是否出库
1602 1602
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
1603 1603
 									if drugOutInfo.ID == 0 {
1604
-										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
1604
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
1605 1605
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
1606 1606
 										}
1607 1607
 

+ 7 - 6
controllers/patient_api_controller.go View File

@@ -305,18 +305,19 @@ func (c *PatientApiController) GetPatientsAllList() {
305 305
 
306 306
 	if adminUserInfo.CurrentOrgId != 10702 {
307 307
 		patients, total, _ := service.GetAllPatientList(adminUserInfo.CurrentOrgId)
308
-
309 308
 		c.ServeSuccessJSON(map[string]interface{}{
310
-			"patients": patients,
311
-			"total":    total,
309
+			"patients":    patients,
310
+			"patientsOne": patients,
311
+			"total":       total,
312 312
 		})
313 313
 		return
314 314
 	} else {
315 315
 		patients, total, _ := service.GetAllPatientListOne(adminUserInfo.CurrentOrgId)
316
-
316
+		patientsOne, total, _ := service.GetAllPatientList(adminUserInfo.CurrentOrgId)
317 317
 		c.ServeSuccessJSON(map[string]interface{}{
318
-			"patients": patients,
319
-			"total":    total,
318
+			"patients":    patients,
319
+			"patientsOne": patientsOne,
320
+			"total":       total,
320 321
 		})
321 322
 		return
322 323
 	}