耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/dialysis_record_api_controller.go

@@ -783,6 +783,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+				fmt.Println("total23232323232322332", totalMin)
 				if (template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36) && adminUserInfo.CurrentOrgId != 9671 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
@@ -802,14 +803,15 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				}
 
 				//针对监利大垸医院
-				if adminUserInfo.CurrentOrgId == 10101 {
+				if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 9671 {
+
 					if evaluation.ID > 0 {
-						ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+						fmt.Println("ultrafiltration_rate", ultrafiltration_rate)
 					}
 				}
 			}
 		}
-
 		record := models.MonitoringRecord{
 			UserOrgId:       adminUserInfo.CurrentOrgId,
 			PatientId:       patientID,

controllers/gobal_config_api_controller.go

@@ -2008,18 +2008,19 @@ func (c *GobalConfigApiController) GetDrugCountList() {
 		endTime = theTime.Unix()
 	}
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	list, err := service.GetDrugCountList(startTime, endTime, orgId)
+
 	countList, err := service.GetMinCountList(startTime, endTime, orgId)
 	outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
 	auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
 	info, _ := service.GetDrugWarehouOrderInfo(startTime, endTime, orgId)
 	cancelCountList, _ := service.GetCancelDrugCountList(startTime, endTime, orgId)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"countList":       list,
+
 		"outCountList":    outCountList,
 		"auCountList":     auCountList,
 		"minCount":        countList,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2469,7 +2469,8 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			if template.TemplateId == 41 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				fmt.Println("ultrafiltration_rate000304293929329238328328328328238328328", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 		}

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -85,7 +85,6 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 			})
 		}
 	}
-
 }
 
 func (c *DoctorAdviceAPIController) GetAdviceConfigs() {

controllers/patient_api_controller.go

@@ -463,6 +463,7 @@ func (c *PatientApiController) EditPatient() {
 	patient.UpdatedTime = time.Now().Unix()
 	patient.IsInfectious = is_infectious
 	patient.RemindCycle = remind_cycle
+	fmt.Println("hhhhh2h32322323332323232323232322323", patient.RemindCycle)
 	err := service.UpdatePatient(&patient, contagions, diseases)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)

controllers/schedule_api_controller.go

@@ -66,6 +66,7 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/getscheduletemplate", &ScheduleApiController{}, "Get:GetScheduleTemplate")
 	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
 	beego.Router("/api/order/getdataprint", &ScheduleApiController{}, "Get:GetDataPrint")
+	beego.Router("/api/schedule/getnextweekpanels", &ScheduleApiController{}, "Get:GetNextWeekPanels")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -2671,3 +2672,15 @@ func (c *ScheduleApiController) GetDataPrint() {
 	})
 	return
 }
+
+func (c *ScheduleApiController) GetNextWeekPanels() {
+	start_time, _ := c.GetInt64("start_time")
+	fmt.Println("start_time", start_time)
+	end_time, _ := c.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	schedule, _ := service.GetNextWeekPanels(start_time, end_time, orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+}

service/gobal_config_service.go

@@ -703,7 +703,7 @@ func GetAutoDrugCountList(startime int64, endtime int64, orgid int64) (info []*m
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.count,x.drug_id,x.count_unit").Find(&info).Error
+	err = db.Select("sum(x.count) as count,x.drug_id,x.count_unit").Find(&info).Error
 	return info, err
 
 }

service/schedule_service.go

@@ -975,3 +975,9 @@ func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
 	err := XTReadDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Find(&dataPrint).Error
 	return dataPrint, err
 }
+
+func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Find(&schedule).Error
+	return schedule, err
+}