浏览代码

2024/6/17

28169 3 个月前
父节点
当前提交
34dcb2ff70

二进制
XT_New.exe 查看文件


+ 7 - 0
controllers/dialysis_api_controller.go 查看文件

5009
 		endTime = theTime.Unix()
5009
 		endTime = theTime.Unix()
5010
 	}
5010
 	}
5011
 
5011
 
5012
+	if xttime < 1740931200 {
5013
+
5014
+		startTime = 1740326400
5015
+
5016
+		endTime = 1740844800
5017
+	}
5018
+
5012
 	scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(patientInfo.ID, startTime, endTime, adminUserInfo.CurrentOrgId)
5019
 	scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(patientInfo.ID, startTime, endTime, adminUserInfo.CurrentOrgId)
5013
 
5020
 
5014
 	dialysis_count := len(scheduleDialyCount)
5021
 	dialysis_count := len(scheduleDialyCount)

+ 1 - 1
controllers/mobile_api_controllers/dialysis_api_controller.go 查看文件

4147
 	}
4147
 	}
4148
 
4148
 
4149
 	//只针对广慈医院
4149
 	//只针对广慈医院
4150
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 || adminUserInfo.Org.Id == 10679 || adminUserInfo.Org.Id == 10742 {
4150
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 || adminUserInfo.Org.Id == 10679 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10757 {
4151
 		// 查询病人是否有透前评估数据
4151
 		// 查询病人是否有透前评估数据
4152
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
4152
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
4153
 
4153
 

+ 7 - 0
controllers/mobile_api_controllers/patient_api_controller.go 查看文件

6264
 		endTime = theTime.Unix()
6264
 		endTime = theTime.Unix()
6265
 	}
6265
 	}
6266
 
6266
 
6267
+	if xttime < 1740931200 {
6268
+
6269
+		startTime = 1740326400
6270
+
6271
+		endTime = 1740844800
6272
+	}
6273
+
6267
 	scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(patientInfo.ID, startTime, endTime, adminUserInfo.Org.Id)
6274
 	scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(patientInfo.ID, startTime, endTime, adminUserInfo.Org.Id)
6268
 
6275
 
6269
 	dialysis_count_one := len(scheduleDialyCount)
6276
 	dialysis_count_one := len(scheduleDialyCount)

+ 7 - 1
controllers/print_data_api_controller.go 查看文件

257
 				endTime = theTime.Unix()
257
 				endTime = theTime.Unix()
258
 			}
258
 			}
259
 
259
 
260
+			if item.ScheduleDate < 1740931200 {
261
+
262
+				startTime = 1740326400
263
+
264
+				endTime = 1740844800
265
+			}
266
+
260
 			scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(item.PatientID, startTime, endTime, adminUserInfo.CurrentOrgId)
267
 			scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(item.PatientID, startTime, endTime, adminUserInfo.CurrentOrgId)
261
 
268
 
262
-			fmt.Println("scheduleDialyCount------------------", scheduleDialyCount)
263
 			dialysis_count := len(scheduleDialyCount)
269
 			dialysis_count := len(scheduleDialyCount)
264
 
270
 
265
 			var dialysis_count_str = "一周" + strconv.Itoa(dialysis_count) + "次"
271
 			var dialysis_count_str = "一周" + strconv.Itoa(dialysis_count) + "次"