医保对接

controllers/base_api_controller.go

@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
+
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -67,33 +69,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 = 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)
+		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()
@@ -313,35 +315,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 = 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()
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 10106
+		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/manager_center_api_controller.go

@@ -134,8 +134,10 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
+	//hosp_appr_flag
+	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
+	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	adminInfo := c.GetAdminUserInfo()
-
 	drugLib := &models.BaseDrugLib{
 		DrugName:                    drug_name,
 		Pinyin:                      pinyin,
@@ -190,6 +192,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
+		HospApprFlag:                hosp_appr_flag,
+		LmtUsedFlag:                 lmt_used_flag,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -274,9 +278,10 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
+	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
+	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
-
 	drugLib := &models.BaseDrugLib{
 		ID:                          id,
 		DrugName:                    drug_name,
@@ -333,6 +338,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
+		HospApprFlag:                hosp_appr_flag,
+		LmtUsedFlag:                 lmt_used_flag,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)

models/drug.go

@@ -57,6 +57,8 @@ type BaseDrugLib struct {
 	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

models/his_models.go

@@ -233,6 +233,8 @@ type HisDoctorAdviceInfo struct {
 	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	HospApprFlag          int64                  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -254,6 +256,8 @@ type Drug struct {
 	OrgId                  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode               string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	MedicalInsuranceNumber string `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	HospApprFlag           int64  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (Drug) TableName() string {
@@ -472,6 +476,8 @@ type VMDrug struct {
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (VMDrug) TableName() string {

models/self_drug_models.go

@@ -63,6 +63,8 @@ type XtBaseDrug struct {
 	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (XtBaseDrug) TableName() string {

models/service/stock_service.go

@@ -520,6 +520,8 @@ type Drug struct {
 	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag    int64  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag     int64  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (Drug) TableName() string {

service/drug_stock_service.go

@@ -19,6 +19,8 @@ type DrugConfig struct {
 	RetailPrice  float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	LastPrice    float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	MinUnit      string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	HospApprFlag int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag  int64        `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (DrugConfig) TableName() string {
@@ -69,17 +71,19 @@ func FindStockInNumber(orgId int64) (stockIns []*DrugWarehouseInfo, err error) {
 }
 
 type DrugStockInfo struct {
-	ID          int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	RetailPrice float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugStatus  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	Status      int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	OrgId       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName     string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec     string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	RetailPrice  float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice    float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugStatus   string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	Status       int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId        int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode     string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag  int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 
 	QueryWarehousingInfo  []models.DrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehousing_info"`
 	QuerySalesReturnInfo  []models.DrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_sales_return_info"`

service/his_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
 	"strings"
 	"time"
@@ -536,6 +537,8 @@ type BaseDrugLib struct {
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`
@@ -1347,18 +1350,22 @@ func GetGdybPsnNcdsRecordList(orgID, page, limit int64, keywords string, is_canc
 	db = db.Preload("GdybPsnNcdsRecord", func(db *gorm.DB) *gorm.DB {
 		return db.Model(&GdybPsnNcdsRecord{}).Where("user_org_id = ?", orgID).Order("id asc")
 	})
+	fmt.Println(is_cancel)
 	if len(keywords) == 0 {
-		if is_cancel != 0 {
+		if is_cancel == 1 {
 			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.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 AND xt_patients.lapseto = 1", orgID)
+		} else if is_cancel == 0 {
 			db = db.Preload("GdybPsnNcdsRecord", "user_org_id = ?", orgID)
-			db = db.Where("user_org_id = ? AND status = 1 AND lapseto = 1", orgID)
+			db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 AND xt_patients.lapseto = 1", orgID)
+		} else if is_cancel == 2 {
+			db = db.Joins("LEFT JOIN gdyb_psn_ncds_record On gdyb_psn_ncds_record.patient_id = xt_patients.id AND (gdyb_psn_ncds_record.is_cancel <> 1 OR gdyb_psn_ncds_record.is_cancel is null)")
+			db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 AND xt_patients.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)
+		db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 AND xt_patients.lapseto = 1 AND xt_patients.name LIKE ?", orgID, keywords)
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 
 	}

service/self_drug_service.go

@@ -532,6 +532,8 @@ type Drugs struct {
 	OrgId              int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	MinUnit            string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	Drugs              []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
+	HospApprFlag       int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag        int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (Drugs) TableName() string {

service/stock_service.go

@@ -553,6 +553,8 @@ type Drug struct {
 	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag    int64  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag     int64  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (Drug) TableName() string {