1

conf/app.conf

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

controllers/base_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -69,36 +70,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-	
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 9675
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 9675
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 3877
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
@@ -315,35 +316,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 9675
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 9675
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 3877
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/dialysis_api_controller.go

@@ -1348,7 +1348,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	remark := c.GetString("remark")
 	puncture_method := c.GetString("puncture_method")
 
-	dialysis_count, _ := c.GetInt64("dialysis_count", 0)
+	//dialysis_count, _ := c.GetInt64("dialysis_count", 0)
+	dialysis_count := c.GetString("dialysis_count")
 	emergency_treatment, _ := c.GetInt64("emergency_treatment", 0)
 	emergency_treatment_other := c.GetString("emergency_treatment_other")
 	ductus_arantii := c.GetString("ductus_arantii")
@@ -1365,14 +1366,15 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 	is_infect, _ := c.GetInt64("is_infect", 0)
 	exposed, _ := c.GetFloat("exposed", 0)
-	//skin, _ := c.GetInt64("skin", 0)
 	skin := c.GetString("skin")
 	skin_other := c.GetString("skin_other")
 	infect_other := c.GetString("infect_other")
 	ductus_arantii_other := c.GetString("ductus_arantii_other")
 	machine_type := c.GetString("machine_type")
 	puncture_needle := c.GetString("puncture_needle")
-	humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
+	//humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
+
+	humor_excessive_symptom := c.GetString("humor_excessive_symptom")
 	phinholing := c.GetString("pinholing")
 
 	catheter_suture := c.GetString("catheter_suture")

controllers/doctors_api_controller.go

@@ -62,6 +62,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	delivery_way := c.GetString("delivery_way")
 	schedule_type, _ := c.GetInt64("schedule_type")
 	partition_type, _ := c.GetInt64("partition_type")
+	patient_id, _ := c.GetInt64("patient_id")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -80,10 +81,29 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
-	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type)
-	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type)
+	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id)
+	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id)
 
-	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type)
+	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
+
+	index := 0
+	for _, item := range project {
+		for _, subItem := range item.HisPrescriptionTeamProject {
+
+			if subItem.HisProject.CostClassify != 3 {
+				subItem.IsCheckTeam = 2
+				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+			}
+
+			if subItem.HisProject.CostClassify == 3 {
+				subItem.IsCheckTeam = 1
+				index = index + 1
+				if index == 1 {
+					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+				}
+			}
+		}
+	}
 
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)

controllers/drug_stock_api_contorller.go

@@ -755,7 +755,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 			if item.WarehousingCount == warehouseInfo.WarehousingCount {
 				errs = service.UpDateDrugWarehousingInfo(item)
-				break
 			}
 		}
 	}

controllers/his_api_controller.go

@@ -3249,7 +3249,7 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 		}
 
-		allTotal := fmt.Sprintf("%.2f", total)
+		allTotal := fmt.Sprintf("%.4f", total)
 		totals, _ := strconv.ParseFloat(allTotal, 64)
 		order := &models.HisOrder{
 			UserOrgId:             adminUser.CurrentOrgId,
@@ -3294,8 +3294,8 @@ func (c *HisApiController) GetUploadInfo() {
 					cus := &Custom{
 						AdviceId:         subItem.ID,
 						ProjectId:        0,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.MedListCodg,
@@ -3309,10 +3309,10 @@ func (c *HisApiController) GetUploadInfo() {
 					cus := &Custom{
 						AdviceId:         0,
 						ProjectId:        subItem.ID,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*float64(subItem.Count)),
+						Cut:              fmt.Sprintf("%.4f", float64(subItem.Count)),
 						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 						MedListCodg:      subItem.MedListCodg,
 						Type:             2,
 					}
@@ -3324,10 +3324,10 @@ func (c *HisApiController) GetUploadInfo() {
 					ItemId:           item.ID,
 					AdviceId:         0,
 					ProjectId:        0,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
-					Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
+					DetItemFeeSumamt: fmt.Sprintf("%.4f", item.Price),
+					Cut:              fmt.Sprintf("%.4f", float64(item.Count)),
 					FeedetlSn:        item.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", float64(item.Price)),
+					Price:            fmt.Sprintf("%.4f", float64(item.Price)),
 					MedListCodg:      item.XtHisAddtionConfig.Code,
 					Type:             3,
 				}
@@ -5225,6 +5225,15 @@ func (c *HisApiController) PreSettle() {
 	}
 }
 
+type CustomOrderInfo struct {
+	Name  string
+	Spec  string
+	Unit  string
+	Count float64
+	Price float64
+	Total float64
+}
+
 func (c *HisApiController) GetPrivateExpensesInfo() {
 	order_id, _ := c.GetInt64("id", 0)
 	his_patient_id, _ := c.GetInt64("his_patient_id", 0)
@@ -5238,16 +5247,56 @@ func (c *HisApiController) GetPrivateExpensesInfo() {
 	his, _ := service.GetHisPatientByIdThree(his_patient_id)
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 	adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
-	order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
+	//order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
+
+	orderInfos, _ := service.GetHisOrderInfoByNumberOne(order.Number)
+	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
+	orderInfos_three, _ := service.GetHisOrderInfoByNumberThree(order.Number)
+
+	var orderInfos_four []*models.HisOrderInfoTwo
+	for _, item := range orderInfos_three {
+		if item.HisPrescriptionProject.HisProject.CostClassify == 3 {
+			item.HisPrescriptionProject.IsCheckTeam = 1
+			orderInfos_four = append(orderInfos_four, item)
+
+		}
+		if item.HisPrescriptionProject.HisProject.CostClassify != 3 {
+			item.HisPrescriptionProject.IsCheckTeam = 2
+			orderInfos_two = append(orderInfos_two, item)
+		}
+	}
+
+	new_order_info := RemoveRepeatedTeam(orderInfos_four)
+	var cus_slice []CustomOrderInfo
+	for _, item := range new_order_info {
+		var cus CustomOrderInfo
+		cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
+		cus.Unit = ""
+		cus.Spec = ""
+		var total float64
+		for _, subItem := range orderInfos_four {
+			if item.HisPrescriptionProject.TeamId == subItem.HisPrescriptionProject.TeamId {
+				total = total + subItem.DetItemFeeSumamt
+				fmt.Println(subItem.DetItemFeeSumamt)
+			}
+		}
+		cus.Count = 1
+		cus.Total = total
+		cus_slice = append(cus_slice, cus)
+	}
+
+	orderInfos = append(orderInfos, orderInfos_two...)
+
 	patient, _ := service.GetPatientByID(org_id, order.PatientId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order":         order,
-		"order_info":    order_info,
-		"patient":       patient,
-		"admin_info":    adminInfo,
-		"his":           his,
-		"current_admin": role,
-		"org_config":    miConfig,
+		"order":          order,
+		"order_info":     orderInfos,
+		"patient":        patient,
+		"admin_info":     adminInfo,
+		"his":            his,
+		"current_admin":  role,
+		"org_config":     miConfig,
+		"new_order_info": cus_slice,
 	})
 
 }
@@ -5411,3 +5460,20 @@ func (c *HisApiController) GetAllOrder() {
 	return
 
 }
+
+func RemoveRepeatedTeam(arr []*models.HisOrderInfoTwo) (newArr []*models.HisOrderInfoTwo) {
+	newArr = make([]*models.HisOrderInfoTwo, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].HisPrescriptionProject.TeamId == arr[j].HisPrescriptionProject.TeamId {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -379,6 +379,23 @@ func (this *DialysisAPIController) DialysisRecord() {
 	_, is_project_open_config := service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
 
 	projects, _ := service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
+	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
+
+	var team_projects []*models.HisPrescriptionProject
+	var index int64 = 0
+	for _, item := range temp_team_projects {
+		//组套里面非检验项目的
+		if item.HisProject.CostClassify != 3 {
+			projects = append(projects, item)
+		}
+		//组套里面检验项目的
+		if item.HisProject.CostClassify == 3 {
+			index = index + 1
+			if index == 1 {
+				team_projects = append(team_projects, item)
+			}
+		}
+	}
 
 	stockType, _ := service.GetStockType(adminInfo.Org.Id)
 
@@ -446,6 +463,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"prescribeOne":                   prescribeOne,
 		"is_project_open_config":         is_project_open_config,
 		"project":                        projects,
+		"team_projects":                  team_projects,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -1001,7 +1019,9 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		assessmentAfterDislysis.CreatedTime = assessmentAfter.CreatedTime
 		assessmentAfterDislysis.ID = assessmentAfter.ID
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
+
 		if err == nil {
+			fmt.Println("hhhhhhhhhhh0000000000", err)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
 			})

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -44,6 +44,26 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	if project_config.IsOpen == 1 || project_config.IsOpen == 2 {
 		//获取his医嘱数据
 		project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+		//team_project, _ := service.GetMobileHisPrescriptionTeamProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+		index := 0
+		for _, item := range project {
+			for _, subItem := range item.HisPrescriptionTeamProject {
+
+				if subItem.HisProject.CostClassify != 3 {
+					subItem.IsCheckTeam = 2
+					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+				}
+
+				if subItem.HisProject.CostClassify == 3 {
+					subItem.IsCheckTeam = 1
+					index = index + 1
+					if index == 1 {
+						item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+					}
+				}
+			}
+		}
+
 		hisAdvices, _ := service.GetHisDoctorAdvicesTwo(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
 		if err != nil {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1936,10 +1936,7 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		blood_access_part_id := dataBody["blood_access_part_id"].(string)
 		evaluation.BloodAccessPartId = blood_access_part_id
 	}
-	//if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "float64" {
-	//	blood_access_part_id := int64(dataBody["blood_access_part_id"].(float64))
-	//	evaluation.BloodAccessPartId = blood_access_part_id
-	//}
+
 	if dataBody["blood_access_part_opera_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_opera_id"]).String() == "float64" {
 		blood_access_part_opera_id := int64(dataBody["blood_access_part_opera_id"].(float64))
 		evaluation.BloodAccessPartOperaId = blood_access_part_opera_id
@@ -1958,9 +1955,6 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		is_hemorrhage, _ := strconv.ParseInt(ishemorrhage, 10, 64)
 		evaluation.IsHemorrhage = is_hemorrhage
 
-		//if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
-		//	is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
-		//	fmt.Println("is_hemorrhage2222222222222222",is_hemorrhage)
 		if is_hemorrhage != 1 && is_hemorrhage != 2 {
 			is_hemorrhage = 0
 		}
@@ -2031,8 +2025,8 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 	if dataBody["dialysis_count"] != nil && reflect.TypeOf(dataBody["dialysis_count"]).String() == "string" {
 		dialysis_count, _ := dataBody["dialysis_count"].(string)
-		count, _ := strconv.ParseInt(dialysis_count, 10, 64)
-		evaluation.DialysisCount = count
+		//count, _ := strconv.ParseInt(dialysis_count, 10, 64)
+		evaluation.DialysisCount = dialysis_count
 	}
 
 	if dataBody["is_infect"] != nil && reflect.TypeOf(dataBody["is_infect"]).String() == "string" {
@@ -2072,8 +2066,8 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		evaluation.PunctureNeedle = punctureNeedle
 	}
 
-	if dataBody["humor_excessive_symptom"] != nil && reflect.TypeOf(dataBody["humor_excessive_symptom"]).String() == "float64" {
-		humor_excessive_symptom := int64(dataBody["humor_excessive_symptom"].(float64))
+	if dataBody["humor_excessive_symptom"] != nil && reflect.TypeOf(dataBody["humor_excessive_symptom"]).String() == "string" {
+		humor_excessive_symptom := dataBody["humor_excessive_symptom"].(string)
 		evaluation.HumorExcessiveSymptom = humor_excessive_symptom
 	}
 
@@ -3328,6 +3322,8 @@ func (this *PatientApiController) GetSearchPatient() {
 func (c *PatientApiController) ExecProject() {
 	execution_time := c.GetString("execution_time")
 	project_id, _ := c.GetInt64("project_id")
+	team_id, _ := c.GetInt64("team_id")
+	is_check_team, _ := c.GetInt64("is_check_team")
 
 	if len(execution_time) <= 0 {
 		utils.ErrorLog("execution_time")
@@ -3343,6 +3339,7 @@ func (c *PatientApiController) ExecProject() {
 		return
 	}
 	adminInfo := c.GetMobileAdminUserInfo()
+
 	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
 	if project.ExecutionState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
@@ -3352,29 +3349,63 @@ func (c *PatientApiController) ExecProject() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 		return
 	}
-
 	project.ExecutionState = 1
 	project.ExecutionStaff = adminInfo.AdminUser.Id
 	project.ExecutionTime = theTime.Unix()
-	err := service.SaveHisProject(&project)
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"project": project,
-		})
+	if team_id == 0 {
+
+		err := service.SaveHisProject(&project)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"project": project,
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+
+		}
 	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+		if is_check_team == 2 { //虽然是组套数据，但不是检验项目
 
-	}
+			err := service.SaveHisProject(&project)
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+		} else {
+			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
+			var ids []int64
+			for _, items := range ps {
+				ids = append(ids, items.ID)
+			}
+			err := service.UpdateTeamProjectExceStatus(ids, adminInfo.AdminUser.Id, theTime.Unix())
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+		}
 
+	}
 }
 
 func (c *PatientApiController) CheckProject() {
 
 	adminInfo := c.GetMobileAdminUserInfo()
 	project_id, _ := c.GetInt64("project_id")
-	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
+	team_id, _ := c.GetInt64("team_id")
+	is_check_team, _ := c.GetInt64("is_check_team")
 
+	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
 	if project.CheckState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
 		return
@@ -3387,18 +3418,52 @@ func (c *PatientApiController) CheckProject() {
 	project.Checker = adminInfo.AdminUser.Id
 	project.CheckTime = time.Now().Unix()
 	project.CheckState = 1
+	if team_id == 0 {
+		err := service.SaveHisProject(&project)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":     "ok",
+				"project": project,
+			})
 
-	err := service.SaveHisProject(&project)
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
 
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":     "ok",
-			"project": project,
-		})
+		}
 
 	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+		if is_check_team == 2 { //虽然是组套数据，但不是检验项目
+			err := service.SaveHisProject(&project)
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "ok",
+					"project": project,
+				})
+
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+
+		} else {
+			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
+			var ids []int64
+			for _, items := range ps {
+				ids = append(ids, items.ID)
+			}
+			err := service.UpdateTeamProjectCheckStatus(ids, project.PatientId, project.RecordDate, project.UserOrgId, adminInfo.AdminUser.Id, time.Now().Unix())
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+		}
 
 	}
 

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -5,8 +5,12 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"reflect"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -417,3 +421,222 @@ func (this *StaffScheduleApiController) UpdateBloodSchedule() {
 		service.UpdateDialysisPrescriptionOne(prescription, patient_id, startTime)
 	}
 }
+
+func (this *StaffScheduleApiController) GetSchedulePatient() {
+
+	schedule, _ := this.GetInt64("schedule", 0) //1已2未
+	contagion, _ := this.GetInt64("contagion", 0)
+	keywords := this.GetString("keywords", "")
+	adminInfo := this.GetAdminUserInfo()
+
+	thisTime := time.Now()
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	thisWeekEnd := 7 - weekDay
+	weekStartPoint := thisWeekEnd - 6
+	weekStartDay := thisTime.AddDate(0, 0, weekStartPoint)
+	weekEndPoint := thisWeekEnd + 7
+	weekEndDay := thisTime.AddDate(0, 0, weekEndPoint)
+	fmt.Println(weekStartPoint, weekStartDay, weekEndPoint, weekEndDay)
+
+	weekStartTime := weekStartDay.Format("2006-01-02") + " 00:00:00"
+	weekEndTime := weekEndDay.Format("2006-01-02") + " 23:59:59"
+	fmt.Println(weekStartTime, weekEndTime)
+
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+	weekStart := theStarTime.Unix()
+	weekEnd := theEndTime.Unix()
+
+	patients, _ := service.GetPatientWithScheduleAndSolution(adminInfo.CurrentOrgId, keywords, weekStart, weekEnd, schedule, contagion)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patients": patients,
+	})
+	return
+}
+
+func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
+
+	patientID, _ := c.GetInt64("patient_id", 0)
+	if patientID <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	patientInfo, _ := service.FindPatientById(adminUserInfo.CurrentOrgId, patientID)
+	if patientInfo.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+
+	var schedule models.Schedule
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if dataBody["schedule_date"] == nil || reflect.TypeOf(dataBody["schedule_date"]).String() != "string" {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	scheduleDate, _ := dataBody["schedule_date"].(string)
+	if len(scheduleDate) == 0 {
+		utils.ErrorLog("len(schedule_date) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", scheduleDate+" 00:00:00", loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.ScheduleDate = theTime.Unix()
+
+	timeNow := time.Now().Format("2006-01-02")
+	if timeNow > scheduleDate {
+		utils.ErrorLog(timeNow)
+		utils.ErrorLog(scheduleDate)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
+		return
+	}
+
+	if dataBody["schedule_type"] == nil || reflect.TypeOf(dataBody["schedule_type"]).String() != "float64" {
+		utils.ErrorLog("schedule_type")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	scheduleType := int64(dataBody["schedule_type"].(float64))
+	if scheduleType < 1 || scheduleType > 3 {
+		utils.ErrorLog("scheduleType < 3")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.ScheduleType = scheduleType
+
+	if dataBody["bed_id"] == nil || reflect.TypeOf(dataBody["bed_id"]).String() != "float64" {
+		utils.ErrorLog("bed_id")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	bedId := int64(dataBody["bed_id"].(float64))
+	if bedId < 1 {
+		utils.ErrorLog("bedId < 1")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.BedId = bedId
+
+	if dataBody["partition_id"] == nil || reflect.TypeOf(dataBody["partition_id"]).String() != "float64" {
+		utils.ErrorLog("partition_id")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	partitionId := int64(dataBody["partition_id"].(float64))
+	if partitionId < 1 {
+		utils.ErrorLog("partitionId < 1")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.PartitionId = partitionId
+
+	if dataBody["schedule_week"] == nil || reflect.TypeOf(dataBody["schedule_week"]).String() != "float64" {
+		utils.ErrorLog("schedule_week")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	scheduleWeek := int64(dataBody["schedule_week"].(float64))
+	if scheduleWeek < 1 || scheduleWeek > 7 {
+		utils.ErrorLog("scheduleWeek < 1")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.ScheduleWeek = scheduleWeek
+
+	if dataBody["mode_id"] == nil || reflect.TypeOf(dataBody["mode_id"]).String() != "float64" {
+		utils.ErrorLog("mode_id")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	modeId := int64(dataBody["mode_id"].(float64))
+	if modeId < 1 && modeId > 14 {
+		utils.ErrorLog("modeId < 1")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.ModeId = modeId
+
+	schedule.PatientId = patientID
+	schedule.CreatedTime = time.Now().Unix()
+	schedule.UpdatedTime = time.Now().Unix()
+	schedule.Status = 1
+	schedule.UserOrgId = adminUserInfo.CurrentOrgId
+
+	bed, _ := service.GetDeviceNumberByID(adminUserInfo.CurrentOrgId, schedule.BedId)
+	if bed == nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeviceNumberNotExist)
+		return
+	}
+	if bed.ZoneID != schedule.PartitionId {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeviceNumberNotTheZone)
+		return
+	}
+
+	scheduleDateStart := scheduleDate + " 00:00:00"
+	scheduleDateEnd := scheduleDate + " 23:59:59"
+	timeLayout = "2006-01-02 15:04:05"
+	theStartTime, _ := time.ParseInLocation(timeLayout, scheduleDateStart, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, scheduleDateEnd, loc)
+	startTime := theStartTime.Unix()
+	endTime := theEndTime.Unix()
+
+	//一天只有排班一次
+	daySchedule, err := service.GetDaySchedule(adminUserInfo.CurrentOrgId, startTime, endTime, patientID)
+	if daySchedule.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleAgainOneDay)
+		return
+	}
+
+	//同天同位置只能排一个
+	pointSchedule, err := service.GetPointSchedule(adminUserInfo.CurrentOrgId, schedule.ScheduleDate, schedule.ScheduleWeek, schedule.ScheduleType, schedule.BedId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if pointSchedule.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePointScheduleExist)
+		return
+	}
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	err = service.CreateSchedule(&schedule)
+
+	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	redis.Set(key, "", time.Second)
+
+	fmt.Println(err)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateScheduleFail)
+		return
+	}
+	schedule.Patient = patientInfo.Name
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":      "ok",
+		"schedule": schedule,
+	})
+	return
+
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -21,4 +21,6 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/ssearchpatient", &StaffScheduleApiController{}, "Get:SearchPatient")
 	beego.Router("/m/api/updatepatientschedule", &StaffScheduleApiController{}, "Get:UpdatePatientScheduleById")
 	beego.Router("/m/api/updateschedule", &StaffScheduleApiController{}, "Get:UpdateBloodSchedule")
+	beego.Router("m/api/schedule/patients", &StaffScheduleApiController{}, "Get:GetSchedulePatient")
+	beego.Router("/m/api/schedule/create", &StaffScheduleApiController{}, "Post:CreateMobileSchedulePatient")
 }

controllers/stock_in_api_controller.go

@@ -690,6 +690,10 @@ func (c *StockManagerApiController) EditWarehouse() {
 				}
 
 				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
+				flowStock := models.VmStockFlow{
+					Count: item.WarehousingCount,
+				}
+				service.UpdatedStockFlowByGoodId(item.WarehousingId, item.GoodId, flowStock)
 				//改变库存
 				good, _ := service.GetLastInfoMationById(info.GoodId)
 				warhouseCount := strconv.FormatInt(total, 10)
@@ -734,7 +738,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 					Remark:           item.Remark,
 				}
 				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
-				break
 			}
 
 		}
@@ -5339,7 +5342,7 @@ func (this *StockManagerApiController) GetReportStockList() {
 	fmt.Println("startTime", startTime, "endTime", endTime)
 	//list, total, _ := service.GetReportStockList(startTime, endTime, orgId, keyword, page, limit)
 
-	list, total, _ := service.GetStockDamagedList(orgId, keyword, page, limit)
+	list, total, _ := service.GetStockDamagedList(orgId, keyword, page, limit, startTime, endTime)
 	damageList, _ := service.GetStockDamagedCount(orgId)
 	doctorlist, _ := service.GetAllDoctorThree(orgId)
 
@@ -6482,9 +6485,12 @@ func (this *StockManagerApiController) SaveStockInventoryList() {
 func (this *StockManagerApiController) GetDamageDetailByGoodId() {
 
 	good_id, _ := this.GetInt64("good_id")
-	list, _ := service.GetDamageDetailByGoodId(good_id)
+	warehousing_order := this.GetString("warehousing_order")
+	inventory_type, _ := this.GetInt64("type")
+	fmt.Println("inventory_type23232323223322332", inventory_type)
+	list, _ := service.GetDamageDetailByGoodId(good_id, warehousing_order, inventory_type)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	damageList, _ := service.GetStockDamagedCount(orgId)
+	damageList, _ := service.GetStockDamagedCountOne(orgId, warehousing_order, inventory_type)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":       list,
 		"damageList": damageList,

models/device_models.go

@@ -1056,16 +1056,17 @@ type VmXtSchedule struct {
 }
 
 type PatientDeviceNumber struct {
-	ID       int64           `gorm:"column:id" json:"id" form:"id"`
-	OrgId    int64           `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Number   string          `gorm:"column:number" json:"number" form:"number"`
-	GroupId  int64           `gorm:"column:group_id" json:"group_id" form:"group_id"`
-	ZoneId   int64           `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
-	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"`
-	Schedule []*BlodSchedule `json:"schedule" gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
+	ID         int64           `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64           `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number     string          `gorm:"column:number" json:"number" form:"number"`
+	GroupId    int64           `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId     int64           `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	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"`
+	DeviceZone DeviceZone      `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneId;"`
+	Schedule   []*BlodSchedule `json:"schedule" gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
 }
 
 func (PatientDeviceNumber) TableName() string {

models/dialysis.go

@@ -287,7 +287,7 @@ type PredialysisEvaluation struct {
 	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii"`
 	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment"`
 	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other"`
-	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count"`
+	DialysisCount                  string  `gorm:"column:dialysis_count" json:"dialysis_count"`
 	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type"`
@@ -301,7 +301,7 @@ type PredialysisEvaluation struct {
 	LastPostDialysisOther          string  `gorm:"column:last_post_dialysis_other" json:"last_post_dialysis_other"`
 	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other"`
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other"`
-	HumorExcessiveSymptom          int64   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
+	HumorExcessiveSymptom          string  `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
 	Phinholing                     string  `gorm:"column:pinholing" json:"pinholing" form:"pinholing"`
 	CatheterSuture                 string  `gorm:"column:catheter_suture" json:"catheter_suture" form:"catheter_suture"`
 	CatheterSutureOther            string  `gorm:"column:catheter_suture_other" json:"catheter_suture_other" form:"catheter_suture_other"`
@@ -862,7 +862,7 @@ type XtDialysisOrders struct {
 	FinishCreator  int64  `gorm:"column:finish_creator" json:"finish_creator" form:"finish_creator"`
 	FinishModifier int64  `gorm:"column:finish_modifier" json:"finish_modifier" form:"finish_modifier"`
 	SchedualType   int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
-	Number         int64  `gorm:"column:number" json:"number" form:"number"`
+	Number         string `gorm:"column:number" json:"number" form:"number"`
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	ModeId         int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`

models/his_models.go

@@ -778,6 +778,7 @@ type HisPrescriptionProject struct {
 	FrequencyType int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
 	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
 	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam   int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -1015,6 +1016,49 @@ func (HisOrderInfo) TableName() string {
 	return "his_order_info"
 }
 
+type HisOrderInfoTwo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag      string  `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag   string  `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	Memo             string  `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt      float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag      string  `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag   string  `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag      string  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId     int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+
+	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+}
+
+func (HisOrderInfoTwo) TableName() string {
+	return "his_order_info"
+}
+
 type VMHisPatient struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`

service/dialysis_service.go

@@ -1233,3 +1233,35 @@ func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (ad
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
 	return
 }
+
+func UpdateTeamProjectExceStatus(ids []int64, admin_user_id int64, execution_time int64) (err error) {
+	ut := writeDb.Begin()
+	db := ut.Model(&models.HisPrescriptionProject{})
+	err = db.Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_state": 1, "execution_staff": admin_user_id}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+
+	ut.Commit()
+	return err
+
+}
+
+func UpdateTeamProjectCheckStatus(ids []int64, patient_id int64, record_date int64, user_org_id int64, admin_user_id int64, check_time int64) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.HisPrescriptionProject{}).Where("status = 1   AND id IN (?) AND patient_id = ? AND user_org_id = ? AND record_date = ?", ids, patient_id, user_org_id, record_date).Updates(map[string]interface{}{"check_time": check_time, "check_state": 1, "checker": admin_user_id}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+
+	ut.Commit()
+	return err
+
+}
+
+func GetCheckTeamProject(team_id int64, patient_id int64, record_date int64, user_org_id int64) (ps []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Joins("JOIN xt_his_project as p On p.id = his_prescription_project.project_id AND p.cost_classify = 3").Where("his_prescription_project.team_id IN (?) AND his_prescription_project.patient_id = ? AND his_prescription_project.user_org_id = ? AND his_prescription_project.record_date = ? AND his_prescription_project.status = 1", team_id, patient_id, user_org_id, record_date).Find(&ps).Error
+	return
+}

service/doctor_schedule_service.go

@@ -607,7 +607,7 @@ func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64) (li
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("DeviceZone", "status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
 		return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ?", orgid, schedule_date).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1").Preload("BloodDialysisPrescription", "status = 1")
 	}).Find(&list).Error
 

service/his_service.go

@@ -1585,6 +1585,43 @@ func GetHisOrderDetailByNumber(order_number string, org_id int64) (order []*HisO
 	return
 }
 
+//func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo, err error) {
+//	db := readDb.Model(&models.HisOrderInfo{}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+//		return db.Preload("BaseDrugLib", "status = 1").Where("status = 1")
+//	})
+//	err = db.Where("order_number = ? AND status = 1 AND advice_id > 0", order_number).Find(&order).Error
+//	return
+//}
+
+func GetHisOrderInfoByNumberOne(order_number string) (order []*models.HisOrderInfoTwo, err error) {
+	db := readDb.Model(&models.HisOrderInfoTwo{}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("Drug", "status = 1").Where("status = 1")
+	})
+	err = db.Where("order_number = ? AND status = 1 AND advice_id > 0", order_number).Find(&order).Error
+	return
+}
+
+func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfoTwo, err error) {
+	db := readDb.Model(&models.HisOrderInfoTwo{})
+	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id = 0")
+	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
+	})
+	err = db.Where("his_order_info.order_number = ? AND his_order_info.status = 1 AND his_order_info.project_id > 0 ", order_number).Find(&order).Error
+	return
+}
+
+func GetHisOrderInfoByNumberThree(order_number string) (order []*models.HisOrderInfoTwo, err error) {
+	db := readDb.Model(&models.HisOrderInfoTwo{})
+	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id > 0")
+
+	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
+	})
+	err = db.Where("his_order_info.order_number = ? AND his_order_info.status = 1 AND his_order_info.project_id > 0", order_number).Find(&order).Error
+	return
+}
+
 type MedicalInsuranceCostCompare struct {
 	ID        int64   `gorm:"column:id" json:"id" form:"id"`
 	StartTime int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
@@ -1986,7 +2023,12 @@ func GetHisPrescriptionProjectsByID(id int64) (projects []*models.HisPrescriptio
 }
 
 func GetHisPrescriptionProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1", user_org_id, patient_id, record_time).Find(&projects).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id = 0", user_org_id, patient_id, record_time).Find(&projects).Error
+	return
+}
+
+func GetHisPrescriptionTeamProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id > 0", user_org_id, patient_id, record_time).Find(&projects).Error
 	return
 }
 

service/mobile_dialysis_service.go

@@ -1181,7 +1181,10 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 			}).
 			Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
@@ -1202,7 +1205,10 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
 			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 			}).
 			Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
@@ -2070,20 +2076,21 @@ func (HisMScheduleDoctorAdviceVMOne) TableName() string {
 }
 
 type HisMScheduleProjectVM struct {
-	ID                     int64                            `gorm:"column:id" json:"id"`
-	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId            int64                            `gorm:"column:partition_id" json:"partition_id"`
-	BedId                  int64                            `gorm:"column:bed_id" json:"bed_id"`
-	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate           int64                            `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
-	Status                 int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
-	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
-	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
-	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	ID                         int64                            `gorm:"column:id" json:"id"`
+	UserOrgId                  int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId                int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId                      int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId                  int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate               int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType               int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                     int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status                     int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder              *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient            *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber               *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	Prescription               *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	HisPrescriptionProject     []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	HisPrescriptionTeamProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"team_project"`
 }
 
 func (HisMScheduleProjectVM) TableName() string {
@@ -2150,76 +2157,157 @@ func GetHisDoctorAdviceCount(startime int64, endtime int64, deliveway string, or
 	return advice, err
 }
 
-func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64) ([]*MScheduleDoctorAdviceVM, error) {
+func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	adviceCondition := []interface{}{}
 	if adviceType == 0 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			}
 
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?)"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
+
 		}
 
 	} else if adviceType == 1 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			}
 
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0 and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		}
 
 	} else if adviceType == 3 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ? and patient_id = ?  "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			}
+
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0 and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
+
 		}
 
 	} else if adviceType == 2 && len(deliverWay) > 0 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+			}
+
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+			if patient_id > 0 {
+
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+			}
+
 		}
 
 	} else if adviceType == 2 && len(deliverWay) <= 0 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			}
+
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
+
 		}
 
 	}
@@ -2249,7 +2337,7 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 	return vms, err
 }
 
-func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string, scheduleType int64, partitionType int64) ([]*HisMScheduleDoctorAdviceVM, error) {
+func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string, scheduleType int64, partitionType int64, patient_id int64) ([]*HisMScheduleDoctorAdviceVM, error) {
 
 	var vms []*HisMScheduleDoctorAdviceVM
 	if len(deliverWay) > 0 {
@@ -2260,19 +2348,36 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 		if partitionType > 0 {
 			db = db.Where("partition_id = ?", partitionType)
 		}
-		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
-			Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+		if patient_id > 0 {
+			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id =?", orgID, patient_id).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and patient_id = ?", orgID, scheduleDate, deliverWay, patient_id).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else {
+			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
 		}
-		err = db.Find(&vms).Error
+
 	} else {
 		db := readDb.Table("xt_schedule")
 		if scheduleType > 0 {
@@ -2281,19 +2386,36 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 		if partitionType > 0 {
 			db = db.Where("partition_id = ?", partitionType)
 		}
-		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
-			Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+		if patient_id > 0 {
+			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id = ?", orgID, patient_id).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else {
+			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
 		}
-		err = db.Find(&vms).Error
+
 	}
 
 	return vms, err
@@ -2423,25 +2545,74 @@ func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64
 	return
 }
 
-func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleProjectVM, error) {
+func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64, patient_id int64) ([]*HisMScheduleProjectVM, error) {
 	var vms []*HisMScheduleProjectVM
 	if patientType == 0 {
-		db := readDb.
-			Table("xt_schedule").
-			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
-			}).Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+
+		if patient_id > 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).
+				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else {
+			if patient_id > 0 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).
+					Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).
+					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			} else {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).
+					Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).
+					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			}
 		}
-		err = db.Find(&vms).Error
+
 	}
 
 	if patientType > 0 {
@@ -2456,9 +2627,11 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
 			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
 			}).
-			Where("status = 1 AND user_org_id = ?", orgID)
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
 			db = db.Where("schedule_date = ?", scheduleDate)
 		}

service/patient_service.go

@@ -947,7 +947,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
 		}).
 		Joins("JOIN xt_schedule as s ON s.patient_id=? and FROM_UNIXTIME(s.schedule_date, '%Y-%m-%d')=FROM_UNIXTIME(do.dialysis_date, '%Y-%m-%d')", patientID).
 		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id", orgID).
-		Where("do.patient_id=? and do.user_org_id=? and do.stage = 2 and do.status=1", patientID, orgID).Group("s.schedule_date")
+		Where("do.patient_id=? and do.user_org_id=?  and do.status=1", patientID, orgID).Group("s.schedule_date")
 
 	if start != 0 {
 		db = db.Where("do.dialysis_date>=?", start)
@@ -1105,6 +1105,7 @@ func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*mod
 
 func GetPatientByKeyWord(orgID int64, keywords string) (patient []*models.Patients, err error) {
 	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1", orgID)
+	fmt.Println("keywords22222223322332322332322323323", keywords)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("name LIKE ? OR dialysis_no LIKE ? ", likekey, likekey).Find(&patient).Error

service/self_drug_service.go

@@ -879,7 +879,7 @@ func CreateDrugDamage(damage models.XtDrugDamage) error {
 func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.VmDrugInventory, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and inventory_type = 11")
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and type = 4")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 	fmt.Println(table, tab)
@@ -903,7 +903,7 @@ func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword strin
 }
 
 func GetDrugDamageByOrgId(orgid int64) (list []*models.XtDrugInventory, err error) {
-	err = XTReadDB().Model(&list).Where("user_org_id = ? and inventory_type = 11 and status = 1", orgid).Find(&list).Error
+	err = XTReadDB().Model(&list).Where("user_org_id = ? and type = 4 and status = 1", orgid).Find(&list).Error
 	return list, err
 }
 
@@ -1126,7 +1126,7 @@ func CreateDrugWarehouseOutInfo(info models.DrugWarehouseOutInfo) error {
 
 func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (drug []*models.VmXtDrugInventory, err error) {
 
-	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1 and inventory_type = 11 ")
+	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1 and type = 4 ")
 
 	if drugid > 0 {
 		db = db.Where("drug_id = ?", drugid)

service/stock_service.go

@@ -3835,7 +3835,7 @@ func GetCancelStockOrderPrintOne(idstr []string, orgid int64) (info []*models.Ca
 
 func GetCancelOutTotalCount(startime int64, endtime int64, orgid int64) (info []*models.VmCancelStockInfo, err error) {
 
-	db := XTReadDB().Table("xt_cancel_stock_info as x").Where("x.status = 1")
+	db := readDb2.Table("xt_cancel_stock_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -3888,7 +3888,7 @@ func UpdateCancelInfo(id int64) (models.CancelStock, error) {
 
 func GetStockBatchNumber(id int64, orgid int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("good_id = ? and org_id = ? and status = 1 and number <> '' and stock_count<> 0", id, orgid).Find(&info).Error
+	err = XTReadDB().Model(&info).Where("good_id = ? and org_id = ? and status = 1 and number <> ''", id, orgid).Find(&info).Error
 	return info, err
 }
 
@@ -4133,6 +4133,13 @@ func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int6
 		if consumable_type == 4 {
 			db = db.Where(" consumable_type = ?", consumable_type)
 		}
+
+		if consumable_type == 10 {
+			db = db.Where(" consumable_type = ?", consumable_type)
+		}
+		if consumable_type == 11 {
+			db = db.Where(" consumable_type = ?", consumable_type)
+		}
 	}
 	if orgId > 0 {
 		db = db.Where("user_org_id = ?", orgId)
@@ -4592,7 +4599,7 @@ func GetReportStockList(startime int64, endtime int64, orgid int64, keyword stri
 	return adjust, total, err
 }
 
-func GetStockDamagedList(orgid int64, keyword string, page int64, limit int64) (adjust []*models.VmStockInventory, total int64, err error) {
+func GetStockDamagedList(orgid int64, keyword string, page int64, limit int64, startime int64, endtime int64) (adjust []*models.VmStockInventory, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1 and x.inventory_type = 4")
@@ -4607,15 +4614,41 @@ func GetStockDamagedList(orgid int64, keyword string, page int64, limit int64) (
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime <=?", endtime)
+	}
 
-	err = db.Group("x.id").Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,t.packing_unit,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
+	err = db.Group("x.id").Select("x.ctime,x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,t.packing_unit,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
 	return adjust, total, err
 
 }
 
+func GetStockDamagedCountOne(orgid int64, keyword string, inventory_type int64) (adjust []*models.VmStockInventory, err error) {
+
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1")
+	if inventory_type == 0 {
+		db = db.Where("x.inventory_type = 4")
+	}
+	if inventory_type > 0 {
+		db = db.Where("x.inventory_type = ?", inventory_type)
+	}
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("x.warehousing_order like ?", likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.good_id").Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,sum(x.count) as count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number").Scan(&adjust).Error
+	return adjust, err
+}
+
 func GetStockDamagedCount(orgid int64) (adjust []*models.VmStockInventory, err error) {
 
-	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1 and x.inventory_type = 4")
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1 and inventory_type = 4 ")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -4766,7 +4799,7 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 	fmt.Println(table, tab)
 	if len(keyword) > 0 {
-		db = db.Where("x.good_name = ?", likeKey)
+		db = db.Where("x.good_name like ?", likeKey)
 	}
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
@@ -4866,9 +4899,23 @@ func UpdatedWarehousingInfo(info models.WarehousingInfo, id int64) error {
 	return err
 }
 
-func GetDamageDetailByGoodId(good_id int64) (list []*models.XtStockInventory, err error) {
+func GetDamageDetailByGoodId(good_id int64, keyword string, inventory_type int64) (list []*models.XtStockInventory, err error) {
 
-	err = XTReadDB().Model(&list).Where("good_id = ? and status = 1", good_id).Find(&list).Error
+	db := XTReadDB().Model(&list).Where(" status = 1")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("warehousing_order like ?", likeKey)
+	}
+	if inventory_type > 0 {
+		db = db.Where("inventory_type = ?", inventory_type)
+	}
+	if inventory_type == 0 {
+		db = db.Where("inventory_type = 4")
+	}
+	err = db.Find(&list).Error
 
 	return list, err
 }
@@ -4940,3 +4987,9 @@ func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error
 	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark}).Error
 	return err
 }
+
+func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.VmStockFlow) error {
+
+	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count}).Error
+	return err
+}

service/warhouse_service.go

@@ -615,7 +615,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		fmt.Println("库存数量2332232323", stock_number)
 		fmt.Println("c出库数量", maxNumber)
 		fmt.Println("c出库数量", minNumber)
-		return
+
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 
 		fmt.Println("剩余库存", warehouse.StockMaxNumber)
@@ -633,6 +633,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		}
 		//扣减库存232332332332
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
 		if errThree != nil {
 			return errThree
 		}