2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id
+		subscibe.OrgId = 10318 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10318 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12627 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英9675或4
+		subscibe.OrgId = 10318 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10318 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12627 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -2573,13 +2573,13 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 && adminUserInfo.CurrentOrgId != 10723 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -3178,7 +3178,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -952,7 +952,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对患者称重两次没有数据的问题
-		if adminUserInfo.Org.Id == 10702 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 {
 
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3741,6 +3741,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10723 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 		}
 	}
 

controllers/pharmacy_controller.go

@@ -185,8 +185,17 @@ func (this *PharmacyController) IssuedDrug() {
 		etime = stime + 86399
 	}
 
+	var patientsId []int64
+
+	patient, _ := service.GetPatientKeyWord(keyword, orgid)
+	if len(patient) > 0 {
+		for _, item := range patient {
+			patientsId = append(patientsId, item.ID)
+		}
+	}
+
 	//获取排班班次
-	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition, patientsId)
 
 	var ids []int64
 	for _, item := range schedule {
@@ -262,34 +271,19 @@ func (this *PharmacyController) WaitingDrug() {
 		etime = stime + 86399
 	}
 
-	//if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid != 10344 {
-	//	//查询表里当天的数据
-	//	var flist []*models.TmpPatient
-	//	flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
-	//
-	//	if err != nil {
-	//		utils.ErrorLog(err.Error())
-	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-	//
-	//	if err != nil {
-	//		utils.ErrorLog(err.Error())
-	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
-	//	this.ServeSuccessJSON(map[string]interface{}{
-	//		"list":     listt,
-	//		"baseList": baseList,
-	//	})
-	//	return
-	//}
-	fmt.Println(keyword)
+	var patientsId []int64
+
+	patient, _ := service.GetPatientKeyWord(keyword, orgid)
+	fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", patient)
+	if len(patient) > 0 {
+		for _, item := range patient {
+			patientsId = append(patientsId, item.ID)
+		}
+	}
+
 	//当未发药的人数
 	//获取排班班次
-	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition, patientsId)
 	var ids []int64
 	for _, item := range schedule {
 		ids = append(ids, item.PatientId)

service/pharmacy_service.go

@@ -97,7 +97,24 @@ func GetTodayAdviceCount(stime, etime, orgid, is_medicine int64) (num int, err e
 	return len(tmp), err
 }
 
-func GetSchedulePatientId(start_time int64, end_time int64, org_id int64, class_type int64, partion_type int64) (schedule []*models.XtSchedules, err error) {
+func GetPatientKeyWord(keywword string, org_id int64) (patient []*models.XtPatients, err error) {
+
+	db := XTReadDB().Model(&patient).Where("status=1")
+
+	likeKey := "%" + keywword + "%"
+	if len(keywword) > 0 {
+		db = db.Where("name like ? or first_letter like ?", likeKey, likeKey)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	err = db.Find(&patient).Error
+
+	return patient, err
+}
+
+func GetSchedulePatientId(start_time int64, end_time int64, org_id int64, class_type int64, partion_type int64, patientsId []int64) (schedule []*models.XtSchedules, err error) {
 
 	db := XTReadDB().Model(&schedule).Where("status = 1")
 
@@ -118,6 +135,15 @@ func GetSchedulePatientId(start_time int64, end_time int64, org_id int64, class_
 	if partion_type > 0 {
 		db = db.Where("partition_id = ?", partion_type)
 	}
+
+	if len(patientsId) == 0 {
+		db = db.Where("patient_id in(?)", patientsId)
+	}
+
+	if len(patientsId) > 0 {
+		db = db.Where("patient_id in(?)", patientsId)
+	}
+
 	err = db.Find(&schedule).Error
 
 	return schedule, err