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

@@ -2,8 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
-
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -69,33 +67,33 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
+		//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)
+		//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()
@@ -315,35 +313,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"
+		//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()
+		//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()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/his_api_controller.go

@@ -80,6 +80,10 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/cost/compare", &HisApiController{}, "get:GetMedicalInsuranceCostCompareList")
 
+	beego.Router("/api/record/list", &HisApiController{}, "get:GetPutOnRecordList")
+
+	//beego.Router("/api/export/template", &HisApiController{}, "get:ExportOrderTemplate")
+
 }
 
 func (c *HisApiController) Sscard() {
@@ -453,7 +457,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							var s models.HisDoctorAdviceInfo
 							s.PrescriptionId = prescription.ID
 							s.AdviceType = 2
-							s.AdviceDoctor = adminInfo.AdminUser.Id
+							s.AdviceDoctor = doctor_id
 							s.StopState = 2
 							s.ExecutionState = 2
 							s.AdviceDate = recordDateTime
@@ -1789,7 +1793,7 @@ type ResultTwo struct {
 		} `json:"baseinfo"`
 		Idetinfo []interface{} `json:"idetinfo"`
 		Iinfo    []struct {
-			Balc                   int64       `json:"balc"`
+			Balc                   float64     `json:"balc"`
 			CvlservFlag            string      `json:"cvlserv_flag"`
 			EmpName                string      `json:"emp_name"`
 			InsuplcAdmdvs          string      `json:"insuplc_admdvs"`
@@ -2769,3 +2773,33 @@ func (c *HisApiController) GetMedicalInsuranceCostCompareList() {
 	return
 
 }
+
+func (c *HisApiController) GetPutOnRecordList() {
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	keywords := c.GetString("keywords")
+	is_put_on_record, _ := c.GetInt64("is_put_on_record")
+
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 10
+	}
+	list, total, _ := service.GetGdybPsnNcdsRecordList(c.GetAdminUserInfo().CurrentOrgId, page, limit, keywords, is_put_on_record)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"total": total,
+		"list":  list,
+	})
+	return
+
+}
+
+//func (c *HisApiController)ExportOrderTemplate(){
+//	start_time := c.GetString("start_time")
+//	end_time := c.GetString("end_time")
+//
+//
+//
+//
+//}

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -317,7 +317,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							var s models.HisDoctorAdviceInfo
 							s.PrescriptionId = prescription.ID
 							s.AdviceType = 2
-							s.AdviceDoctor = adminInfo.AdminUser.Id
+							s.AdviceDoctor = doctor_id
 							s.StopState = 2
 							s.ExecutionState = 2
 							s.AdviceDate = recordDateTime

service/his_service.go

@@ -1300,3 +1300,68 @@ func GetMedicalInsuranceCostCompareList(orgID, page, limit int64, keywords strin
 	}
 	return
 }
+
+type TempPatients 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"`
+	UserId            int64             `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar            string            `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	Lapseto           int64             `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Name              string            `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo          string            `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Phone             string            `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone     string            `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	HomeAddress       string            `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	Status            int64             `gorm:"column:status" json:"status" form:"status"`
+	GdybPsnNcdsRecord GdybPsnNcdsRecord `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"record"`
+}
+
+func (TempPatients) TableName() string {
+	return "xt_patients"
+}
+
+type GdybPsnNcdsRecord 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"`
+	PsnNo         string `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+	DoctorId      int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId  int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	Insutype      string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SickType      int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
+}
+
+func (GdybPsnNcdsRecord) TableName() string {
+	return "gdyb_psn_ncds_record"
+}
+
+func GetGdybPsnNcdsRecordList(orgID, page, limit int64, keywords string, is_cancel int64) (list []*TempPatients, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&TempPatients{})
+	db = db.Preload("GdybPsnNcdsRecord", func(db *gorm.DB) *gorm.DB {
+		return db.Model(&GdybPsnNcdsRecord{}).Where("user_org_id = ?", orgID).Order("id asc")
+	})
+	if len(keywords) == 0 {
+		if is_cancel != 0 {
+			db = db.Joins("JOIN gdyb_psn_ncds_record On gdyb_psn_ncds_record.patient_id = xt_patients.id AND gdyb_psn_ncds_record.is_cancel = ?", is_cancel)
+			db = db.Where("user_org_id = ? AND status = 1 AND lapseto = 1", orgID)
+		} else {
+			db = db.Preload("GdybPsnNcdsRecord", "user_org_id = ?", orgID)
+			db = db.Where("user_org_id = ? AND status = 1 AND lapseto = 1", orgID)
+		}
+		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	} else {
+		keywords = "%" + keywords + "%"
+		db = db.Where("user_org_id = ? AND status = 1 AND lapseto = 1 AND name LIKE ?", orgID, keywords)
+		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+
+	}
+
+	return
+}