医保对接

controllers/his_api_controller.go

@@ -540,14 +540,16 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								if prescribingNumberUnit == drug.MinUnit {
 									if prescribing_number > drug.Total {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 								} else {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if num > drug.Total {
-											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 											return
 										}
 									}
@@ -591,7 +593,9 @@ func (c *HisApiController) CreateHisPrescription() {
 										return
 									}
 									if totals > good.Total {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
+
+										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 
@@ -1889,7 +1893,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.Checker = hisAdvice.Checker
 					advice.CheckState = hisAdvice.CheckState
 					advice.StartTime = hisAdvice.StartTime
-					advice.Groupno = hisAdvice.Groupno
+					//advice.Groupno = hisAdvice.Groupno
 
 				}
 			}

controllers/mobile_api_controllers/advice_api_controller.go

@@ -1,7 +0,0 @@
-package mobile_api_controllers
-
-type AdviceAPIController struct {
-	MobileBaseAPIAuthController
-}
-
-// /m/api/dialysis/advices [get]

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -324,14 +324,17 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 
 								if prescribingNumberUnit == drug.MinUnit {
 									if prescribing_number > drug.Total {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 								} else {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if num > drug.Total {
-											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+
+											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 											return
 										}
 									}
@@ -374,7 +377,9 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 										return
 									}
 									if totals > good.Total {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
+
+										//c.ServeFailJSONWithSGJErro，rCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 
@@ -724,7 +729,7 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 					advice.CheckTime = hisAdvice.CheckTime
 					advice.Checker = hisAdvice.Checker
 					advice.CheckState = hisAdvice.CheckState
-					advice.Groupno = hisAdvice.Groupno
+					//advice.Groupno = hisAdvice.Groupno
 					//advice.StartTime = hisAdvice.StartTime
 
 				}

controllers/new_mobile_api_controllers/new_self_drug_api_router.go

@@ -1,9 +0,0 @@
-package new_mobile_api_controllers
-
-import "github.com/astaxie/beego"
-
-func NewDrugApiControllersRegisterRouters() {
-
-	beego.Router("/m/api/drug/getselfmedicallist", &NewDrugApiController{}, "Get:GetSelfMedicalList")
-	beego.Router("/m/api/getdrugdescbydrugname", &NewDrugApiController{}, "Get:GetDrugDescByDrugName")
-}

controllers/schedule_api_controller.go

@@ -2363,7 +2363,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	if week_type > 0 {
-		list, err := service.GetWeekDayScheduleById(orgId, targetDay.Unix(), week_time)
+		list, err := service.GetWeekDayScheduleById(orgId, targetDay.Unix(), week_time, zone)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

routers/router.go

@@ -2,7 +2,6 @@ package routers
 
 import (
 	"XT_New/controllers"
-	//admin_api "XT_New/controllers/admin_api_controllers"
 	m_api "XT_New/controllers/mobile_api_controllers"
 	new_m_api "XT_New/controllers/new_mobile_api_controllers"
 	"github.com/astaxie/beego"

service/schedule_service.go

@@ -564,7 +564,7 @@ func GetWeekDaySchedule(orgID int64, scheduleDate int64, scheduleDates *time.Tim
 	return
 }
 
-func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64) (list []*models.VmSchedulesRemind, err error) {
+func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64, zone int64) (list []*models.VmSchedulesRemind, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
@@ -576,17 +576,20 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64)
 	if scheduleType > 0 {
 		db = db.Where("x.schedule_type = ?", scheduleType)
 	}
+	if zone > 0 {
+		db = db.Where("x.partition_id = ?", zone)
+	}
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id asc")
+		return db.Where("status =1").Order("id desc")
 	}).Find(&list).Error
 
 	return list, err
 }
 
-func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone int64) (list []*models.VmSchedules, err error) {
+func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone int64) (list []*models.VmSchedulesRemind, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
@@ -599,12 +602,14 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		db = db.Where("x.schedule_type = ?", scheduleType)
 	}
 	if zone > 0 {
-		db = db.Where("s.partition_id = ?", zone)
+		db = db.Where("x.partition_id = ?", zone)
 	}
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", "user_org_id =? and status = 1", orgid).Find(&list).Error
+	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Order("id desc")
+	}).Find(&list).Error
 
 	return list, err
 }