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

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 = 3877
+		subscibe.OrgId = 9882
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentOrgId = 9882
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3877
+		subscibe.OrgId = 9882
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -4,15 +4,15 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
-	"github.com/astaxie/beego"
-	"net/http"
-	"net/url"
-	"strconv"
 	_ "XT_New/utils"
 	_ "encoding/json"
 	"fmt"
+	"github.com/astaxie/beego"
 	_ "github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"net/http"
+	"net/url"
+	"strconv"
 	_ "strings"
 
 	// "fmt"
@@ -67,106 +67,106 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 	if dialysistype == 1 {
 		// 保存透前相关数据
 		// 获取透析处方
-		dialysisPrescribe, getDialysisPrescribeErr := service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
-		if getDialysisPrescribeErr != nil {
-			c.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		// 获取透析模版
-		dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminUserInfo.Org.Id, id)
-		if getDialysisSolutionErr != nil {
-			c.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+		//dialysisPrescribe, getDialysisPrescribeErr := service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+		//if getDialysisPrescribeErr != nil {
+		//	c.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+		//
+		//// 获取透析模版
+		//dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminUserInfo.Org.Id, id)
+		//if getDialysisSolutionErr != nil {
+		//	c.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
 
 		// 插入透析处方
-		if dialysisPrescribe == nil && dialysisSolution != nil {
-			var newprescribe models.DialysisPrescription
-			newprescribe.UserOrgId = dialysisSolution.UserOrgId
-			newprescribe.PatientId = dialysisSolution.PatientId
-			newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
-			newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
-			newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
-			newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
-			newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
-			newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
-			newprescribe.ModeId = dialysisSolution.ModeId
-			newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
-			newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
-			newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
-			newprescribe.BloodFilter = dialysisSolution.BloodFilter
-			newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
-			newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
-			newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
-			newprescribe.Glucose = dialysisSolution.Glucose
-			newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
-			newprescribe.Kalium = dialysisSolution.Kalium
-			newprescribe.Sodium = dialysisSolution.Sodium
-			newprescribe.Calcium = dialysisSolution.Calcium
-			newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
-			newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
-			newprescribe.Conductivity = dialysisSolution.Conductivity
-			newprescribe.BodyFluid = dialysisSolution.BodyFluid
-			newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
-			newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
-			newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
-			newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
-			newprescribe.BloodAccess = dialysisSolution.BloodAccess
-			newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
-			newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
-			newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
-			newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
-			newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
-			newprescribe.Dialyzer = dialysisSolution.Dialyzer
-			newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
-			newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
-			newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
-			newprescribe.TargetKtv = dialysisSolution.TargetKtv
-
-			newprescribe.CreatedTime = time.Now().Unix()
-			newprescribe.UpdatedTime = time.Now().Unix()
-			newprescribe.RecordDate = theAssessmentDateTime
-			// newprescribe.DewaterAmount = dewater_amount
-			// newprescribe.TargetUltrafiltration = dewater_amount
-			newprescribe.Status = 1
-
-			err := service.AddSigleRecord(&newprescribe)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
-
-		if dialysisPrescribe == nil && dialysisSolution == nil {
-			var newprescribe models.DialysisPrescription
-			newprescribe.UserOrgId = adminUserInfo.Org.Id
-			newprescribe.PatientId = id
-			newprescribe.CreatedTime = time.Now().Unix()
-			newprescribe.UpdatedTime = time.Now().Unix()
-			newprescribe.RecordDate = theAssessmentDateTime
-			// newprescribe.DewaterAmount = dewater_amount
-			// newprescribe.TargetUltrafiltration = dewater_amount
-			newprescribe.Status = 1
-
-			err := service.AddSigleRecord(&newprescribe)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
-
-		if dialysisPrescribe != nil {
-			dialysisPrescribe.UpdatedTime = time.Now().Unix()
-			dialysisPrescribe.RecordDate = theAssessmentDateTime
-			// dialysisPrescribe.DewaterAmount = dewater_amount
-			// dialysisPrescribe.TargetUltrafiltration = dewater_amount
-			dialysisPrescribe.Status = 1
-			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
-			if updateErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
+		//if dialysisPrescribe == nil && dialysisSolution != nil {
+		//	var newprescribe models.DialysisPrescription
+		//	newprescribe.UserOrgId = dialysisSolution.UserOrgId
+		//	newprescribe.PatientId = dialysisSolution.PatientId
+		//	newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
+		//	newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
+		//	newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
+		//	newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
+		//	newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
+		//	newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
+		//	newprescribe.ModeId = dialysisSolution.ModeId
+		//	newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
+		//	newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
+		//	newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
+		//	newprescribe.BloodFilter = dialysisSolution.BloodFilter
+		//	newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
+		//	newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
+		//	newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
+		//	newprescribe.Glucose = dialysisSolution.Glucose
+		//	newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
+		//	newprescribe.Kalium = dialysisSolution.Kalium
+		//	newprescribe.Sodium = dialysisSolution.Sodium
+		//	newprescribe.Calcium = dialysisSolution.Calcium
+		//	newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
+		//	newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
+		//	newprescribe.Conductivity = dialysisSolution.Conductivity
+		//	newprescribe.BodyFluid = dialysisSolution.BodyFluid
+		//	newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
+		//	newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
+		//	newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
+		//	newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
+		//	newprescribe.BloodAccess = dialysisSolution.BloodAccess
+		//	newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
+		//	newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
+		//	newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
+		//	newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
+		//	newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
+		//	newprescribe.Dialyzer = dialysisSolution.Dialyzer
+		//	newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
+		//	newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
+		//	newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
+		//	newprescribe.TargetKtv = dialysisSolution.TargetKtv
+		//
+		//	newprescribe.CreatedTime = time.Now().Unix()
+		//	newprescribe.UpdatedTime = time.Now().Unix()
+		//	newprescribe.RecordDate = theAssessmentDateTime
+		//	// newprescribe.DewaterAmount = dewater_amount
+		//	// newprescribe.TargetUltrafiltration = dewater_amount
+		//	newprescribe.Status = 1
+		//
+		//	err := service.AddSigleRecord(&newprescribe)
+		//	if err != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
+
+		//if dialysisPrescribe == nil && dialysisSolution == nil {
+		//	var newprescribe models.DialysisPrescription
+		//	newprescribe.UserOrgId = adminUserInfo.Org.Id
+		//	newprescribe.PatientId = id
+		//	newprescribe.CreatedTime = time.Now().Unix()
+		//	newprescribe.UpdatedTime = time.Now().Unix()
+		//	newprescribe.RecordDate = theAssessmentDateTime
+		//	// newprescribe.DewaterAmount = dewater_amount
+		//	// newprescribe.TargetUltrafiltration = dewater_amount
+		//	newprescribe.Status = 1
+		//
+		//	err := service.AddSigleRecord(&newprescribe)
+		//	if err != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
+
+		//if dialysisPrescribe != nil {
+		//	dialysisPrescribe.UpdatedTime = time.Now().Unix()
+		//	dialysisPrescribe.RecordDate = theAssessmentDateTime
+		//	// dialysisPrescribe.DewaterAmount = dewater_amount
+		//	// dialysisPrescribe.TargetUltrafiltration = dewater_amount
+		//	dialysisPrescribe.Status = 1
+		//	updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+		//	if updateErr != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
 
 		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {
@@ -692,7 +692,6 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 	}
 }
-
 func (c *CheckWeightApiController) GetPatientList() {
 	syncTime, _ := c.GetInt64("synctime", 0)
 	force, _ := c.GetInt64("force", 0)
@@ -710,7 +709,6 @@ func (c *CheckWeightApiController) GetPatientList() {
 		"servicetime": serviceTime,
 	})
 }
-
 func (c *CheckWeightApiController) GetPatientListById() {
 	patientId, _ := c.GetInt64("patient_id", 0)
 	if patientId <= 0 {
@@ -729,7 +727,6 @@ func (c *CheckWeightApiController) GetPatientListById() {
 		"patientinfo": patient,
 	})
 }
-
 func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {
@@ -797,7 +794,7 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 
 		// 排队叫号的签到
 		ssoDomain := beego.AppConfig.String("call_domain")
-		api := ssoDomain + "/index/patientsign/"+strconv.FormatInt(adminUserInfo.Org.Id, 10)+"/"+strconv.FormatInt(id, 10)
+		api := ssoDomain + "/index/patientsign/" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + "/" + strconv.FormatInt(id, 10)
 		values := make(url.Values)
 
 		http.PostForm(api, values)
@@ -964,8 +961,6 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		}
 	}
 
-
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"dialysistype":     dialysistype,
 		"patient":          dialysisinfo,
@@ -975,7 +970,6 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	})
 	return
 }
-
 func (c *CheckWeightApiController) GetPatientInfoBeforeDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2350,25 +2350,25 @@ func (c *DialysisAPIController) GetLongAdvice() {
 			if advice.FrequencyType == 3 {
 				t := time.Now()
 				week := int(t.Weekday())
+				fmt.Println(t.Weekday())
+
+				fmt.Println(week)
 
 				switch week {
 				case 1:
 					if strings.Index(advice.WeekDay, "周一") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 2:
 					if strings.Index(advice.WeekDay, "周二") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 3:
 					if strings.Index(advice.WeekDay, "周三") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 4:
 					if strings.Index(advice.WeekDay, "周四") == -1 {
@@ -2384,7 +2384,6 @@ func (c *DialysisAPIController) GetLongAdvice() {
 					if strings.Index(advice.WeekDay, "周六") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 0:
 					if strings.Index(advice.WeekDay, "周日") == -1 {
@@ -3581,17 +3580,13 @@ func (c *DialysisAPIController) EditConsumables() {
 					for _, before := range beforePrepares {
 
 						if consumable.GoodId == before.GoodId {
-							fmt.Println(consumable.Count)
-							fmt.Println(before.Count)
 
 							if consumable.Count != before.Count {
-								fmt.Println("111111111")
 								_, out := service.FindStockOutOrderNumberByTime(record_time, adminInfo.Org.Id)
 								//_, out := service.FindOldOrderInfoByGoodId(record_time, adminInfo.Org.Id)
 								//判断前端更改后的商品id的出库记录在数据库中是否存在
 								err, newOut := service.FindOrderInfoByGoodId(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id)
 								if err == gorm.ErrRecordNotFound { //不存在，则新增出库记录，并更改使用人商品信息
-									fmt.Println("222222222")
 
 									warehouseOutInfo := &models.WarehouseOutInfo{
 										WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
@@ -3614,7 +3609,7 @@ func (c *DialysisAPIController) EditConsumables() {
 									err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 									if err == nil {
 										//可能存在商品使用人不存在的情况，需要先判断商品使用人是否存在
-										user, err := service.FindGoodUserById(before.GoodTypeId, before.GoodId, patient_id, adminInfo.Org.Id, out.WarehouseOutOrderNumber)
+										user, err := service.FindGoodUserById(before.GoodTypeId, before.GoodId, patient_id, adminInfo.Org.Id, record_time)
 										if err == gorm.ErrRecordNotFound {
 											details := &models.AutomaticReduceDetail{
 												WarehouseOutId:          warehouseOutInfo.ID,
@@ -3655,7 +3650,7 @@ func (c *DialysisAPIController) EditConsumables() {
 										} else if consumable.Count < before.Count { //增加
 											service.UpdateOrderCountAdd(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id, before.Count-consumable.Count)
 										}
-										user, err := service.FindGoodUserById(consumable.GoodTypeId, consumable.GoodId, patient_id, adminInfo.Org.Id, out.WarehouseOutOrderNumber)
+										user, err := service.FindGoodUserById(consumable.GoodTypeId, consumable.GoodId, patient_id, adminInfo.Org.Id, record_time)
 										if err == gorm.ErrRecordNotFound {
 											details := &models.AutomaticReduceDetail{
 												WarehouseOutId:          newOut.ID,
@@ -4267,3 +4262,20 @@ func (c *DialysisAPIController) GetAllDrug() {
 	})
 
 }
+
+func RemoveRepeatedGoodTwo(arr []*models.DialysisBeforePrepare) (newArr []*models.DialysisBeforePrepare) {
+	newArr = make([]*models.DialysisBeforePrepare, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].GoodId == arr[j].GoodId {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2792,7 +2792,6 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 func (c *PatientApiController) CreateGroupAdvice() {
 	is_child, _ := c.GetInt64("is_child", 0)
-	fmt.Println("is_child------------------------------", is_child)
 	if is_child == 1 {
 		patient, _ := c.GetInt64("id", 0)
 		if patient <= 0 {

controllers/schedule_api_controller.go

@@ -1277,6 +1277,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 				date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 				sch.ScheduleDate = date.Unix()
 			}
+
 			sch.CreatedTime = time.Now().Unix()
 			sch.UpdatedTime = time.Now().Unix()
 			sch.ModeId = 1

routers/router.go

@@ -53,6 +53,7 @@ func init() {
 	controllers.PCIndexEvaluationApiControllersRegisterRouters()
 	controllers.ManagerCenterRegistRouters()
 	controllers.DrugStockManagerApiRegistRouters()
+	controllers.HisManagerApiRegistRouters()
 
 	m_api.MobileAPIControllersRegisterRouters()
 	new_m_api.NewMobileAPIControllersRegisterRouters()

service/dialysis_service.go

@@ -171,7 +171,6 @@ func FindQueueCallInfo(orgID int64) (queueConfig models.QueueCallConfig, err err
 	return
 }
 
-
 //修改机构叫号配置
 func UpDateQueueCallInfo(queueConfig models.QueueCallConfig) error {
 	err := writeDb.Save(&queueConfig).Error
@@ -981,8 +980,8 @@ func FindOrderInfoByGoodId(good_type_id int64, good_id int64, number string, org
 	return
 }
 
-func FindGoodUserById(good_type_id int64, good_id int64, id int64, org_id int64, number string) (user models.AutomaticReduceDetail, err error) {
-	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND patient_id = ? AND org_id = ? AND warehouse_out_order_number = ? ", good_id, good_type_id, id, org_id, number).First(&user).Error
+func FindGoodUserById(good_type_id int64, good_id int64, id int64, org_id int64, record_time int64) (user models.AutomaticReduceDetail, err error) {
+	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND patient_id = ? AND org_id = ? AND record_time = ? ", good_id, good_type_id, id, org_id, record_time).First(&user).Error
 	return
 }
 

service/doctor_advice_service.go

@@ -324,6 +324,9 @@ type DoctorAdvice struct {
 	TemplateId            string          `gorm:"column:template_id" json:"template_id"`
 	Modifier              int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	IsCheck               int64           `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64           `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64           `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	DrugNameId            int64           `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 }
 
 func (DoctorAdvice) TableName() string {

service/patient_service.go

@@ -1369,3 +1369,39 @@ func FindDoctorAdviceByIdsTwo(orgID int64, ids []string) (advice []models.Doctor
 	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? AND status = 1 AND execution_state = 2 AND (id IN (?) OR parent_id IN (?))", orgID, ids, ids).Find(&advice).Error
 	return
 }
+
+func CreateHisGroupAdvice(orgId int64, advices []*models.HisGroupAdvice, groupNo int64) (list []*models.HisGroupAdvice, err error) {
+	if groupNo <= 0 {
+		group := GetMaxAdviceGroupID(orgId)
+		groupNo = group + 1
+	}
+	tx := writeDb.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+	for _, advice := range advices {
+		advice.Groupno = groupNo
+		if err = tx.Create(advice).Error; err != nil {
+			tx.Rollback()
+			return
+		}
+		list = append(list, advice)
+		if len(advice.Children) > 0 {
+			for _, child := range advice.Children {
+				child.Groupno = groupNo
+				child.ParentId = advice.ID
+				fmt.Println(child)
+				if err = tx.Create(&child).Error; err != nil {
+					tx.Rollback()
+					return
+				}
+				list = append(list, child)
+			}
+		}
+
+	}
+	tx.Commit()
+	return
+}

service/schedule_service.go

@@ -13,7 +13,7 @@ import (
 //GetSchedulePartitionPanel 取出排班面板，分区-机号
 func GetSchedulePartitionPanel(orgID int64) (partitions []*models.Partition, err error) {
 
-	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Find(&partitions).Error
+	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Order("").Find(&partitions).Error
 
 	return
 }