Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/his_api_controller.go

@@ -142,7 +142,7 @@ func (c *HisApiController) GetHisPatientList() {
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
 	patients, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
-	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, 0)
 	patients = append(patients, patients_two...)
 	patients = RemoveRepeatedPatient(patients)
 

controllers/his_project_api_controller.go

@@ -1283,11 +1283,12 @@ func (this *HisProjectApiController) GetAllHisPatient() {
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordDateTime := theTime.Unix()
 	adminUserInfo := this.GetAdminUserInfo()
-	patients, err := service.GetScheduleHisPatientList(adminUserInfo.CurrentOrgId, "", recordDateTime)
+	patients, err := service.GetScheduleHisPatientList(adminUserInfo.CurrentOrgId, "", recordDateTime, 0)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": patients,
 	})

controllers/mobile_api_controllers/login_api_controller.go

@@ -150,9 +150,13 @@ func (this *LoginAPIController) LoginByPwd() {
 		this.Ctx.SetCookie("token_cookie", token, expiration, "/")
 
 		var configList interface{}
+		var dict_config_list interface{}
+
 		var FiledList []*models.FiledConfig
 
 		if org.Id > 0 {
+			dict_config_list, _ = service.GetDictConfigList(org.Id)
+
 			configList, _ = service.GetConfigList(org.Id)
 			FiledList, _ = service.FindFiledByOrgId(org.Id)
 		}
@@ -208,8 +212,10 @@ func (this *LoginAPIController) LoginByPwd() {
 				"org_id":      templateInfo.OrgId,
 				"template_id": templateInfo.TemplateId,
 			},
-			"config_list": configList,
-			"filed_list":  FiledList,
+			"config_list":      configList,
+			"dict_config_list": dict_config_list,
+
+			"filed_list": FiledList,
 		})
 	}
 }

controllers/new_mobile_api_controllers/forget_password_controller.go

@@ -160,10 +160,14 @@ func (this *ForgetPwdController) ModifyPassword() {
 			this.Ctx.SetCookie("token_cookie", token, expiration, "/")
 
 			var configList interface{}
+			var dict_configList interface{}
+
 			var FiledList []*models.FiledConfig
 
 			if org.Id > 0 {
 				configList, _ = service.GetConfigList(org.Id)
+				dict_configList, _ = service.GetDictConfigList(org.Id)
+
 				FiledList, _ = service.FindFiledByOrgId(org.Id)
 			}
 			if len(FiledList) == 0 {
@@ -219,8 +223,10 @@ func (this *ForgetPwdController) ModifyPassword() {
 					"org_id":      templateInfo.OrgId,
 					"template_id": templateInfo.TemplateId,
 				},
-				"config_list": configList,
-				"filed_list":  FiledList,
+				"config_list":      configList,
+				"dict_config_list": dict_configList,
+
+				"filed_list": FiledList,
 			})
 		}
 

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -222,9 +222,11 @@ func (this *HomeController) ChangeOrg() {
 		this.Ctx.SetCookie("token_cookie", token, expiration, "/")
 
 		var configList interface{}
+		var dict_config_list interface{}
 		var FiledList []*models.FiledConfig
 
 		if org.Id > 0 {
+			dict_config_list, _ = service.GetDictConfigList(org.Id)
 			configList, _ = service.GetConfigList(org.Id)
 			FiledList, _ = service.FindFiledByOrgId(org.Id)
 		}
@@ -281,8 +283,9 @@ func (this *HomeController) ChangeOrg() {
 				"org_id":      templateInfo.OrgId,
 				"template_id": templateInfo.TemplateId,
 			},
-			"config_list": configList,
-			"filed_list":  FiledList,
+			"config_list":      configList,
+			"dict_config_list": dict_config_list,
+			"filed_list":       FiledList,
 		})
 	}
 
@@ -537,9 +540,13 @@ func (this *HomeController) CreateOrg() {
 				this.Ctx.SetCookie("token_cookie", token, expiration, "/")
 
 				var configList interface{}
+				var dict_config_list interface{}
+
 				var FiledList []*models.FiledConfig
 
 				if org.Id > 0 {
+					dict_config_list, _ = service.GetDictConfigList(org.Id)
+
 					configList, _ = service.GetConfigList(org.Id)
 					FiledList, _ = service.FindFiledByOrgId(org.Id)
 				}
@@ -588,9 +595,11 @@ func (this *HomeController) CreateOrg() {
 						"org_id":      templateInfo.OrgId,
 						"template_id": templateInfo.TemplateId,
 					},
-					"config_list": configList,
-					"filed_list":  FiledList,
-					"status":      1,
+					"config_list":      configList,
+					"dict_config_list": dict_config_list,
+
+					"filed_list": FiledList,
+					"status":     1,
 				})
 			}
 

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -277,7 +277,10 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
+				fmt.Println(preTime)
+				fmt.Println(theTime2)
 				pTime := theTime2.Unix()
+				fmt.Println(pTime)
 
 				ctime := time.Now().Unix()
 				prescription := &models.HisPrescription{
@@ -321,7 +324,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							s.Status = 1
 							s.UserOrgId = adminInfo.Org.Id
 							s.RecordDate = recordDateTime
-							s.StartTime = prescription.PreTime
+							s.StartTime = pTime
 							s.Groupno = groupNo
 							s.CreatedTime = ctime
 							s.UpdatedTime = mtime
@@ -458,7 +461,7 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 					advice.CheckTime = hisAdvice.CheckTime
 					advice.Checker = hisAdvice.Checker
 					advice.CheckState = hisAdvice.CheckState
-					advice.StartTime = hisAdvice.StartTime
+					//advice.StartTime = hisAdvice.StartTime
 
 				}
 			}
@@ -613,6 +616,9 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 }
 func (c *MobileHisApiController) GetHisPatientList() {
 	record_date := c.GetString("record_date")
+	sch_type, _ := c.GetInt64("sch_type")
+	visit_type, _ := c.GetInt64("visit_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
@@ -623,13 +629,38 @@ func (c *MobileHisApiController) GetHisPatientList() {
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetMobileAdminUserInfo()
-	patients, _ := service.GetScheduleHisPatientList(adminInfo.Org.Id, "", recordDateTime)
+	patients, _ := service.GetScheduleHisPatientList(adminInfo.Org.Id, "", recordDateTime, sch_type)
 	patients_two, _ := service.GetHisPatientList(adminInfo.Org.Id, "", recordDateTime)
 	patients = append(patients, patients_two...)
 	patients = RemoveRepeatedPatient(patients)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"list": patients,
-	})
+	if visit_type == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patients,
+		})
+
+	} else if visit_type == 1 { //未就诊
+		var patientsOne []*service.Patients
+		for _, item := range patients {
+			if item.HisPrescription == nil || len(item.HisPrescription) <= 0 {
+				patientsOne = append(patientsOne, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patientsOne,
+		})
+
+	} else if visit_type == 2 { //已就诊
+		var patientsTwo []*service.Patients
+		for _, item := range patients {
+
+			if item.HisPrescription != nil && len(item.HisPrescription) > 0 {
+				patientsTwo = append(patientsTwo, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patientsTwo,
+		})
+	}
 
 }
 

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -365,9 +365,12 @@ func (this *MobileRegistController) CreateOrg() {
 
 			var configList interface{}
 			var FiledList []*models.FiledConfig
+			var dict_configList interface{}
 
 			if org.Id > 0 {
 				configList, _ = service.GetConfigList(org.Id)
+				dict_configList, _ = service.GetDictConfigList(org.Id)
+
 				FiledList, _ = service.FindFiledByOrgId(org.Id)
 			}
 			if len(FiledList) == 0 {
@@ -415,8 +418,10 @@ func (this *MobileRegistController) CreateOrg() {
 					"org_id":      templateInfo.OrgId,
 					"template_id": templateInfo.TemplateId,
 				},
-				"config_list": configList,
-				"filed_list":  FiledList,
+				"config_list":      configList,
+				"dict_config_list": dict_configList,
+
+				"filed_list": FiledList,
 			})
 		}
 
@@ -849,8 +854,9 @@ func (this *MobileRegistController) Login() {
 				"org_id":      0,
 				"template_id": 0,
 			},
-			"config_list": nil,
-			"filed_list":  nil,
+			"config_list":      nil,
+			"dict_config_list": nil,
+			"filed_list":       nil,
 		})
 		this.ServeJSON()
 	}

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -52,6 +52,8 @@ func (this *NewLoginApiController) GetLogin() {
 			var app *models.OrgApp
 			var templateInfo models.GobalTemplate
 			var configList interface{}
+			var dict_configList interface{}
+
 			var FiledList []*models.FiledConfig
 
 			var getAppRoleErr error
@@ -86,6 +88,8 @@ func (this *NewLoginApiController) GetLogin() {
 				}
 				templateInfo, _ = service.GetOrgInfoTemplate(org.Id)
 				configList, _ = service.GetConfigList(org.Id)
+				dict_configList, _ = service.GetDictConfigList(org.Id)
+
 				FiledList, _ = service.FindFiledByOrgId(org.Id)
 			}
 
@@ -113,9 +117,11 @@ func (this *NewLoginApiController) GetLogin() {
 					"org_id":      templateInfo.OrgId,
 					"template_id": templateInfo.TemplateId,
 				},
-				"config_list": configList,
-				"filed_list":  FiledList,
-				"isLogin":     true,
+				"config_list":      configList,
+				"dict_config_list": dict_configList,
+
+				"filed_list": FiledList,
+				"isLogin":    true,
 			})
 
 			this.ServeJSON()
@@ -275,9 +281,13 @@ func (this *NewLoginApiController) LoginByCs() {
 			this.Ctx.SetCookie("token_cookie", token, expiration, "/")
 
 			var configList interface{}
+			var dict_configList interface{}
+
 			var FiledList []*models.FiledConfig
 
 			if org.Id > 0 {
+				dict_configList, _ = service.GetDictConfigList(org.Id)
+
 				configList, _ = service.GetConfigList(org.Id)
 				FiledList, _ = service.FindFiledByOrgId(org.Id)
 			}
@@ -358,8 +368,10 @@ func (this *NewLoginApiController) LoginByCs() {
 					"org_id":      templateInfo.OrgId,
 					"template_id": templateInfo.TemplateId,
 				},
-				"config_list": configList,
-				"filed_list":  FiledList,
+				"config_list":      configList,
+				"dict_config_list": dict_configList,
+
+				"filed_list": FiledList,
 			})
 		}
 	} else {
@@ -482,6 +494,8 @@ func (this *NewLoginApiController) LoginByCs() {
 					this.Ctx.SetCookie("token_cookie", token, expiration, "/")
 
 					configList, _ := service.GetConfigList(org.Id)
+					dict_configList, _ := service.GetDictConfigList(org.Id)
+
 					var FiledList []*models.FiledConfig
 					FiledList, _ = service.FindFiledByOrgId(org.Id)
 					if len(FiledList) == 0 {
@@ -530,8 +544,10 @@ func (this *NewLoginApiController) LoginByCs() {
 							"org_id":      templateInfo.OrgId,
 							"template_id": templateInfo.TemplateId,
 						},
-						"config_list": configList,
-						"filed_list":  FiledList,
+						"config_list":      configList,
+						"dict_config_list": dict_configList,
+
+						"filed_list": FiledList,
 					})
 				}
 

models/data_models.go

@@ -23,6 +23,29 @@ func (Dataconfig) TableName() string {
 	return "xt_data_config"
 }
 
+type DictDataconfig struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	ParentId       int64  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	Module         string `gorm:"column:module" json:"module" form:"module"`
+	OrgId          int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name           string `gorm:"column:name" json:"name" form:"name"`
+	FieldName      string `gorm:"column:field_name" json:"field_name" form:"field_name"`
+	Value          int    `gorm:"column:value" json:"value" form:"value"`
+	CreatedTime    string `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdatedTime    string `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	CreateUserId   int64  `gorm:"column:create_user_id" json:"create_user_id" form:"create_user_id"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	Remark         string `gorm:"column:remark" json:"remark" form:"remark"`
+	DeleteIdSystem int64  `gorm:"column:delete_id_system" json:"delete_id_system" form:"delete_id_system"`
+	Title          string `gorm:"column:title" json:"title" form:"title"`
+	Content        string `gorm:"column:content" json:"content" form:"content"`
+	Order          int64  `gorm:"column:orders" json:"orders" form:"orders"`
+}
+
+func (DictDataconfig) TableName() string {
+	return "xt_drug_data_config"
+}
+
 type DictionaryDataconfig struct {
 	ID             int64  `gorm:"column:id" json:"id" form:"id"`
 	ParentId       int64  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
@@ -92,6 +115,29 @@ func (ConfigViewModel) TableName() string {
 	return "xt_data_config"
 }
 
+type DictConfigViewModel struct {
+	ID           int64             `gorm:"column:id" json:"id" form:"id"`
+	ParentId     int64             `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	Module       string            `gorm:"column:module" json:"module" form:"module"`
+	OrgId        int64             `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name         string            `gorm:"column:name" json:"name" form:"name"`
+	FieldName    string            `gorm:"column:field_name" json:"field_name" form:"field_name"`
+	Value        int               `gorm:"column:value" json:"value" form:"value"`
+	CreatedTime  string            `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdatedTime  string            `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	CreateUserId int64             `gorm:"column:create_user_id" json:"create_user_id" form:"create_user_id"`
+	Status       int64             `gorm:"column:status" json:"status" form:"status"`
+	Remark       string            `gorm:"column:remark" json:"remark" form:"remark"`
+	Title        string            `gorm:"column:title" json:"title" form:"title"`
+	Content      string            `gorm:"column:content" json:"content" form:"content"`
+	Order        int64             `gorm:"column:orders" json:"orders" form:"orders"`
+	Childs       []*DictDataconfig `json:"childs" `
+}
+
+func (DictConfigViewModel) TableName() string {
+	return "xt_drug_data_config"
+}
+
 type FiledConfig struct {
 	ID          int64  `gorm:"column:id" json:"id"`
 	OrgId       int64  `gorm:"column:org_id" json:"org_id"`

service/data.go

@@ -115,6 +115,112 @@ func GetConfigList(orgID int64) (dataconfig interface{}, err error) {
 	return resultConfig, err
 }
 
+func GetDictConfigList(orgID int64) (dataconfig interface{}, err error) {
+	var configList []*models.DictionaryDataconfig
+
+	err = readDb.Model(&models.DictionaryDataconfig{}).Where("(org_id in (0,?) and status = 1) or (status = 0 and delete_id_system > 0 and org_id = ?)", orgID, orgID).Order("orders asc, id asc").Find(&configList).Error
+	if err != nil {
+		return nil, err
+	}
+
+	// configResult := make([]*ConfigViewModel,0)
+	childConfig := make(map[int64][]*models.DictionaryDataconfig)
+	resultConfig := make(map[string][]*models.DictionaryConfigViewModel)
+	deleteSystemChilds := make([]*models.DictionaryDataconfig, 0)
+	editSystemChilds := make([]*models.DictionaryDataconfig, 0)
+	for _, config := range configList {
+		if config.Status == 1 && config.DeleteIdSystem > 0 {
+			editSystemChilds = append(editSystemChilds, config)
+		}
+
+		if config.Status == 0 && config.DeleteIdSystem > 0 {
+			deleteSystemChilds = append(deleteSystemChilds, config)
+		}
+	}
+	continueFlag := false
+	for _, config := range configList {
+		continueFlag = false
+		if config.ParentId == 0 {
+			newConfig := &models.DictionaryConfigViewModel{
+				ID:           config.ID,
+				ParentId:     config.ParentId,
+				Module:       config.Module,
+				OrgId:        config.OrgId,
+				Name:         config.Name,
+				FieldName:    config.FieldName,
+				Value:        config.Value,
+				CreateUserId: config.CreateUserId,
+				Status:       config.Status,
+				Remark:       config.Remark,
+				Title:        config.Title,
+				Content:      config.Content,
+			}
+			// configResult = append(configResult,newConfig)
+			result := resultConfig[config.Module]
+			if result == nil {
+				result = make([]*models.DictionaryConfigViewModel, 0)
+			}
+			for _, vm := range editSystemChilds {
+				if vm.DeleteIdSystem == config.ID {
+					continueFlag = true
+					break
+				}
+			}
+
+			for _, _vm := range deleteSystemChilds {
+				if _vm.DeleteIdSystem == config.ID {
+					continueFlag = true
+					break
+				}
+			}
+			if config.OrgId != 0 && config.Status == 0 && config.DeleteIdSystem > 0 {
+				continue
+			}
+			if continueFlag {
+				continue
+			}
+			result = append(result, newConfig)
+			resultConfig[config.Module] = result
+		} else {
+			childs := childConfig[config.ParentId]
+			if childs == nil {
+				childs = make([]*models.DictionaryDataconfig, 0)
+			}
+			continueFlag := false
+			for _, vm := range editSystemChilds {
+				if vm.DeleteIdSystem == config.ID {
+					continueFlag = true
+					break
+				}
+			}
+
+			for _, _vm := range deleteSystemChilds {
+				if _vm.DeleteIdSystem == config.ID {
+					continueFlag = true
+					break
+				}
+			}
+			if config.OrgId != 0 && config.Status == 0 && config.DeleteIdSystem > 0 {
+				continue
+			}
+			if continueFlag {
+				continue
+			}
+
+			childs = append(childs, config)
+			childConfig[config.ParentId] = childs
+		}
+	}
+
+	for _, vm := range resultConfig {
+		for _, _vm := range vm {
+			_vm.Childs = childConfig[_vm.ID]
+		}
+		// vm.Childs = childConfig[vm.ID]
+	}
+	return resultConfig, err
+}
+
 func FindConfigByFieldname(module string, field_name string, org_id int64) (dataconfig models.Dataconfig, err error) {
 	err = readDb.Model(&models.Dataconfig{}).Where("module=? and field_name=? and org_id in (0,?) and status = 1", module, field_name, org_id).First(&dataconfig).Error
 	return

service/doctor_advice_service.go

@@ -470,3 +470,8 @@ func GetDoctorAdviceByType(change_type int64, record_time int64, org_id int64, p
 	}
 	return
 }
+
+func GetDict(orgid int64) (drugways []*models.DrugwayDic, total int64, err error) {
+	err = readDb.Model(&models.DrugwayDic{}).Where("(org_id =? or org_id = 0) and status=1", orgid).Count(&total).Order("id desc").Find(&drugways).Error
+	return
+}

service/his_service.go

@@ -140,9 +140,15 @@ func (HisPrescription) TableName() string {
 	return "his_prescription"
 }
 
-func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64) (patients []*Patients, err error) {
-	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id).
-		Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ?", record_date, org_id)
+func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*Patients, err error) {
+	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+
+	if sch_type != 0 {
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_type = ?", record_date, org_id, sch_type)
+	} else {
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? ", record_date, org_id)
+	}
+
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error
@@ -948,6 +954,8 @@ type VMOtherHisPrescriptionInfo struct {
 	PatientId         int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	Status            int64                `gorm:"column:status" json:"status" form:"status"`
 	CheckGroup        []int64              `gorm:"-" json:"check_group" form:"check_group"`
+	DoctorId          int64                `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	Departments       int64                `gorm:"column:departments" json:"departments" form:"departments"`
 	VMHisPrescription []*VMHisPrescription `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId" json:"prescriptions"`
 }
 
@@ -1088,20 +1096,20 @@ func GetHisPrescriptionByPatientID(patientID int64, orgID int64) (info models.Hi
 }
 
 type VMHisProjectTeam struct {
-	ID           int64   `gorm:"column:id" json:"id" form:"id"`
-	ProjectTeam  string  `gorm:"column:project_team" json:"project_team" form:"project_team"`
-	Price        float64 `gorm:"column:price" json:"price" form:"price"`
-	Pinyin       string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi         string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	TubeColor    int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
-	TeamType     int64   `gorm:"column:team_type" json:"team_type" form:"team_type"`
-	Remark       string  `gorm:"column:remark" json:"remark" form:"remark"`
-	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status       int64   `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime  int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime  int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	ProjectId    string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	VMHisProject []*VMHisProject
+	ID           int64           `gorm:"column:id" json:"id" form:"id"`
+	ProjectTeam  string          `gorm:"column:project_team" json:"project_team" form:"project_team"`
+	Price        float64         `gorm:"column:price" json:"price" form:"price"`
+	Pinyin       string          `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi         string          `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	TubeColor    int64           `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	TeamType     int64           `gorm:"column:team_type" json:"team_type" form:"team_type"`
+	Remark       string          `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId    int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status       int64           `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64           `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64           `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ProjectId    string          `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	VMHisProject []*VMHisProject `gorm:"-" json:"project" form:"project"`
 }
 
 func (VMHisProjectTeam) TableName() string {
@@ -1145,12 +1153,10 @@ func (VMHisPrescriptionTwo) TableName() string {
 func GetAllProjectTeamList(orgid int64) (project []*VMHisProjectTeam, err error) {
 	err = XTReadDB().Model(&VMHisProjectTeam{}).Where("user_org_id = ? and status = 1", orgid).Find(&project).Error
 	for _, item := range project {
-		var project_item VMHisProject
+		var project_item []*VMHisProject
 		ids := strings.Split(item.ProjectId, ",")
-		for _, id := range ids {
-			XTReadDB().Model(&VMSchedule{}).Where("user_org_id = ? and status = 1 AND id = ?", orgid, id).First(&project_item)
-			item.VMHisProject = append(item.VMHisProject, &project_item)
-		}
+		XTReadDB().Model(&VMHisProject{}).Where("status = 1 AND id IN (?)", ids).Find(&project_item)
+		item.VMHisProject = append(item.VMHisProject, project_item...)
 	}
 	return
 }

service/mobile_dialysis_service.go

@@ -37,7 +37,7 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		Preload("DialysisOrder.DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentSummary", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
 		Preload("AssessmentAfterDislysis", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
-
+		Preload("HisAdvices", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
 		// Preload("DialysisOrder.MonitoringRecords", func(rdb *gorm.DB) *gorm.DB {
 		// 	return rdb.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time DESC")
 		// }).
@@ -102,26 +102,25 @@ func (AssessmentAfterDislysis) TableName() string {
 }
 
 type MDialysisScheduleVM 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"`
-	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status"`
-
+	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"`
+	ScheduleWeek             int64                             `gorm:"column:schedule_week" json:"schedule_week"`
+	ModeId                   int64                             `gorm:"column:mode_id" json:"mode_id"`
+	Status                   int64                             `gorm:"column:status" json:"status"`
 	SchedualPatient          *MSchedualPatientVMList           `gorm:"ForeignKey:PatientId" json:"patient"`
 	DeviceNumber             *MDeviceNumberVM                  `gorm:"ForeignKey:BedId" json:"device_number"`
 	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
 	AssessmentAfterDislysis  *AssessmentAfterDislysis          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
-
-	Advices          []*VMDoctorAdvice   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
-	TreatmentSummary *VMTreatmentSummary `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
+	HisAdvices               []*VMHisDoctorAdviceInfo          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"his_doctor_advice"`
+	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
@@ -298,6 +297,20 @@ func (VMDoctorAdvice) TableName() string {
 	return "xt_doctor_advice"
 }
 
+type VMHisDoctorAdviceInfo struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId   int64 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	ExecutionTime  int64 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff int64 `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+}
+
+func (VMHisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
 // 获取透析记录
 func MobileGetDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder