历史排班

controllers/his_api_controller.go

@@ -4536,6 +4536,10 @@ func (c *HisApiController) DeleteProject() {
 				fmt.Println(err)
 			}
 
+		} else {
+			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
+			fmt.Println(err)
+
 		}
 	}
 

controllers/manage_api_controller.go

@@ -4495,7 +4495,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
 
 	first_end_time := dataBody["first_end_time"].(string)
 
@@ -4503,7 +4503,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -4523,7 +4523,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
 
@@ -4531,7 +4531,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -4551,7 +4551,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
 
@@ -4559,7 +4559,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -4575,7 +4575,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
@@ -4583,7 +4583,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -4723,7 +4723,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
 
 	first_end_time := dataBody["first_end_time"].(string)
 
@@ -4731,7 +4731,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -4751,7 +4751,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
 
@@ -4759,7 +4759,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -4779,7 +4779,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
 
@@ -4787,7 +4787,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -4803,7 +4803,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
@@ -4811,7 +4811,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -4912,7 +4912,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
 
 	first_end_time := dataBody["first_end_time"].(string)
 
@@ -4920,7 +4920,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -4940,7 +4940,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
 
@@ -4948,7 +4948,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -4968,7 +4968,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
 
@@ -4976,7 +4976,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -4996,7 +4996,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_start_time)
+	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
 
 	fourth_end_time := dataBody["fourth_end_time"].(string)
 
@@ -5004,7 +5004,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_end_time)
+	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
 
 	fourth_total_time := dataBody["fourth_total_time"].(string)
 
@@ -5023,7 +5023,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
@@ -5031,7 +5031,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -5182,7 +5182,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
 
 	first_end_time := dataBody["first_end_time"].(string)
 
@@ -5190,7 +5190,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -5210,7 +5210,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
 
@@ -5218,7 +5218,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -5238,7 +5238,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
 
@@ -5246,7 +5246,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -5266,7 +5266,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_start_time)
+	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
 
 	fourth_end_time := dataBody["fourth_end_time"].(string)
 
@@ -5274,7 +5274,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_end_time)
+	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
 
 	fourth_total_time := dataBody["fourth_total_time"].(string)
 
@@ -5293,7 +5293,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
@@ -5301,7 +5301,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1077,6 +1077,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			item.ExecutionTime = theTime.Unix()
 			item.IsMobile = 1
 			err = service.SaveHisDoctorAdvice(item)
+			if err == nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             adminInfo.Org.Id,
+					DrugId:                item.DrugId,
+					RecordDate:            item.AdviceDate,
+					PatientId:             item.PatientId,
+					Remark:                "执行成功",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     item.PrescribingNumber,
+					PrescribingNumberUnit: item.PrescribingNumberUnit,
+				}
+				service.CreateDrugError(drugError)
+			}
+
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值

service/manage_service.go

@@ -1046,7 +1046,7 @@ func GetTimeData(equitid int64, orgid int64, timenow int64) (information []*mode
 	//db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
 	//err = db.Raw("select id,date,class,zone,bed_number,patient_id,contagion,dialysis_mode,start_time,end_time,dialysis_hour,hyperfiltratio,weight_loss,warning_value,user_total,move,failure_stage,fault_description,code_information,disinfect_type,disinfectant_type,disinfection,machine_run,fluid_path,disinfectant,disinfection_status,disinfection_residue,long_time,disinfec_startime,disinfec_endtime,dialysis_checked,dialysis_name,norms,dialysis_concentration,germ_checked,germ_name,germ_number,clean,sign_name,status,ctime,mtime,user_org_id,equiment_id,bed,stime from xt_device_information where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= ? and equiment_id = ? and user_org_id = ?",timenow,equitid, orgid).Error
 	day := time.Now().Day()
-	oldMonth := day - 90
+	oldMonth := day - 30
 	t := time.Date(time.Now().Year(), time.Now().Month(), oldMonth, time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
 
 	err = UserReadDB().Model(&information).Where("date>= ? and date <= ? and equiment_id = ? and user_org_id = ? and dialysis_checked = 1 ", t.Unix(), timenow, equitid, orgid).Find(&information).Error

service/mobile_dialysis_service.go

@@ -7239,7 +7239,7 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 
 func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPatientDryweight, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Order("id asc").Limit(6).Find(&weight).Error
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Order("id desc").Limit(6).Find(&weight).Error
 
 	return weight, err
 }