医保对接

controllers/base_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -69,36 +70,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 4
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 4
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 3877
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
@@ -315,35 +316,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 4
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 4
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 3877
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/his_api_controller.go

@@ -1884,6 +1884,22 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 		advice.PrescribingNumber = prescribingNumber
 	}
 
+	if json["frequency_type"] != nil || reflect.TypeOf(json["frequency_type"]).String() == "float64" {
+		frequency_type := int64(json["frequency_type"].(float64))
+		advice.FrequencyType = frequency_type
+	}
+
+	if json["day_count"] != nil || reflect.TypeOf(json["day_count"]).String() == "float64" {
+		day_count := int64(json["day_count"].(float64))
+		advice.DayCount = day_count
+	}
+
+	if json["week_day"] != nil && reflect.TypeOf(json["week_day"]).String() == "string" {
+		//week_day, _ := strconv.ParseFloat(json["week_day"].(string), 64)
+		week_day, _ := json["week_day"].(string)
+		advice.WeekDay = week_day
+	}
+
 	if json["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
 		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
 		advice.PrescribingNumberUnit = prescribingNumberUnit
@@ -2146,6 +2162,22 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		project.Unit = unit
 	}
 
+	if json["frequency_type"] != nil || reflect.TypeOf(json["frequency_type"]).String() == "float64" {
+		frequency_type := int64(json["frequency_type"].(float64))
+		project.FrequencyType = frequency_type
+	}
+
+	if json["day_count"] != nil || reflect.TypeOf(json["day_count"]).String() == "float64" {
+		day_count := int64(json["day_count"].(float64))
+		project.DayCount = day_count
+	}
+
+	if json["week_day"] != nil && reflect.TypeOf(json["week_day"]).String() == "string" {
+		//week_day, _ := strconv.ParseFloat(json["week_day"].(string), 64)
+		week_day, _ := json["week_day"].(string)
+		project.WeekDay = week_day
+	}
+
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(project.UserOrgId)
 
 	if project.ID == 0 {
@@ -2233,6 +2265,8 @@ func (c *HisApiController) setAddtionWithJSON(additionalCharge *models.HisAdditi
 
 func (c *HisApiController) setAdviceTemplateWithJSON(advice *models.HisPrescriptionAdviceTemplate, json map[string]interface{}) int {
 
+	fmt.Println("~~~~~~")
+
 	if json["drug_name"] == nil || reflect.TypeOf(json["drug_name"]).String() != "string" {
 		utils.ErrorLog("drug_name")
 		return enums.ErrorCodeParamWrong
@@ -2303,6 +2337,7 @@ func (c *HisApiController) setAdviceTemplateWithJSON(advice *models.HisPrescript
 		day := int64(json["day"].(float64))
 		advice.Day = day
 	}
+
 	return 0
 }
 
@@ -4709,7 +4744,6 @@ func (c *HisApiController) CreateHisPrescriptionTemplate() {
 				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 					advices := items["advices"].([]interface{})
 					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
-					groupNo := int64(0)
 					ctime := time.Now().Unix()
 					mtime := ctime
 					if len(advices) > 0 {
@@ -4721,7 +4755,6 @@ func (c *HisApiController) CreateHisPrescriptionTemplate() {
 							s.ExecutionState = 2
 							s.Status = 1
 							s.UserOrgId = adminInfo.CurrentOrgId
-							s.Groupno = groupNo
 							s.CreatedTime = ctime
 							s.UpdatedTime = mtime
 							s.PatientId = patient_id

controllers/his_config_api_controller.go

@@ -347,6 +347,10 @@ func (c *HisConfigApiController) setAdviceTemplateWithJSON(advice *models.HisPre
 		day := int64(json["day"].(float64))
 		advice.Day = day
 	}
+	if json["groupno"] != nil || reflect.TypeOf(json["groupno"]).String() == "float64" {
+		groupno := int64(json["groupno"].(float64))
+		advice.Groupno = groupno
+	}
 	return 0
 }
 

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -720,6 +720,22 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 		advice.HospApprFlag = hosp_appr_flag
 	}
 
+	if json["frequency_type"] != nil || reflect.TypeOf(json["frequency_type"]).String() == "float64" {
+		frequency_type := int64(json["frequency_type"].(float64))
+		advice.FrequencyType = frequency_type
+	}
+
+	if json["day_count"] != nil || reflect.TypeOf(json["day_count"]).String() == "float64" {
+		day_count := int64(json["day_count"].(float64))
+		advice.DayCount = day_count
+	}
+
+	if json["week_day"] != nil && reflect.TypeOf(json["week_day"]).String() == "string" {
+		//week_day, _ := strconv.ParseFloat(json["week_day"].(string), 64)
+		week_day, _ := json["week_day"].(string)
+		advice.WeekDay = week_day
+	}
+
 	if json["advice_id"] != nil && reflect.TypeOf(json["advice_id"]).String() == "float64" {
 		advice_id := int64(json["advice_id"].(float64))
 		advice.ID = advice_id
@@ -942,6 +958,23 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 		project.TeamId = team_id
 
 	}
+
+	if json["frequency_type"] != nil || reflect.TypeOf(json["frequency_type"]).String() == "float64" {
+		frequency_type := int64(json["frequency_type"].(float64))
+		project.FrequencyType = frequency_type
+	}
+
+	if json["day_count"] != nil || reflect.TypeOf(json["day_count"]).String() == "float64" {
+		day_count := int64(json["day_count"].(float64))
+		project.DayCount = day_count
+	}
+
+	if json["week_day"] != nil && reflect.TypeOf(json["week_day"]).String() == "string" {
+		//week_day, _ := strconv.ParseFloat(json["week_day"].(string), 64)
+		week_day, _ := json["week_day"].(string)
+		project.WeekDay = week_day
+	}
+
 	// if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
 	// 	price := int64(json["price"].(float64))
 	// 	formatInt_price := strconv.FormatInt(price, 10)

models/his_models.go

@@ -774,6 +774,10 @@ type HisPrescriptionProject struct {
 	TeamId         int64 `gorm:"column:team_id" json:"team_id" form:"team_id"`
 
 	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
+
+	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"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -1394,6 +1398,9 @@ type HisPrescriptionProjectTemplate struct {
 	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
 	XtHisProject       XtHisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	GoodInfo           GoodInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good_info"`
+	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            int64        `gorm:"column:week_day" json:"week_day" form:"week_day"`
 }
 
 func (HisPrescriptionProjectTemplate) TableName() string {

service/his_service.go

@@ -1518,6 +1518,10 @@ type HisPrescriptionProject struct {
 	Checker        int64 `gorm:"column:checker" json:"checker" form:"checker"`
 	StartTime      int64 `gorm:"column:start_time" json:"start_time" form:"start_time"`
 	TeamId         int64 `gorm:"column:team_id" json:"team_id" form:"team_id"`
+
+	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"`
 }
 
 func (HisPrescriptionProject) TableName() string {