历史排班

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #

controllers/his_project_api_controller.go

@@ -331,6 +331,7 @@ func (this *HisProjectApiController) SaveProjectTeam() {
 	tube_color, _ := this.GetInt64("tube_color")
 	team_type, _ := this.GetInt64("team_type")
 	remark := this.GetString("remark")
+	sort, _ := this.GetInt64("sort")
 	//ids := this.GetString("ids")
 	//item_id := this.GetString("item_id")
 
@@ -355,6 +356,7 @@ func (this *HisProjectApiController) SaveProjectTeam() {
 		UserOrgId:   orgId,
 		Status:      1,
 		CreatedTime: time.Now().Unix(),
+		Sort:        sort,
 		//ProjectId:   ids,
 		//ItemId:      item_id,
 	}
@@ -479,7 +481,7 @@ func (this *HisProjectApiController) UpdatedProjectTeam() {
 	tube_color, _ := this.GetInt64("tube_color")
 	team_type, _ := this.GetInt64("team_type")
 	remark := this.GetString("remark")
-
+	sort, _ := this.GetInt64("sort")
 	projectTeam, _ := service.GetProjectTeamDetail(id)
 
 	projectTeam.ProjectTeam = project_team
@@ -489,6 +491,7 @@ func (this *HisProjectApiController) UpdatedProjectTeam() {
 	projectTeam.TubeColor = tube_color
 	projectTeam.TeamType = team_type
 	projectTeam.Remark = remark
+	projectTeam.Sort = sort
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)

controllers/manage_api_controller.go

@@ -4910,19 +4910,19 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 
 	first_start_time := dataBody["first_start_time"].(string)
 
-	if len(first_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var firstStartTimeUnix int64
+	if len(first_start_time) > 0 {
+		firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
+		firstStartTimeUnix = firstStartTime.Unix()
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
 
+	var firstEndTimeUnix int64
 	first_end_time := dataBody["first_end_time"].(string)
 
-	if len(first_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	if len(first_end_time) > 0 {
+		firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
+		firstEndTimeUnix = firstEndTime.Unix()
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -4937,20 +4937,18 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 	sencond_disinfection_time := dataBody["sencond_disinfection_time"].(string)
 
 	sencond_start_time := dataBody["sencond_start_time"].(string)
-
-	if len(sencond_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var sencondStartTimeUnixt int64
+	if len(sencond_start_time) > 0 {
+		sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
+		sencondStartTimeUnixt = sencondStartTime.Unix()
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
-
-	if len(sencond_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var sencondEndTimeUnixt int64
+	if len(sencond_end_time) > 0 {
+		sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
+		sencondEndTimeUnixt = sencondEndTime.Unix()
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -4965,20 +4963,18 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 	third_disinfection_time := dataBody["third_disinfection_time"].(string)
 
 	third_start_time := dataBody["third_start_time"].(string)
-
-	if len(third_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var thirdStartTimeUnix int64
+	if len(third_start_time) > 0 {
+		thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
+		thirdStartTimeUnix = thirdStartTime.Unix()
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
-
-	if len(third_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var thirdEndTimeUnix int64
+	if len(third_end_time) > 0 {
+		thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
+		thirdEndTimeUnix = thirdEndTime.Unix()
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -4993,20 +4989,18 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 	fourth_disinfection_time := dataBody["fourth_disinfection_time"].(string)
 
 	fourth_start_time := dataBody["fourth_start_time"].(string)
-
-	if len(fourth_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var fourthiStartTimeUnitx int64
+	if len(fourth_start_time) > 0 {
+		fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
+		fourthiStartTimeUnitx = fourthStartTime.Unix()
 	}
-	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
 
 	fourth_end_time := dataBody["fourth_end_time"].(string)
-
-	if len(fourth_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var fourthEndTimeUnix int64
+	if len(fourth_end_time) > 0 {
+		fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
+		fourthEndTimeUnix = fourthEndTime.Unix()
 	}
-	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
 
 	fourth_total_time := dataBody["fourth_total_time"].(string)
 
@@ -5020,20 +5014,19 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 	last_disinfection_methods := dataBody["last_disinfection_methods"].(string)
 	last_disinfection_time := dataBody["last_disinfection_time"].(string)
 	last_start_time := dataBody["last_start_time"].(string)
-
-	if len(last_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var lastStartTimeUnix int64
+	if len(last_start_time) > 0 {
+		lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
+		lastStartTimeUnix = lastStartTime.Unix()
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
-	if len(last_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var lastEndTimeUnix int64
+	if len(last_end_time) > 0 {
+		lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
+		lastEndTimeUnix = lastEndTime.Unix()
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -5051,8 +5044,8 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		FirstDisinfectionWater:     first_disinfection_water,
 		FirstDisinfectionMethods:   first_disinfection_methods,
 		FirstDisinfectionTime:      first_disinfection_time,
-		FirstStartTime:             firstStartTime.Unix(),
-		FirstEndTime:               firstEndTime.Unix(),
+		FirstStartTime:             firstStartTimeUnix,
+		FirstEndTime:               firstEndTimeUnix,
 		FirstTotalTime:             first_total_time,
 		FirstIsCheck:               first_is_check,
 		FirstModifications:         first_modifications,
@@ -5060,8 +5053,8 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		SencondDisinfectionWater:   sencond_disinfection_water,
 		SencondDisinfectionMethods: sencond_disinfection_methods,
 		SencondDisinfectionTime:    sencond_disinfection_time,
-		SencondStartTime:           sencondStartTime.Unix(),
-		SencondEndTime:             sencondEndTime.Unix(),
+		SencondStartTime:           sencondStartTimeUnixt,
+		SencondEndTime:             sencondEndTimeUnixt,
 		SencondTotalTime:           sencond_total_time,
 		SencondIsCheck:             sencond_is_check,
 		SencondModifications:       sencond_modifications,
@@ -5069,14 +5062,14 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		ThirdDisinfectionWater:     third_disinfection_water,
 		ThirdDisinfectionMethods:   third_disinfection_methods,
 		ThirdDisinfectionTime:      third_disinfection_time,
-		ThirdStartTime:             thirdStartTime.Unix(),
-		ThirdEndTime:               thirdEndTime.Unix(),
+		ThirdStartTime:             thirdStartTimeUnix,
+		ThirdEndTime:               thirdEndTimeUnix,
 		ThirdTotalTime:             third_total_time,
 		ThirdIsCheck:               third_is_check,
 		ThirdModifications:         third_modifications,
 		ThirdCreator:               third_creator,
-		LastStartTime:              lastStartTime.Unix(),
-		LastEndTime:                lastEndTime.Unix(),
+		LastStartTime:              lastStartTimeUnix,
+		LastEndTime:                lastEndTimeUnix,
 		LastTotalTime:              last_total_time,
 		LastIsCheck:                last_is_check,
 		LastModifications:          last_modifications,
@@ -5087,8 +5080,8 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		FourthDisinfectionWater:    fourth_disinfection_water,
 		FourthDisinfectionMethods:  fourth_disinfection_methods,
 		FourthDisinfectionTime:     fourth_disinfection_time,
-		FourthStartTime:            fourthStartTime.Unix(),
-		FourthEndTime:              fourthEndTime.Unix(),
+		FourthStartTime:            fourthiStartTimeUnitx,
+		FourthEndTime:              fourthEndTimeUnix,
 		FourthTotalTime:            fourth_total_time,
 		FourthIsCheck:              fourth_is_check,
 		FourthModifications:        fourth_modifications,
@@ -5169,8 +5162,9 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println("err", err)
-	id := int64(dataBody["id"].(float64))
 	record_date := dataBody["record_date"].(string)
+
+	id := int64(dataBody["id"].(float64))
 	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recorddateunix := recorddate.Unix()
 
@@ -5180,19 +5174,19 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 
 	first_start_time := dataBody["first_start_time"].(string)
 
-	if len(first_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var firstStartTimeUnix int64
+	if len(first_start_time) > 0 {
+		firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
+		firstStartTimeUnix = firstStartTime.Unix()
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
 
+	var firstEndTimeUnix int64
 	first_end_time := dataBody["first_end_time"].(string)
 
-	if len(first_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	if len(first_end_time) > 0 {
+		firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
+		firstEndTimeUnix = firstEndTime.Unix()
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -5207,20 +5201,18 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	sencond_disinfection_time := dataBody["sencond_disinfection_time"].(string)
 
 	sencond_start_time := dataBody["sencond_start_time"].(string)
-
-	if len(sencond_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var sencondStartTimeUnixt int64
+	if len(sencond_start_time) > 0 {
+		sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
+		sencondStartTimeUnixt = sencondStartTime.Unix()
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
-
-	if len(sencond_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var sencondEndTimeUnixt int64
+	if len(sencond_end_time) > 0 {
+		sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
+		sencondEndTimeUnixt = sencondEndTime.Unix()
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -5235,20 +5227,18 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	third_disinfection_time := dataBody["third_disinfection_time"].(string)
 
 	third_start_time := dataBody["third_start_time"].(string)
-
-	if len(third_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var thirdStartTimeUnix int64
+	if len(third_start_time) > 0 {
+		thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
+		thirdStartTimeUnix = thirdStartTime.Unix()
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
-
-	if len(third_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var thirdEndTimeUnix int64
+	if len(third_end_time) > 0 {
+		thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
+		thirdEndTimeUnix = thirdEndTime.Unix()
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -5263,20 +5253,18 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	fourth_disinfection_time := dataBody["fourth_disinfection_time"].(string)
 
 	fourth_start_time := dataBody["fourth_start_time"].(string)
-
-	if len(fourth_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var fourthiStartTimeUnitx int64
+	if len(fourth_start_time) > 0 {
+		fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
+		fourthiStartTimeUnitx = fourthStartTime.Unix()
 	}
-	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
 
 	fourth_end_time := dataBody["fourth_end_time"].(string)
-
-	if len(fourth_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var fourthEndTimeUnix int64
+	if len(fourth_end_time) > 0 {
+		fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
+		fourthEndTimeUnix = fourthEndTime.Unix()
 	}
-	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
 
 	fourth_total_time := dataBody["fourth_total_time"].(string)
 
@@ -5290,20 +5278,19 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	last_disinfection_methods := dataBody["last_disinfection_methods"].(string)
 	last_disinfection_time := dataBody["last_disinfection_time"].(string)
 	last_start_time := dataBody["last_start_time"].(string)
-
-	if len(last_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var lastStartTimeUnix int64
+	if len(last_start_time) > 0 {
+		lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
+		lastStartTimeUnix = lastStartTime.Unix()
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
-	if len(last_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var lastEndTimeUnix int64
+	if len(last_end_time) > 0 {
+		lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
+		lastEndTimeUnix = lastEndTime.Unix()
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -5322,8 +5309,8 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		FirstDisinfectionWater:     first_disinfection_water,
 		FirstDisinfectionMethods:   first_disinfection_methods,
 		FirstDisinfectionTime:      first_disinfection_time,
-		FirstStartTime:             firstStartTime.Unix(),
-		FirstEndTime:               firstEndTime.Unix(),
+		FirstStartTime:             firstStartTimeUnix,
+		FirstEndTime:               firstEndTimeUnix,
 		FirstTotalTime:             first_total_time,
 		FirstIsCheck:               first_is_check,
 		FirstModifications:         first_modifications,
@@ -5331,8 +5318,8 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		SencondDisinfectionWater:   sencond_disinfection_water,
 		SencondDisinfectionMethods: sencond_disinfection_methods,
 		SencondDisinfectionTime:    sencond_disinfection_time,
-		SencondStartTime:           sencondStartTime.Unix(),
-		SencondEndTime:             sencondEndTime.Unix(),
+		SencondStartTime:           sencondStartTimeUnixt,
+		SencondEndTime:             sencondEndTimeUnixt,
 		SencondTotalTime:           sencond_total_time,
 		SencondIsCheck:             sencond_is_check,
 		SencondModifications:       sencond_modifications,
@@ -5340,14 +5327,14 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		ThirdDisinfectionWater:     third_disinfection_water,
 		ThirdDisinfectionMethods:   third_disinfection_methods,
 		ThirdDisinfectionTime:      third_disinfection_time,
-		ThirdStartTime:             thirdStartTime.Unix(),
-		ThirdEndTime:               thirdEndTime.Unix(),
+		ThirdStartTime:             thirdStartTimeUnix,
+		ThirdEndTime:               thirdEndTimeUnix,
 		ThirdTotalTime:             third_total_time,
 		ThirdIsCheck:               third_is_check,
 		ThirdModifications:         third_modifications,
 		ThirdCreator:               third_creator,
-		LastStartTime:              lastStartTime.Unix(),
-		LastEndTime:                lastEndTime.Unix(),
+		LastStartTime:              lastStartTimeUnix,
+		LastEndTime:                lastEndTimeUnix,
 		LastTotalTime:              last_total_time,
 		LastIsCheck:                last_is_check,
 		LastModifications:          last_modifications,
@@ -5358,8 +5345,8 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		FourthDisinfectionWater:    fourth_disinfection_water,
 		FourthDisinfectionMethods:  fourth_disinfection_methods,
 		FourthDisinfectionTime:     fourth_disinfection_time,
-		FourthStartTime:            fourthStartTime.Unix(),
-		FourthEndTime:              fourthEndTime.Unix(),
+		FourthStartTime:            fourthiStartTimeUnitx,
+		FourthEndTime:              fourthEndTimeUnix,
 		FourthTotalTime:            fourth_total_time,
 		FourthIsCheck:              fourth_is_check,
 		FourthModifications:        fourth_modifications,

controllers/manager_center_api_controller.go

@@ -665,7 +665,7 @@ func (c *ManagerCenterApiController) CreateDrugUnitSafeguard() {
 
 }
 
-//GetPatientsList 取配置信息列表
+// GetPatientsList 取配置信息列表
 func (c *ManagerCenterApiController) GetConfigList() {
 	adminUserInfo := c.GetAdminUserInfo()
 	configList, _ := service.GetDictionaryConfigList(adminUserInfo.CurrentOrgId)
@@ -676,7 +676,7 @@ func (c *ManagerCenterApiController) GetConfigList() {
 
 }
 
-//CreateConfig  创建配置信息
+// CreateConfig  创建配置信息
 func (c *ManagerCenterApiController) CreateConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -917,7 +917,7 @@ func (c *ManagerCenterApiController) DeleteChildConfig() {
 	return
 }
 
-//CreateChildConfig  创建子配置信息
+// CreateChildConfig  创建子配置信息
 func (c *ManagerCenterApiController) CreateChildConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -2126,6 +2126,8 @@ func (c *ManagerCenterApiController) CreateDiagnose() {
 	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 
+	sort, _ := c.GetInt64("sort")
+	fmt.Println("sort-------------------", sort)
 	if len(class_name) <= 0 {
 		utils.ErrorLog("len(class_name) == 0")
 
@@ -2153,6 +2155,7 @@ func (c *ManagerCenterApiController) CreateDiagnose() {
 		Status:             1,
 		Pinyin:             pinyin,
 		Wubi:               wubi,
+		Sort:               sort,
 	}
 
 	err, dealers := service.AddSigleDiagnose(&dealer)
@@ -2182,7 +2185,7 @@ func (c *ManagerCenterApiController) ModifyDiagnose() {
 	remark := c.GetString("remark")
 	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
-
+	sort, _ := c.GetInt64("sort")
 	if id <= 0 {
 		utils.ErrorLog("id == 0")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2215,6 +2218,7 @@ func (c *ManagerCenterApiController) ModifyDiagnose() {
 		Pinyin:             pinyin,
 		Wubi:               wubi,
 		Status:             1,
+		Sort:               sort,
 	}
 
 	err := service.ModifyDiagnose(&dealer)

models/his_models.go

@@ -65,6 +65,7 @@ type XtHisProjectTeam struct {
 	ProjectId   string              `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	ItemId      string              `gorm:"column:item_id" json:"item_id" form:"item_id"`
 	List        []*XtHisProjectList `gorm:"-" json:"list" form:"list"`
+	Sort        int64               `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (XtHisProjectTeam) TableName() string {
@@ -1403,6 +1404,7 @@ type HisXtDiagnoseConfig struct {
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
 	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Sort               int64  `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (HisXtDiagnoseConfig) TableName() string {

service/his_project_service.go

@@ -110,7 +110,7 @@ func GetProjectTeamDetail(id int64) (models.XtHisProjectTeam, error) {
 
 func UpdatedProjectTeam(id int64, team *models.XtHisProjectTeam) error {
 
-	err := XTWriteDB().Model(&team).Where("id=? and status = 1", id).Updates(map[string]interface{}{"project_team": team.ProjectTeam, "price": team.Price, "pinyin": team.Pinyin, "wubi": team.Wubi, "tube_color": team.TubeColor, "team_type": team.TeamType, "remark": team.Remark, "project_id": team.ProjectId, "item_id": team.ItemId}).Error
+	err := XTWriteDB().Model(&team).Where("id=? and status = 1", id).Updates(map[string]interface{}{"project_team": team.ProjectTeam, "price": team.Price, "pinyin": team.Pinyin, "wubi": team.Wubi, "tube_color": team.TubeColor, "team_type": team.TeamType, "remark": team.Remark, "project_id": team.ProjectId, "item_id": team.ItemId, "sort": team.Sort}).Error
 	return err
 }
 

service/patient_service.go

@@ -520,9 +520,16 @@ func GetLapsetoPatientCount(orgID int64, lapseto int64) (total int64) {
 
 func ChechLastDialysisNo(orgID int64) (dialysisNo int64) {
 	var patient models.Patients
-	err := readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=?", orgID).Order("dialysis_no desc").First(&patient).Error
-	if err != nil {
-		return
+	if orgID == 10278 {
+		err := readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=?", orgID).Order("id desc").First(&patient).Error
+		if err != nil {
+			return
+		}
+	} else {
+		err := readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=?", orgID).Order("dialysis_no desc").First(&patient).Error
+		if err != nil {
+			return
+		}
 	}
 
 	if patient.ID == 0 {