2024/6/17

controllers/his_api_controller.go

@@ -10295,7 +10295,7 @@ func (this *HisApiController) GetCallHisPrescription() {
 						info, _ := service.GetWarehoseInfoByDrugId(subItem.DrugId, adminUserInfo.CurrentOrgId)
 						if info.RetailPrice > 0 {
 							if subItem.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-								subItem.Drug.RetailPrice = info.RetailPrice * float64(drug.MinNumber)
+								subItem.Drug.RetailPrice = drug.RetailPrice
 							}
 							if subItem.PrescribingNumberUnit == drug.MinUnit {
 								subItem.Drug.MinPrice = info.RetailPrice

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -10796,9 +10796,16 @@ func (c *DialysisAPIController) SaveLongMobileAdvice() {
 	patient_id := int64(dataBody["patient_id"].(float64))
 
 	day_count := int64(dataBody["day_count"].(float64))
+
+	groupNo := int64(dataBody["group_no"].(float64))
 	advice_doctor := c.GetMobileAdminUserInfo().AdminUser.Id
 
 	adviceLast, _ := service.GetLastLongAdviceList(org_id)
+
+	if groupNo <= 0 {
+		group := service.GetMaxAdviceGroupID(org_id)
+		groupNo = group + 1
+	}
 	var template_id = ""
 	adviceLastId := strconv.FormatInt(adviceLast.ID, 10)
 	template_id = "M" + adviceLastId
@@ -10854,6 +10861,7 @@ func (c *DialysisAPIController) SaveLongMobileAdvice() {
 		PushStartTime:         0,
 		IsSettle:              0,
 		IsPrescription:        0,
+		GroupNo:               groupNo,
 	}
 
 	service.CreateMobileAdivce(advice)
@@ -10877,3 +10885,435 @@ func (c *DialysisAPIController) GetLongDoctorAdviceByPatient() {
 		"adminRoles": adminRoles,
 	})
 }
+
+func (c *DialysisAPIController) SaveSelfChildDrugLongAdivce() {
+
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startTime2, _ := dataBody["start_time"].(string)
+	time_arr := strings.Split(startTime2, " ")
+	if len(time_arr) > 0 {
+		startTime2 = time_arr[0]
+	}
+	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
+		utils.ErrorLog("advice_date")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	advice_date, _ := dataBody["advice_date"].(string)
+
+	var advicedateunix int64
+	if len(advice_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", advice_date+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		advicedateunix = theTime.Unix()
+	}
+
+	adviceDate := startTime2
+	if len(adviceDate) == 0 {
+		utils.ErrorLog("len(adviceDate) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err := time.ParseInLocation(timeLayout, adviceDate, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	AdviceDate := advicedateunix
+	RecordDate := advicedateunix
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	startTime, _ := dataBody["start_time"].(string)
+
+	if len(startTime) == 0 {
+		utils.ErrorLog("len(start_time) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	StartTime := theTime.Unix()
+
+	advice_name, _ := dataBody["advice_name"].(string)
+
+	advice_desc, _ := dataBody["advice_desc"].(string)
+
+	delivery_way, _ := dataBody["delivery_way"].(string)
+
+	execution_frequency, _ := dataBody["execution_frequency"].(string)
+
+	prescribing_number := dataBody["prescribing_number"].(float64)
+
+	prescribing_number_unit := dataBody["prescribing_number_unit"].(string)
+
+	remark := dataBody["remark"].(string)
+
+	single_dose := dataBody["single_dose"].(float64)
+
+	single_dose_unit := dataBody["single_dose_unit"].(string)
+
+	patient_id := int64(dataBody["patient_id"].(float64))
+
+	groupNo := int64(dataBody["group_no"].(float64))
+
+	parent_id := int64(dataBody["parent_id"].(float64))
+
+	advice_doctor := c.GetMobileAdminUserInfo().AdminUser.Id
+	advice := models.XtDoctorAdviceOne{
+		UserOrgId:             org_id,
+		PatientId:             patient_id,
+		AdviceType:            1,
+		AdviceDate:            AdviceDate,
+		StartTime:             StartTime,
+		AdviceName:            advice_name,
+		AdviceDesc:            advice_desc,
+		ReminderDate:          0,
+		SingleDose:            single_dose,
+		SingleDoseUnit:        single_dose_unit,
+		PrescribingNumber:     prescribing_number,
+		PrescribingNumberUnit: prescribing_number_unit,
+		DeliveryWay:           delivery_way,
+		ExecutionFrequency:    execution_frequency,
+		AdviceDoctor:          advice_doctor,
+		Status:                1,
+		CreatedTime:           time.Now().Unix(),
+		UpdatedTime:           time.Now().Unix(),
+		AdviceAffirm:          "",
+		Remark:                remark,
+		StopTime:              0,
+		StopReason:            "",
+		StopDoctor:            0,
+		StopState:             0,
+		ParentId:              parent_id,
+		ExecutionTime:         0,
+		ExecutionStaff:        0,
+		ExecutionState:        0,
+		Checker:               0,
+		RecordDate:            RecordDate,
+		DialysisOrderId:       0,
+		CheckTime:             0,
+		CheckState:            0,
+		DrugSpec:              0,
+		DrugSpecUnit:          "",
+		Groupno:               groupNo,
+		RemindType:            0,
+		FrequencyType:         0,
+		DayCount:              0,
+		WeekDay:               "",
+		TemplateId:            "",
+		Modifier:              0,
+	}
+
+	service.CreateMobileAdivceOne(advice)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功!",
+	})
+}
+
+func (c *DialysisAPIController) DeleteSelfAdviceSubAdvice() {
+
+	id, _ := c.GetInt64("id")
+
+	service.DeleteSelfAdviceSubAdvice(id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功!",
+	})
+}
+
+func (c *DialysisAPIController) GetEditAdviceAction() {
+
+	id, _ := c.GetInt64("id")
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+	advice, _ := service.GetEditAdviceActionList(id, org_id)
+	drugList, _ := service.GetAllDrugList(org_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"advice":   advice,
+		"drugList": drugList,
+	})
+}
+
+func (c *DialysisAPIController) UpdateLongMobileAdvice() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startTime2, _ := dataBody["start_time"].(string)
+	time_arr := strings.Split(startTime2, " ")
+	if len(time_arr) > 0 {
+		startTime2 = time_arr[0]
+	}
+	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
+		utils.ErrorLog("advice_date")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	advice_date, _ := dataBody["advice_date"].(string)
+
+	var advicedateunix int64
+	if len(advice_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", advice_date+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		advicedateunix = theTime.Unix()
+	}
+
+	adviceDate := startTime2
+	if len(adviceDate) == 0 {
+		utils.ErrorLog("len(adviceDate) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err := time.ParseInLocation(timeLayout, adviceDate, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	AdviceDate := advicedateunix
+	RecordDate := advicedateunix
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	startTime, _ := dataBody["start_time"].(string)
+
+	if len(startTime) == 0 {
+		utils.ErrorLog("len(start_time) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	StartTime := theTime.Unix()
+
+	advice_name, _ := dataBody["advice_name"].(string)
+
+	advice_desc, _ := dataBody["advice_desc"].(string)
+
+	delivery_way, _ := dataBody["delivery_way"].(string)
+
+	execution_frequency, _ := dataBody["execution_frequency"].(string)
+
+	prescribing_number := dataBody["prescribing_number"].(float64)
+
+	prescribing_number_unit := dataBody["prescribing_number_unit"].(string)
+
+	remark := dataBody["remark"].(string)
+
+	single_dose := dataBody["single_dose"].(float64)
+
+	single_dose_unit := dataBody["single_dose_unit"].(string)
+
+	id := int64(dataBody["id"].(float64))
+
+	frequency_type := int64(dataBody["frequency_type"].(float64))
+
+	frequency_week, _ := dataBody["frequency_week"].(string)
+
+	day_count := int64(dataBody["day_count"].(float64))
+
+	advice_doctor := c.GetMobileAdminUserInfo().AdminUser.Id
+	advice := models.XtDoctorAdviceOne{
+		AdviceDate:            AdviceDate,
+		StartTime:             StartTime,
+		AdviceName:            advice_name,
+		AdviceDesc:            advice_desc,
+		SingleDose:            single_dose,
+		SingleDoseUnit:        single_dose_unit,
+		PrescribingNumber:     prescribing_number,
+		PrescribingNumberUnit: prescribing_number_unit,
+		DeliveryWay:           delivery_way,
+		ExecutionFrequency:    execution_frequency,
+		AdviceDoctor:          advice_doctor,
+		Remark:                remark,
+		RecordDate:            RecordDate,
+		FrequencyType:         frequency_type,
+		DayCount:              day_count,
+		WeekDay:               frequency_week,
+	}
+
+	service.UpdateMobileDoctorAdviceByIdOne(id, advice)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"advice": advice,
+	})
+}
+
+func (c *DialysisAPIController) UpdateEditDrugOrder() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startTime2, _ := dataBody["start_time"].(string)
+	time_arr := strings.Split(startTime2, " ")
+	if len(time_arr) > 0 {
+		startTime2 = time_arr[0]
+	}
+	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
+		utils.ErrorLog("advice_date")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	advice_date, _ := dataBody["advice_date"].(string)
+
+	var advicedateunix int64
+	if len(advice_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", advice_date+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		advicedateunix = theTime.Unix()
+	}
+
+	adviceDate := startTime2
+	if len(adviceDate) == 0 {
+		utils.ErrorLog("len(adviceDate) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err := time.ParseInLocation(timeLayout, adviceDate, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	AdviceDate := advicedateunix
+	RecordDate := advicedateunix
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	startTime, _ := dataBody["start_time"].(string)
+
+	if len(startTime) == 0 {
+		utils.ErrorLog("len(start_time) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	StartTime := theTime.Unix()
+
+	advice_name, _ := dataBody["advice_name"].(string)
+
+	advice_desc, _ := dataBody["advice_desc"].(string)
+
+	delivery_way, _ := dataBody["delivery_way"].(string)
+
+	execution_frequency, _ := dataBody["execution_frequency"].(string)
+
+	prescribing_number := dataBody["prescribing_number"].(float64)
+
+	prescribing_number_unit := dataBody["prescribing_number_unit"].(string)
+
+	remark := dataBody["remark"].(string)
+
+	single_dose := dataBody["single_dose"].(float64)
+
+	single_dose_unit := dataBody["single_dose_unit"].(string)
+
+	id := int64(dataBody["id"].(float64))
+
+	advice_doctor := c.GetMobileAdminUserInfo().AdminUser.Id
+	advice := models.XtDoctorAdviceOne{
+		AdviceDate:            AdviceDate,
+		StartTime:             StartTime,
+		AdviceName:            advice_name,
+		AdviceDesc:            advice_desc,
+		SingleDose:            single_dose,
+		SingleDoseUnit:        single_dose_unit,
+		PrescribingNumber:     prescribing_number,
+		PrescribingNumberUnit: prescribing_number_unit,
+		DeliveryWay:           delivery_way,
+		ExecutionFrequency:    execution_frequency,
+		AdviceDoctor:          advice_doctor,
+		Remark:                remark,
+		RecordDate:            RecordDate,
+	}
+
+	service.UpdateMobileDoctorAdviceById(id, advice)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"advice": advice,
+	})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -219,4 +219,14 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/savelongmobileadvice", &DialysisAPIController{}, "Post:SaveLongMobileAdvice")
 
 	beego.Router("/m/api/getlongdoctoradvicebypatient", &DialysisAPIController{}, "Get:GetLongDoctorAdviceByPatient")
+
+	beego.Router("/m/api/saveselfchilddruglongadvice", &DialysisAPIController{}, "Post:SaveSelfChildDrugLongAdivce")
+
+	beego.Router("/m/api/deleteselfadvicesubadvice", &DialysisAPIController{}, "Get:DeleteSelfAdviceSubAdvice")
+
+	beego.Router("/m/api/geteditadviceaction", &DialysisAPIController{}, "Get:GetEditAdviceAction")
+
+	beego.Router("/m/api/updatelongmobileadvice", &DialysisAPIController{}, "Post:UpdateLongMobileAdvice")
+
+	beego.Router("/m/api/updateeditdrugorder", &DialysisAPIController{}, "Post:UpdateEditDrugOrder")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1467,9 +1467,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if lastWarehouseOut.ID == 0 {
 						service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
 					}
+
+					//查询今日是否有出库数据
+					lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, advice.AdviceDate, tx, 1)
 					//出库
 					warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
-						WarehouseOutId:          lastWarehouseOut.ID,
+						WarehouseOutId:          lastWarehouseOutOne.ID,
 						WarehouseOutOrderNumber: warehousing_out_order,
 						DrugId:                  advice.DrugId,
 						Count:                   prescribing_number_total,
@@ -2163,9 +2166,11 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								if lastWarehouseOut.ID == 0 {
 									service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
 								}
+								//查询今日是否有出库数据
+								lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(adminInfo.Org.Id, advice.AdviceDate, tx, 1)
 								//出库
 								warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
-									WarehouseOutId:          lastWarehouseOut.ID,
+									WarehouseOutId:          lastWarehouseOutOne.ID,
 									WarehouseOutOrderNumber: warehousing_out_order,
 									DrugId:                  advice.DrugId,
 									Count:                   prescribing_number_total,

controllers/patient_api_controller.go

@@ -2326,8 +2326,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					prescribing_number_total_one = count
 				}
 
-				fmt.Println("prescribing_number_total_one------------------", prescribing_number_total_one)
-				fmt.Println("selfDrugStockCount.FlushCount", selfDrugStockCount.FlushCount)
 				//库存不足
 				if prescribing_number_total_one > selfDrugStockCount.FlushCount {
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -2771,9 +2769,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						if lastWarehouseOut.ID == 0 {
 							service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
 						}
+
+						//查询今日是否有出库数据
+						lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, advice.AdviceDate, tx, 1)
 						//出库
 						warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
-							WarehouseOutId:          lastWarehouseOut.ID,
+							WarehouseOutId:          lastWarehouseOutOne.ID,
 							WarehouseOutOrderNumber: warehousing_out_order,
 							DrugId:                  advice.DrugId,
 							Count:                   prescribing_number_total,
@@ -3584,9 +3585,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						if lastWarehouseOut.ID == 0 {
 							service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
 						}
+						//查询今日是否有出库数据
+						lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, advice.AdviceDate, tx, 1)
+
 						//出库
 						warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
-							WarehouseOutId:          lastWarehouseOut.ID,
+							WarehouseOutId:          lastWarehouseOutOne.ID,
 							WarehouseOutOrderNumber: warehousing_out_order,
 							DrugId:                  advice.DrugId,
 							Count:                   prescribing_number_total,

models/dialysis.go

@@ -514,7 +514,7 @@ type XtDoctorAdvice struct {
 	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
 	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
 	UserName              string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	CheckerName           string  `gorm:"column:user_name" json:"name" form:"name"`
+	CheckerName           string  `gorm:"column:name" json:"name" form:"name"`
 	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
 }
 
@@ -1747,3 +1747,66 @@ type MewTreatmentMode struct {
 func (MewTreatmentMode) TableName() string {
 	return "xt_treatment_mode"
 }
+
+type XtDoctorAdviceOne 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"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	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"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_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"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	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"`
+	SyncAdviceId          int64   `gorm:"column:sync_advice_id" json:"sync_advice_id" form:"sync_advice_id"`
+	IsSync                int64   `gorm:"column:is_sync" json:"is_sync" form:"is_sync"`
+	SyncId                string  `gorm:"column:sync_id" json:"sync_id" form:"sync_id"`
+	SyncIdStr             string  `gorm:"column:sync_id_str" json:"sync_id_str" form:"sync_id_str"`
+	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	People                int64   `gorm:"column:people" json:"people" form:"people"`
+	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
+	PushStartTime         int64   `gorm:"column:push_start_time" json:"push_start_time" form:"push_start_time"`
+	IsSettle              int64   `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+	IsPrescription        int64   `gorm:"column:is_prescription" json:"is_prescription" form:"is_prescription"`
+}
+
+func (XtDoctorAdviceOne) TableName() string {
+	return "xt_doctor_advice"
+}

service/dialysis_service.go

@@ -2584,9 +2584,16 @@ func CreateMobileAdivce(advice models.DoctorAdvice) error {
 	return err
 }
 
+func CreateMobileAdivceOne(advice models.XtDoctorAdviceOne) error {
+
+	err := XTWriteDB().Create(&advice).Error
+
+	return err
+}
+
 func GetLongDoctorAdviceByPatient(patient_id int64, org_id int64) (advice []*models.XtDoctorAdvice, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and status=1 and advice_type =1", patient_id, org_id).Order("start_time desc").Find(&advice).Error
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and status=1 and advice_type =1", patient_id, org_id).Order("start_time asc").Find(&advice).Error
 
 	return advice, err
 }
@@ -2595,8 +2602,29 @@ func GetLastLongAdviceList(user_org_id int64) (models.XtDoctorAdvice, error) {
 
 	advice := models.XtDoctorAdvice{}
 
-	err := XTReadDB().Where("user_org_id =? and stauts=1 and advice_type =1", user_org_id).Last(&advice).Error
+	err := XTReadDB().Where("user_org_id =? and status=1 and advice_type =1", user_org_id).Last(&advice).Error
 
 	return advice, err
 
 }
+
+func DeleteSelfAdviceSubAdvice(id int64) (models.XtDoctorAdviceOne, error) {
+
+	adviceOne := models.XtDoctorAdviceOne{}
+
+	err2 := XTWriteDB().Model(&adviceOne).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return adviceOne, err2
+}
+
+func UpdateMobileDoctorAdviceById(id int64, advice models.XtDoctorAdviceOne) error {
+
+	err := XTWriteDB().Where("id = ? and status=1", id).Updates(map[string]interface{}{"advice_name": advice.AdviceName, "advice_date": advice.AdviceDate, "start_time": advice.StartTime, "advice_desc": advice.AdviceDesc, "single_dose": advice.SingleDose, "single_dose_unit": advice.SingleDoseUnit, "prescribing_number": advice.PrescribingNumber, "prescribing_number_unit": advice.PrescribingNumberUnit, "delivery_way": advice.DeliveryWay, "execution_frequency": advice.ExecutionFrequency, "remark": advice.Remark}).Error
+	return err
+}
+
+func UpdateMobileDoctorAdviceByIdOne(id int64, advice models.XtDoctorAdviceOne) error {
+
+	err := XTWriteDB().Where("id = ? and status=1", id).Updates(map[string]interface{}{"advice_name": advice.AdviceName, "advice_date": advice.AdviceDate, "start_time": advice.StartTime, "advice_desc": advice.AdviceDesc, "single_dose": advice.SingleDose, "single_dose_unit": advice.SingleDoseUnit, "prescribing_number": advice.PrescribingNumber, "prescribing_number_unit": advice.PrescribingNumberUnit, "delivery_way": advice.DeliveryWay, "execution_frequency": advice.ExecutionFrequency, "remark": advice.Remark, "frequency_type": advice.FrequencyType, "week_day": advice.WeekDay, "day_count": advice.DayCount}).Error
+	return err
+}

service/patient_service.go

@@ -4098,3 +4098,11 @@ func UpdateTheatmentPland(id int64, content string) error {
 
 	return err
 }
+
+func GetEditAdviceActionList(id int64, org_id int64) (models.XtDoctorAdviceOne, error) {
+
+	doctorAdviceOne := models.XtDoctorAdviceOne{}
+	err := XTReadDB().Where("id = ? and status=1 and user_org_id = ?", id, org_id).Find(&doctorAdviceOne).Error
+
+	return doctorAdviceOne, err
+}