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

.idea/misc.xml

@@ -3,6 +3,9 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
+  <component name="RustProjectSettings">
+    <option name="toolchainHomeDirectory" value="$USER_HOME$/.cargo/bin" />
+  </component>
   <component name="SvnBranchConfigurationManager">
     <option name="myConfigurationMap">
       <map>

conf/app.conf

@@ -1,11 +1,11 @@
 appname = 血透
-httpport = 9529
-runmode = dev
+httpport = 9531
+runmode = prod
 
 #
 copyrequestbody = true
 sessionon = true
-sessiongcmaxlifetime = 64800
+#sessiongcmaxlifetime = 64800
 
 tokencookiemaxlifetime = 7200
 enablexsrf = false

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9919
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,14 +91,14 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9919
+		adminUserInfo.CurrentOrgId = 3877
 		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
 
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9919
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9919
+		adminUserInfo.CurrentOrgId = 3877
 		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -327,11 +327,11 @@ func (c *DialysisApiController) PostPrescription() {
 		PreImpulse:                 preImpules,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
-		DialysisDialyszers:         dialysis_dialyszers,
-		DialysisIrrigation:         dialysis_irrigation,
-		AntioxidantCommodityName:   antioxidant_commodity_name,
-		DisplaceSpeed:              displace_speed,
+		Blood:                    blood,
+		DialysisDialyszers:       dialysis_dialyszers,
+		DialysisIrrigation:       dialysis_irrigation,
+		AntioxidantCommodityName: antioxidant_commodity_name,
+		DisplaceSpeed:            displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -656,11 +656,11 @@ func (c *DialysisApiController) PostSoulution() {
 
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
-		Blood:                     blood,
-		DialysisIrrigation:        dialysis_irrigation,
-		DialysisDialyszers:        dialysis_dialyszers,
-		AntioxidantCommodityName:  antioxidant_commodity_name,
-		DisplaceSpeed:             displace_speed,
+		Blood:                    blood,
+		DialysisIrrigation:       dialysis_irrigation,
+		DialysisDialyszers:       dialysis_dialyszers,
+		AntioxidantCommodityName: antioxidant_commodity_name,
+		DisplaceSpeed:            displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器

controllers/his_api_controller.go

@@ -78,6 +78,8 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/orderdetail/get", &HisApiController{}, "get:GetAllOrderDetail")
 	beego.Router("/api/orderdetaicollect/get", &HisApiController{}, "get:GetAllOrderDetailCollect")
 
+	beego.Router("/api/cost/compare", &HisApiController{}, "get:GetMedicalInsuranceCostCompareList")
+
 }
 
 func (c *HisApiController) Sscard() {
@@ -2731,3 +2733,23 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
 	})
 	return
 }
+
+func (c *HisApiController) GetMedicalInsuranceCostCompareList() {
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	keywords := c.GetString("keywords")
+
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 10
+	}
+	list, total, _ := service.GetMedicalInsuranceCostCompareList(c.GetAdminUserInfo().CurrentOrgId, page, limit, keywords)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"total": total,
+		"list":  list,
+	})
+	return
+
+}

controllers/his_project_api_controller.go

@@ -826,25 +826,25 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			IsNeedCostOfProduction: cost_checked,
 			TreatmentCost:          medicalExpense_float,
 			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                   name,
-			Age:                    age,
-			Number:                 str,
-			RegisterType:           register,
-			RegisterCost:           registrationfees_float,
-			BalanceAccountsType:    settlementValue,
-			Gender:                 sex,
-			Total:                  totals_float,
-			UserOrgId:              orgId,
-			Status:                 1,
-			RecordDate:             nowtime,
-			IsReturn:               1,
-			Ctime:                  time.Now().Unix(),
-			Phone:                  phone,
-			SocialType:             social_type,
-			IdCardType:             id_card_type,
-			Diagnosis:              diagnosis_id,
-			PType:                  reg_type,
-			SickType:               sick_type,
+			Name:                name,
+			Age:                 age,
+			Number:              str,
+			RegisterType:        register,
+			RegisterCost:        registrationfees_float,
+			BalanceAccountsType: settlementValue,
+			Gender:              sex,
+			Total:               totals_float,
+			UserOrgId:           orgId,
+			Status:              1,
+			RecordDate:          nowtime,
+			IsReturn:            1,
+			Ctime:               time.Now().Unix(),
+			Phone:               phone,
+			SocialType:          social_type,
+			IdCardType:          id_card_type,
+			Diagnosis:           diagnosis_id,
+			PType:               reg_type,
+			SickType:            sick_type,
 		}
 		service.CreateHisPatient(&hisPatient)
 		this.ServeSuccessJSON(map[string]interface{}{

controllers/manage_api_controller.go

@@ -1192,35 +1192,35 @@ func (this *MachineApiController) SaveInformation() {
 			Date:  startdate,
 			Class: classtype,
 			//	Zone:                  zone,
-			BedNumber:             bednumber,
-			PatientId:             patient_time,
-			Contagion:             contagion,
-			DialysisMode:          dialysis_mode,
-			StartTime:             startDate.Unix(),
-			EndTime:               endDate.Unix(),
-			DialysisHour:          dialysis_time,
-			Hyperfiltratio:        hyperfiletration,
-			WeightLoss:            weight_loss,
-			WarningValue:          warining_value,
-			UserTotal:             user_total,
-			Move:                  run,
-			FailureStage:          failure_stage,
-			FaultDescription:      falult_desciription,
-			CodeInformation:       code_information,
-			DisinfectantType:      disinfectant_type,
-			DisinfectType:         disinfect_type,
-			Disinfection:          disinfection,
-			MachineRun:            machine_run,
-			FluidPath:             fluid_path,
-			Disinfectant:          disinfectant,
-			DisinfectionStatus:    disinfection_status,
-			DisinfectionResidue:   disinfection_residue,
-			LongTime:              longtime,
-			DisinfecStartime:      start_Date.Unix(),
-			DisinfecEndtime:       end_Date.Unix(),
-			DialysisChecked:       dialysis_checked,
-			DialysisName:          dialysis_name,
-			Norms:                 norms,
+			BedNumber:           bednumber,
+			PatientId:           patient_time,
+			Contagion:           contagion,
+			DialysisMode:        dialysis_mode,
+			StartTime:           startDate.Unix(),
+			EndTime:             endDate.Unix(),
+			DialysisHour:        dialysis_time,
+			Hyperfiltratio:      hyperfiletration,
+			WeightLoss:          weight_loss,
+			WarningValue:        warining_value,
+			UserTotal:           user_total,
+			Move:                run,
+			FailureStage:        failure_stage,
+			FaultDescription:    falult_desciription,
+			CodeInformation:     code_information,
+			DisinfectantType:    disinfectant_type,
+			DisinfectType:       disinfect_type,
+			Disinfection:        disinfection,
+			MachineRun:          machine_run,
+			FluidPath:           fluid_path,
+			Disinfectant:        disinfectant,
+			DisinfectionStatus:  disinfection_status,
+			DisinfectionResidue: disinfection_residue,
+			LongTime:            longtime,
+			DisinfecStartime:    start_Date.Unix(),
+			DisinfecEndtime:     end_Date.Unix(),
+			DialysisChecked:     dialysis_checked,
+			DialysisName:        dialysis_name,
+			Norms:               norms,
 			DialysisConcentration: dialysis_concentration,
 			GermChecked:           germ_checked,
 			GermName:              germ_name,
@@ -1241,38 +1241,38 @@ func (this *MachineApiController) SaveInformation() {
 		})
 	} else if errinfor == nil {
 		infor := models.DeviceInformation{
-			Date:                  startdate,
-			Class:                 classtype,
-			Zone:                  zone,
-			BedNumber:             bednumber,
-			PatientId:             patient_time,
-			Contagion:             contagion,
-			DialysisMode:          dialysis_mode,
-			StartTime:             startDate.Unix(),
-			EndTime:               endDate.Unix(),
-			DialysisHour:          dialysis_time,
-			Hyperfiltratio:        hyperfiletration,
-			WeightLoss:            weight_loss,
-			WarningValue:          warining_value,
-			UserTotal:             user_total,
-			Move:                  run,
-			FailureStage:          failure_stage,
-			FaultDescription:      falult_desciription,
-			CodeInformation:       code_information,
-			DisinfectantType:      disinfectant_type,
-			DisinfectType:         disinfect_type,
-			Disinfection:          disinfection,
-			MachineRun:            machine_run,
-			FluidPath:             fluid_path,
-			Disinfectant:          disinfectant,
-			DisinfectionStatus:    disinfection_status,
-			DisinfectionResidue:   disinfection_residue,
-			LongTime:              longtime,
-			DisinfecStartime:      start_Date.Unix(),
-			DisinfecEndtime:       end_Date.Unix(),
-			DialysisChecked:       dialysis_checked,
-			DialysisName:          dialysis_name,
-			Norms:                 norms,
+			Date:                startdate,
+			Class:               classtype,
+			Zone:                zone,
+			BedNumber:           bednumber,
+			PatientId:           patient_time,
+			Contagion:           contagion,
+			DialysisMode:        dialysis_mode,
+			StartTime:           startDate.Unix(),
+			EndTime:             endDate.Unix(),
+			DialysisHour:        dialysis_time,
+			Hyperfiltratio:      hyperfiletration,
+			WeightLoss:          weight_loss,
+			WarningValue:        warining_value,
+			UserTotal:           user_total,
+			Move:                run,
+			FailureStage:        failure_stage,
+			FaultDescription:    falult_desciription,
+			CodeInformation:     code_information,
+			DisinfectantType:    disinfectant_type,
+			DisinfectType:       disinfect_type,
+			Disinfection:        disinfection,
+			MachineRun:          machine_run,
+			FluidPath:           fluid_path,
+			Disinfectant:        disinfectant,
+			DisinfectionStatus:  disinfection_status,
+			DisinfectionResidue: disinfection_residue,
+			LongTime:            longtime,
+			DisinfecStartime:    start_Date.Unix(),
+			DisinfecEndtime:     end_Date.Unix(),
+			DialysisChecked:     dialysis_checked,
+			DialysisName:        dialysis_name,
+			Norms:               norms,
 			DialysisConcentration: dialysis_concentration,
 			GermChecked:           germ_checked,
 			GermName:              germ_name,
@@ -2488,37 +2488,37 @@ func (this *MachineApiController) UpdateForm() {
 	err = service.UpdatedZoneID(bednumber, orgid, &deviceNumber)
 	fmt.Println("更新区号失败", err)
 	information := models.DeviceInformation{
-		Date:                  startdate,
-		Class:                 classtype,
-		Zone:                  zone,
-		BedNumber:             bednumber,
-		Contagion:             contagion,
-		DialysisMode:          dialysis_mode,
-		StartTime:             startDate.Unix(),
-		EndTime:               endDate.Unix(),
-		DialysisHour:          dialysis_time,
-		Hyperfiltratio:        hyperfiletration,
-		WeightLoss:            weight_loss,
-		WarningValue:          warining_value,
-		UserTotal:             user_total,
-		Move:                  run,
-		FailureStage:          failure_stage,
-		FaultDescription:      falult_desciription,
-		CodeInformation:       code_information,
-		DisinfectantType:      disinfectant_type,
-		DisinfectType:         disinfect_type,
-		Disinfection:          disinfection,
-		MachineRun:            machine_run,
-		FluidPath:             fluid_path,
-		Disinfectant:          disinfectant,
-		DisinfectionStatus:    disinfection_status,
-		DisinfectionResidue:   disinfection_residue,
-		LongTime:              longtime,
-		DisinfecStartime:      distartime,
-		DisinfecEndtime:       diendtime,
-		DialysisChecked:       dialysis_checked,
-		DialysisName:          dialysis_name,
-		Norms:                 norms,
+		Date:                startdate,
+		Class:               classtype,
+		Zone:                zone,
+		BedNumber:           bednumber,
+		Contagion:           contagion,
+		DialysisMode:        dialysis_mode,
+		StartTime:           startDate.Unix(),
+		EndTime:             endDate.Unix(),
+		DialysisHour:        dialysis_time,
+		Hyperfiltratio:      hyperfiletration,
+		WeightLoss:          weight_loss,
+		WarningValue:        warining_value,
+		UserTotal:           user_total,
+		Move:                run,
+		FailureStage:        failure_stage,
+		FaultDescription:    falult_desciription,
+		CodeInformation:     code_information,
+		DisinfectantType:    disinfectant_type,
+		DisinfectType:       disinfect_type,
+		Disinfection:        disinfection,
+		MachineRun:          machine_run,
+		FluidPath:           fluid_path,
+		Disinfectant:        disinfectant,
+		DisinfectionStatus:  disinfection_status,
+		DisinfectionResidue: disinfection_residue,
+		LongTime:            longtime,
+		DisinfecStartime:    distartime,
+		DisinfecEndtime:     diendtime,
+		DialysisChecked:     dialysis_checked,
+		DialysisName:        dialysis_name,
+		Norms:               norms,
 		DialysisConcentration: dialysis_concentration,
 		GermChecked:           germ_checked,
 		GermName:              germ_name,

controllers/manager_center_api_controller.go

@@ -221,7 +221,6 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	id, _ := c.GetInt64("id")
 	drug_name := c.GetString("drug_name")
-
 	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 	drug_alias := c.GetString("drug_alias")

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1158,11 +1158,11 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		PreImpulse:                 pre_impulse,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
-		DialysisDialyszers:         dialysis_dialyszers,
-		DialysisIrrigation:         dialysis_irrigation,
-		AntioxidantCommodityName:   antioxidant_commodity_name,
-		DisplaceSpeed:              displace_speed,
+		Blood:                    blood,
+		DialysisDialyszers:       dialysis_dialyszers,
+		DialysisIrrigation:       dialysis_irrigation,
+		AntioxidantCommodityName: antioxidant_commodity_name,
+		DisplaceSpeed:            displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2039,11 +2039,11 @@ func (c *DialysisAPIController) PostSolution() {
 		ALiquid:                   a_liquid,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		Blood:                     blood,
-		DialysisDialyszers:        dialysis_dialyszers,
-		DialysisIrrigation:        dialysis_irrigation,
-		AntioxidantCommodityName:  antioxidant_commodity_name,
-		DisplaceSpeed:             displace_speed,
+		Blood:                    blood,
+		DialysisDialyszers:       dialysis_dialyszers,
+		DialysisIrrigation:       dialysis_irrigation,
+		AntioxidantCommodityName: antioxidant_commodity_name,
+		DisplaceSpeed:            displace_speed,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2956,20 +2956,31 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			}
 		}
 
-		advices = append(advices, &advice)
+		temp_advice, _ := service.FindRemindAdvice(advice.UserOrgId, advice.AdviceName, advice.AdviceDesc, advice.TemplateId, advice.FrequencyType, patient, advice.RecordDate)
+		if temp_advice.ID == 0 {
+			advices = append(advices, &advice)
+		}
 	}
 
-	list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
+	if len(advices) > 0 {
+		list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
 
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
-		return
-	}
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
+			return
+		}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":     "ok",
-		"advices": list,
-	})
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":     "ok",
+			"advices": list,
+		})
+
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "ok",
+		})
+
+	}
 
 	return
 
@@ -4643,15 +4654,15 @@ func (c *DialysisAPIController) BatchDeleteMonitor() {
 }
 
 func (c *DialysisAPIController) GetPatientDialysisRecordList() {
-	
+
 	id, _ := c.GetInt64("id")
 	fmt.Println(id)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	start_time := time.Now().Format("2006-01-02")
-	
+
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	fmt.Println("start_timestart_time",start_time)
+	fmt.Println("start_timestart_time", start_time)
 	nowTime := time.Now()
 	endTime := nowTime.AddDate(-1, 0, 0)
 	endTimes := endTime.Format("2006-01-02")

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -436,7 +436,8 @@ func (this *NewRoleApiController) AddRoleStaff() {
 }
 
 func (this *NewRoleApiController) GetFuntionPurviews() {
-	functionPurview, _ := service.GetFunctionPurview()
+	pid, _ := this.GetInt64("pid")
+	functionPurview, _ := service.GetFunctionPurview(pid)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"funtion_purview": functionPurview,
 	})

controllers/patient_api_controller.go

@@ -254,29 +254,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                    adminUserInfo.CurrentOrgId,
-		UserId:                       0,
-		Avatar:                       patients.Avatar,
-		PatientType:                  patients.PatientType,
-		DialysisNo:                   patients.DialysisNo,
-		AdmissionNumber:              patients.AdmissionNumber,
-		Source:                       patients.Source,
-		Lapseto:                      patients.Lapseto,
-		PartitionId:                  patients.PartitionId,
-		BedId:                        patients.BedId,
-		Name:                         patients.Name,
-		Alias:                        patients.Alias,
-		Gender:                       patients.Gender,
-		MaritalStatus:                patients.MaritalStatus,
-		IdCardNo:                     patients.IdCardNo,
-		Birthday:                     patients.Birthday,
-		ReimbursementWayId:           patients.ReimbursementWayId,
-		HealthCareType:               patients.HealthCareType,
-		HealthCareNo:                 patients.HealthCareNo,
-		HealthCareDueDate:            patients.HealthCareDueDate,
-		Height:                       patients.Height,
-		BloodType:                    patients.BloodType,
-		Rh:                           patients.Rh,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		UserId:             0,
+		Avatar:             patients.Avatar,
+		PatientType:        patients.PatientType,
+		DialysisNo:         patients.DialysisNo,
+		AdmissionNumber:    patients.AdmissionNumber,
+		Source:             patients.Source,
+		Lapseto:            patients.Lapseto,
+		PartitionId:        patients.PartitionId,
+		BedId:              patients.BedId,
+		Name:               patients.Name,
+		Alias:              patients.Alias,
+		Gender:             patients.Gender,
+		MaritalStatus:      patients.MaritalStatus,
+		IdCardNo:           patients.IdCardNo,
+		Birthday:           patients.Birthday,
+		ReimbursementWayId: patients.ReimbursementWayId,
+		HealthCareType:     patients.HealthCareType,
+		HealthCareNo:       patients.HealthCareNo,
+		HealthCareDueDate:  patients.HealthCareDueDate,
+		Height:             patients.Height,
+		BloodType:          patients.BloodType,
+		Rh:                 patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -322,28 +322,28 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
-		IsInfectious:                 patients.IsInfectious,
-		RemindCycle:                  patients.RemindCycle,
-		ResponseResult:               patients.ResponseResult,
-		IsOpenRemind:                 patients.IsOpenRemind,
-		FirstTreatmentDate:           patients.FirstTreatmentDate,
-		DialysisAge:                  patients.DialysisAge,
-		ExpenseKind:                  patients.ExpenseKind,
-		TellPhone:                    patients.TellPhone,
-		ContactName:                  patients.ContactName,
-		BloodPatients:                1,
-		SlowPatients:                 0,
-		MemberPatients:               0,
-		EcommerPatients:              "",
-		BloodId:                      patients.ID,
-		SlowId:                       0,
-		MemberId:                     0,
-		MemberFistdate:               0,
-		MemberPatienttype:            0,
-		MemberTreatement:             0,
-		EquitmentId:                  "",
-		UserSysBeforeCount:           patient.UserSysBeforeCount,
+		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
+		IsInfectious:             patients.IsInfectious,
+		RemindCycle:              patients.RemindCycle,
+		ResponseResult:           patients.ResponseResult,
+		IsOpenRemind:             patients.IsOpenRemind,
+		FirstTreatmentDate:       patients.FirstTreatmentDate,
+		DialysisAge:              patients.DialysisAge,
+		ExpenseKind:              patients.ExpenseKind,
+		TellPhone:                patients.TellPhone,
+		ContactName:              patients.ContactName,
+		BloodPatients:            1,
+		SlowPatients:             0,
+		MemberPatients:           0,
+		EcommerPatients:          "",
+		BloodId:                  patients.ID,
+		SlowId:                   0,
+		MemberId:                 0,
+		MemberFistdate:           0,
+		MemberPatienttype:        0,
+		MemberTreatement:         0,
+		EquitmentId:              "",
+		UserSysBeforeCount:       patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -481,28 +481,28 @@ func (c *PatientApiController) EditPatient() {
 		return
 	}
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                 patient.UserOrgId,
-		UserId:                    patient.UserId,
-		Avatar:                    patient.Avatar,
-		PatientType:               patient.PatientType,
-		DialysisNo:                patient.DialysisNo,
-		AdmissionNumber:           patient.AdmissionNumber,
-		Source:                    patient.Source,
-		PartitionId:               patient.PartitionId,
-		BedId:                     patient.BedId,
-		Name:                      patient.Name,
-		Alias:                     patient.Alias,
-		Gender:                    patient.Gender,
-		MaritalStatus:             patient.MaritalStatus,
-		IdCardNo:                  patient.IdCardNo,
-		Birthday:                  patient.Birthday,
-		ReimbursementWayId:        patient.ReimbursementWayId,
-		HealthCareType:            patient.HealthCareType,
-		HealthCareNo:              patient.HealthCareNo,
-		HealthCareDueDate:         patient.HealthCareDueDate,
-		Height:                    patient.Height,
-		BloodType:                 patient.BloodType,
-		Rh:                        patient.Rh,
+		UserOrgId:          patient.UserOrgId,
+		UserId:             patient.UserId,
+		Avatar:             patient.Avatar,
+		PatientType:        patient.PatientType,
+		DialysisNo:         patient.DialysisNo,
+		AdmissionNumber:    patient.AdmissionNumber,
+		Source:             patient.Source,
+		PartitionId:        patient.PartitionId,
+		BedId:              patient.BedId,
+		Name:               patient.Name,
+		Alias:              patient.Alias,
+		Gender:             patient.Gender,
+		MaritalStatus:      patient.MaritalStatus,
+		IdCardNo:           patient.IdCardNo,
+		Birthday:           patient.Birthday,
+		ReimbursementWayId: patient.ReimbursementWayId,
+		HealthCareType:     patient.HealthCareType,
+		HealthCareNo:       patient.HealthCareNo,
+		HealthCareDueDate:  patient.HealthCareDueDate,
+		Height:             patient.Height,
+		BloodType:          patient.BloodType,
+		Rh:                 patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -544,19 +544,19 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
-		IsInfectious:              patient.IsInfectious,
-		RemindCycle:               patient.RemindCycle,
-		ResponseResult:            patient.ResponseResult,
-		IsOpenRemind:              patient.IsOpenRemind,
-		FirstTreatmentDate:        patient.FirstTreatmentDate,
-		DialysisAge:               patient.DialysisAge,
-		ExpenseKind:               patient.ExpenseKind,
-		TellPhone:                 patient.TellPhone,
-		ContactName:               patient.ContactName,
-		UpdatedTime:               time.Now().Unix(),
-		BloodPatients:             1,
-		Lapseto:                   patient.Lapseto,
+		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
+		IsInfectious:             patient.IsInfectious,
+		RemindCycle:              patient.RemindCycle,
+		ResponseResult:           patient.ResponseResult,
+		IsOpenRemind:             patient.IsOpenRemind,
+		FirstTreatmentDate:       patient.FirstTreatmentDate,
+		DialysisAge:              patient.DialysisAge,
+		ExpenseKind:              patient.ExpenseKind,
+		TellPhone:                patient.TellPhone,
+		ContactName:              patient.ContactName,
+		UpdatedTime:              time.Now().Unix(),
+		BloodPatients:            1,
+		Lapseto:                  patient.Lapseto,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)

controllers/role_controller.go

@@ -559,7 +559,7 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		if item.Name == "耗材管理" {
 			item.Childs = append(item.Childs, subConsumablesPurviewTreeViewModel...)
 		}
-		if item.Name == "药品管理" {
+		if item.Name == "药库管理" {
 			item.Childs = append(item.Childs, subDrugPurviewTreeViewModel...)
 		}
 		if item.Name == "自备药管理" {
@@ -982,33 +982,33 @@ func (this *RoleAPIController) AddAdmin() {
 			if total <= 0 {
 				//新增用户
 				app_role := &models.App_Role{
-					AdminUserId:                             adminUser.Id,
-					OrgId:                                   adminUserInfo.CurrentOrgId,
-					AppId:                                   adminUserInfo.CurrentAppId,
-					Avatar:                                  "",
-					UserName:                                name,
-					UserTitleName:                           user_title_name,
-					Status:                                  1,
-					UserType:                                int8(userType),
-					UserTitle:                               int8(userTitle),
-					CreateTime:                              time.Now().Unix(),
-					ModifyTime:                              time.Now().Unix(),
-					RoleIds:                                 roleIds,
-					Department:                              department,
-					DepartmentId:                            department_id,
-					Sex:                                     sex,
-					Age:                                     age,
-					Nation:                                  nation,
-					CardType:                                card_type,
-					IdCard:                                  id_card,
-					Education:                               education,
-					StudyMajorName:                          study_major_name,
-					WorkMajorName:                           work_major_name,
-					RoleType:                                role_type,
-					MedicalCode:                             medical_code,
-					DoctorCode:                              doctor_code,
-					Licensing:                               licensing,
-					JobNumber:                               job_number,
+					AdminUserId:    adminUser.Id,
+					OrgId:          adminUserInfo.CurrentOrgId,
+					AppId:          adminUserInfo.CurrentAppId,
+					Avatar:         "",
+					UserName:       name,
+					UserTitleName:  user_title_name,
+					Status:         1,
+					UserType:       int8(userType),
+					UserTitle:      int8(userTitle),
+					CreateTime:     time.Now().Unix(),
+					ModifyTime:     time.Now().Unix(),
+					RoleIds:        roleIds,
+					Department:     department,
+					DepartmentId:   department_id,
+					Sex:            sex,
+					Age:            age,
+					Nation:         nation,
+					CardType:       card_type,
+					IdCard:         id_card,
+					Education:      education,
+					StudyMajorName: study_major_name,
+					WorkMajorName:  work_major_name,
+					RoleType:       role_type,
+					MedicalCode:    medical_code,
+					DoctorCode:     doctor_code,
+					Licensing:      licensing,
+					JobNumber:      job_number,
 					PrescriptionQualificationIdentification: prescription_qualification_identification,
 					IdentificationOutpatients:               identification_outpatients,
 					StartTime:                               theStartTime.Unix(),

controllers/stock_in_api_controller.go

@@ -1379,7 +1379,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					sys_record_time := int64(items["sys_record_time"].(float64))
 
 					warehouseOutInfo := &models.WarehouseOutInfo{
-						ID:                      id,
+						ID: id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						GoodId:                  good_id,

models/data_models.go

@@ -17,6 +17,7 @@ type Dataconfig struct {
 	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"`
+	Code           string `gorm:"column:code" json:"code" form:"code"`
 	FieldType      int64  `gorm:"column:field_type" json:"field_type" form:"field_type"`
 }
 
@@ -41,6 +42,7 @@ type DictDataconfig struct {
 	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"`
+	Code           string `gorm:"column:code" json:"code" form:"code"`
 }
 
 func (DictDataconfig) TableName() string {

service/his_service.go

@@ -988,7 +988,9 @@ func GetHisPrescriptionByType(change_type int64, record_time int64, org_id int64
 		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
 			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 				return db.Where("status = 1 AND user_org_id = ?", org_id).
-					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+					Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+					}).
 					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 					})
@@ -1000,7 +1002,9 @@ func GetHisPrescriptionByType(change_type int64, record_time int64, org_id int64
 		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
 			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 				return db.Where("status = 1 AND user_org_id = ?", org_id).
-					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+					Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+					}).
 					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 					})
@@ -1013,7 +1017,9 @@ func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, pat
 	err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date >= ? AND record_date <= ?", patient_id, org_id, start_time, end_time).
 		Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+				Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+				}).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 					return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 				})
@@ -1253,3 +1259,38 @@ func GetHisOrderDetailByNumber(order_number string, org_id int64) (order []*HisO
 	}).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"`
+	EndTime   int64   `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	Insutype  string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	CheckType int64   `gorm:"column:check_type" json:"check_type" form:"check_type"`
+	Num       int64   `gorm:"column:num" json:"num" form:"num"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CostTotal float64 `gorm:"column:cost_total" json:"cost_total" form:"cost_total"`
+	FuncTotal float64 `gorm:"column:func_total" json:"func_total" form:"func_total"`
+	PsnPay    float64 `gorm:"column:psn_pay" json:"psn_pay" form:"psn_pay"`
+	Creator   int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+}
+
+func (MedicalInsuranceCostCompare) TableName() string {
+	return "medical_insurance_cost_compare"
+}
+
+func GetMedicalInsuranceCostCompareList(orgID, page, limit int64, keywords string) (list []*MedicalInsuranceCostCompare, total int, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&MedicalInsuranceCostCompare{}).Where("user_org_id = ?", orgID)
+
+	if len(keywords) == 0 {
+		db = db.Where("status=1")
+		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	} else {
+		db = db.Where("status=1")
+		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	}
+	return
+}

service/manage_center_service.go

@@ -351,3 +351,9 @@ func FindDiagnoseById(id int64) (*models.HisXtDiagnoseConfig, error) {
 	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? AND status = 1", id).First(&dealer).Error
 	return dealer, err
 }
+
+func GetDoseCode(dose_id int64, user_org_id int64) (error, string) {
+	var data models.DictDataconfig
+	err := readDb.Model(&models.DictDataconfig{}).Where(" (user_org_id = ? Or user_org_id = 0) AND parent_id = 4 AND module = 'system' AND status = 1 AND value = ?", user_org_id, dose_id).First(&data).Error
+	return err, data.Code
+}

service/patient_service.go

@@ -1479,3 +1479,8 @@ func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription
 	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation}).Error
 	return err
 }
+
+func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string, template_id string, fre_type int64, patient_id int64, record_date int64) (advice models.DoctorAdvice, err error) {
+	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and advice_name = ? and advice_desc = ? and template_id = ? and frequency_type = ? ", patient_id, user_org_id, record_date, advice_name, advice_desc, template_id, fre_type).First(&advice).Error
+	return
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -1,5 +1,7 @@
 package schedule_dialysis
 
+import "XT_New/models"
+
 type PatientVM 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"`
@@ -522,20 +524,21 @@ type ScheduleVM struct {
 	BedID        int64 `gorm:"column:bed_id" json:"bed_id"`
 	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
 
-	Patient                  *PatientVM                  `gorm:"ForeignKey:PatientID" json:"patient"`
-	DialysisOrder            DialysisOrderVM             `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
-	Prescription             PrescriptionVM              `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
-	ReceiveAssessment        ReceiveAssessmentVM         `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
-	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
-	AssessmentBeforeDislysis AssessmentBeforeDislysisVM  `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
-	AssessmentAfterDislysis  AssessmentAfterDislysisVM   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
-	MonitoringRecords        []*MonitoringRecordVM       `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
-	DeviceNumber             *DeviceNumberVM             `gorm:"ForeignKey:BedID" json:"device_number"`
-	DeviceZone               *DeviceZoneVM               `gorm:"ForeignKey:PartitionId" json:"device_zone"`
-	Advices                  []*DoctorAdviceVM           `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
-	DoubleCheck              *DoubleCheckVM              `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
-	Summer                   *SummerVM                   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
-	LastAfterWeight          XtAssessmentAfterDislysisVM `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	Patient                  *PatientVM                    `gorm:"ForeignKey:PatientID" json:"patient"`
+	DialysisOrder            DialysisOrderVM               `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
+	Prescription             PrescriptionVM                `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
+	ReceiveAssessment        ReceiveAssessmentVM           `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
+	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses      `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
+	AssessmentBeforeDislysis AssessmentBeforeDislysisVM    `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  AssessmentAfterDislysisVM     `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
+	MonitoringRecords        []*MonitoringRecordVM         `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
+	DeviceNumber             *DeviceNumberVM               `gorm:"ForeignKey:BedID" json:"device_number"`
+	DeviceZone               *DeviceZoneVM                 `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	Advices                  []*DoctorAdviceVM             `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
+	DoubleCheck              *DoubleCheckVM                `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
+	Summer                   *SummerVM                     `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
+	LastAfterWeight          XtAssessmentAfterDislysisVM   `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	HisAdvices               []*models.HisDoctorAdviceInfo `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
 }
 
 func (ScheduleVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -42,6 +42,11 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 				Where("user_org_id = ? AND advice_type = 2 AND status = 1", orgID).
 				Order("start_time asc, groupno desc, advice_order desc, id asc")
 		}).
+		Preload("HisAdvices", func(db *gorm.DB) *gorm.DB {
+			return db.Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, drug_spec_unit,advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").
+				Where("user_org_id = ? AND status = 1", orgID).
+				Order("start_time asc, groupno desc, advice_order desc, id asc")
+		}).
 		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date desc").
 		Find(&schedules).
 		Error

service/role_service.go

@@ -761,8 +761,8 @@ func SaveAdminUser(role *models.App_Role) (err error) {
 	return
 }
 
-func GetFunctionPurview() (purview []*models.SgjUserOperatePurview, err error) {
-	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Order("number asc").Find(&purview).Error
+func GetFunctionPurview(pid int64) (purview []*models.SgjUserOperatePurview, err error) {
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1  AND parentid = ?", pid).Order("number asc").Find(&purview).Error
 	return
 }