Browse Source

耗材参数

XMLWAN 3 years ago
parent
commit
674f74864c

+ 1 - 1
conf/app.conf View File

1
 appname = 血透
1
 appname = 血透
2
-httpport = 9531
2
+httpport = 9529
3
 runmode = dev
3
 runmode = dev
4
 
4
 
5
 #
5
 #

+ 5 - 3
controllers/dialysis_record_api_controller.go View File

783
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
783
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
784
 
784
 
785
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
785
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
786
+				fmt.Println("total23232323232322332", totalMin)
786
 				if (template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36) && adminUserInfo.CurrentOrgId != 9671 {
787
 				if (template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36) && adminUserInfo.CurrentOrgId != 9671 {
787
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
788
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
788
 				}
789
 				}
802
 				}
803
 				}
803
 
804
 
804
 				//针对监利大垸医院
805
 				//针对监利大垸医院
805
-				if adminUserInfo.CurrentOrgId == 10101 {
806
+				if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 9671 {
807
+
806
 					if evaluation.ID > 0 {
808
 					if evaluation.ID > 0 {
807
-						ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
809
+						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
810
+						fmt.Println("ultrafiltration_rate", ultrafiltration_rate)
808
 					}
811
 					}
809
 				}
812
 				}
810
 			}
813
 			}
811
 		}
814
 		}
812
-
813
 		record := models.MonitoringRecord{
815
 		record := models.MonitoringRecord{
814
 			UserOrgId:       adminUserInfo.CurrentOrgId,
816
 			UserOrgId:       adminUserInfo.CurrentOrgId,
815
 			PatientId:       patientID,
817
 			PatientId:       patientID,

+ 3 - 2
controllers/gobal_config_api_controller.go View File

2008
 		endTime = theTime.Unix()
2008
 		endTime = theTime.Unix()
2009
 	}
2009
 	}
2010
 	orgId := c.GetAdminUserInfo().CurrentOrgId
2010
 	orgId := c.GetAdminUserInfo().CurrentOrgId
2011
-	list, err := service.GetDrugCountList(startTime, endTime, orgId)
2011
+
2012
 	countList, err := service.GetMinCountList(startTime, endTime, orgId)
2012
 	countList, err := service.GetMinCountList(startTime, endTime, orgId)
2013
 	outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
2013
 	outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
2014
 	auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
2014
 	auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
2015
 	info, _ := service.GetDrugWarehouOrderInfo(startTime, endTime, orgId)
2015
 	info, _ := service.GetDrugWarehouOrderInfo(startTime, endTime, orgId)
2016
 	cancelCountList, _ := service.GetCancelDrugCountList(startTime, endTime, orgId)
2016
 	cancelCountList, _ := service.GetCancelDrugCountList(startTime, endTime, orgId)
2017
+
2017
 	if err != nil {
2018
 	if err != nil {
2018
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
2019
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
2019
 		return
2020
 		return
2020
 	}
2021
 	}
2021
 	c.ServeSuccessJSON(map[string]interface{}{
2022
 	c.ServeSuccessJSON(map[string]interface{}{
2022
-		"countList":       list,
2023
+
2023
 		"outCountList":    outCountList,
2024
 		"outCountList":    outCountList,
2024
 		"auCountList":     auCountList,
2025
 		"auCountList":     auCountList,
2025
 		"minCount":        countList,
2026
 		"minCount":        countList,

+ 2 - 1
controllers/mobile_api_controllers/dialysis_api_controller.go View File

2469
 			}
2469
 			}
2470
 
2470
 
2471
 			if template.TemplateId == 41 {
2471
 			if template.TemplateId == 41 {
2472
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
2472
+				ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
2473
+				fmt.Println("ultrafiltration_rate000304293929329238328328328328238328328", ultrafiltration_rate)
2473
 				record.UltrafiltrationRate = ultrafiltration_rate
2474
 				record.UltrafiltrationRate = ultrafiltration_rate
2474
 			}
2475
 			}
2475
 		}
2476
 		}

+ 0 - 1
controllers/mobile_api_controllers/doctor_advice_api_controller.go View File

85
 			})
85
 			})
86
 		}
86
 		}
87
 	}
87
 	}
88
-
89
 }
88
 }
90
 
89
 
91
 func (c *DoctorAdviceAPIController) GetAdviceConfigs() {
90
 func (c *DoctorAdviceAPIController) GetAdviceConfigs() {

+ 1 - 0
controllers/patient_api_controller.go View File

463
 	patient.UpdatedTime = time.Now().Unix()
463
 	patient.UpdatedTime = time.Now().Unix()
464
 	patient.IsInfectious = is_infectious
464
 	patient.IsInfectious = is_infectious
465
 	patient.RemindCycle = remind_cycle
465
 	patient.RemindCycle = remind_cycle
466
+	fmt.Println("hhhhh2h32322323332323232323232322323", patient.RemindCycle)
466
 	err := service.UpdatePatient(&patient, contagions, diseases)
467
 	err := service.UpdatePatient(&patient, contagions, diseases)
467
 	if err != nil {
468
 	if err != nil {
468
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)
469
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)

+ 13 - 0
controllers/schedule_api_controller.go View File

66
 	beego.Router("/api/schedule/getscheduletemplate", &ScheduleApiController{}, "Get:GetScheduleTemplate")
66
 	beego.Router("/api/schedule/getscheduletemplate", &ScheduleApiController{}, "Get:GetScheduleTemplate")
67
 	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
67
 	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
68
 	beego.Router("/api/order/getdataprint", &ScheduleApiController{}, "Get:GetDataPrint")
68
 	beego.Router("/api/order/getdataprint", &ScheduleApiController{}, "Get:GetDataPrint")
69
+	beego.Router("/api/schedule/getnextweekpanels", &ScheduleApiController{}, "Get:GetNextWeekPanels")
69
 }
70
 }
70
 
71
 
71
 func (c *ScheduleApiController) GetWeekPanels() {
72
 func (c *ScheduleApiController) GetWeekPanels() {
2671
 	})
2672
 	})
2672
 	return
2673
 	return
2673
 }
2674
 }
2675
+
2676
+func (c *ScheduleApiController) GetNextWeekPanels() {
2677
+	start_time, _ := c.GetInt64("start_time")
2678
+	fmt.Println("start_time", start_time)
2679
+	end_time, _ := c.GetInt64("end_time")
2680
+	fmt.Println("end_time", end_time)
2681
+	orgId := c.GetAdminUserInfo().CurrentOrgId
2682
+	schedule, _ := service.GetNextWeekPanels(start_time, end_time, orgId)
2683
+	c.ServeSuccessJSON(map[string]interface{}{
2684
+		"schedule": schedule,
2685
+	})
2686
+}

+ 1 - 1
service/gobal_config_service.go View File

703
 	if orgid > 0 {
703
 	if orgid > 0 {
704
 		db = db.Where("x.org_id = ?", orgid)
704
 		db = db.Where("x.org_id = ?", orgid)
705
 	}
705
 	}
706
-	err = db.Select("x.count,x.drug_id,x.count_unit").Find(&info).Error
706
+	err = db.Select("sum(x.count) as count,x.drug_id,x.count_unit").Find(&info).Error
707
 	return info, err
707
 	return info, err
708
 
708
 
709
 }
709
 }

+ 6 - 0
service/schedule_service.go View File

975
 	err := XTReadDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Find(&dataPrint).Error
975
 	err := XTReadDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Find(&dataPrint).Error
976
 	return dataPrint, err
976
 	return dataPrint, err
977
 }
977
 }
978
+
979
+func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
980
+
981
+	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Find(&schedule).Error
982
+	return schedule, err
983
+}