Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/his_api_controller.go

 	//获取所有基础药
 	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
 
+	manufacturers, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
+
 	_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
 	if config.ID > 0 && config.IsOpen == 1 {
 		for _, item := range drugs {
 		"sick":             sick,
 		"additions":        additions,
 		"diagnose":         diagnose,
+		"manufacturers":    manufacturers,
 	})
 }
 func (c *HisApiController) CreateHisPrescription() {

controllers/his_charge_api_controller.go

 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
 	"github.com/astaxie/beego"
 	"time"
 )
 	beego.Router("/api/his/inspectionlist/get", &HisChargeApiController{}, "get:GetHisInspectionList")
 	beego.Router("/api/his/inspectioninfo/get", &HisChargeApiController{}, "get:GetHisInspectionInfo")
 
+	//发票
+	beego.Router("/api/fapiao/create", &HisChargeApiController{}, "post:CreateFaPiaoRecord")
+	beego.Router("/api/fapiao/modify", &HisChargeApiController{}, "post:ModifyFaPiaoRecord")
+	beego.Router("/api/fapiao/list", &HisChargeApiController{}, "get:GetFaPiaoRecordList")
+	beego.Router("/api/fapiao/delete", &HisChargeApiController{}, "post:DeleteFaPiaoRecord")
+	beego.Router("/api/fapiao", &HisChargeApiController{}, "get:GetFaPiaoRecord")
+	beego.Router("/api/fapiao/is_use", &HisChargeApiController{}, "post:UpdateFaPiaoRecordIsUse")
+
+}
+
+func (c *HisChargeApiController) UpdateFaPiaoRecordIsUse() {
+	id, _ := c.GetInt64("id", 0)
+	is_use, _ := c.GetInt64("is_use")
+	if id <= 0 {
+		utils.ErrorLog("id == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	record, _ := service.FindFapiaoById(id)
+	adminUserInfo := c.GetAdminUserInfo()
+	service.UpdateFapiaoIsUse(adminUserInfo.CurrentOrgId)
+	records := models.HisFapiaoRecord{
+		ID:           id,
+		FapiaoCode:   record.FapiaoCode,
+		FapiaoNumber: record.FapiaoNumber,
+		Ctime:        time.Now().Unix(),
+		Mtime:        time.Now().Unix(),
+		UserOrgId:    adminUserInfo.CurrentOrgId,
+		Status:       1,
+		IsUse:        is_use,
+	}
+	err := service.ModifyFapiao(&records)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": records,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *HisChargeApiController) CreateFaPiaoRecord() {
+	fapiao_code := c.GetString("fapiao_code")
+	fapiao_number := c.GetString("fapiao_number")
+	if len(fapiao_code) <= 0 {
+		utils.ErrorLog("len(fapiao_code) == 0")
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(fapiao_number) <= 0 {
+		utils.ErrorLog("len(fapiao_number) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+
+	record := models.HisFapiaoRecord{
+		FapiaoCode:   fapiao_code,
+		FapiaoNumber: fapiao_number,
+		Ctime:        time.Now().Unix(),
+		Mtime:        time.Now().Unix(),
+		UserOrgId:    adminUserInfo.CurrentOrgId,
+		Status:       1,
+		IsUse:        0,
+	}
+
+	err, records := service.AddSigleFapiaoRecord(&record)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": records,
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+
+	}
+
+}
+func (c *HisChargeApiController) ModifyFaPiaoRecord() {
+	id, _ := c.GetInt64("id", 0)
+	fapiao_code := c.GetString("fapiao_code")
+	fapiao_number := c.GetString("fapiao_number")
+
+	if id <= 0 {
+		utils.ErrorLog("id == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(fapiao_code) <= 0 {
+		utils.ErrorLog("len(fapiao_code) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(fapiao_number) <= 0 {
+		utils.ErrorLog("len(fapiao_number) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	record, _ := service.FindFapiaoById(id)
+	adminUserInfo := c.GetAdminUserInfo()
+	records := models.HisFapiaoRecord{
+		ID:           id,
+		FapiaoCode:   fapiao_code,
+		FapiaoNumber: fapiao_number,
+		Ctime:        time.Now().Unix(),
+		Mtime:        time.Now().Unix(),
+		UserOrgId:    adminUserInfo.CurrentOrgId,
+		Status:       1,
+		IsUse:        record.IsUse,
+	}
+
+	err := service.ModifyFapiao(&records)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": records,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *HisChargeApiController) GetFaPiaoRecordList() {
+	page, _ := c.GetInt64("page", 1)
+	limit, _ := c.GetInt64("limit", 7)
+	adminUserInfo := c.GetAdminUserInfo()
+	fapiaoRecord, total, err := service.FindAllFapiaoList(adminUserInfo.CurrentOrgId, page, limit)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": fapiaoRecord,
+			"total":         total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *HisChargeApiController) DeleteFaPiaoRecord() {
+	id, _ := c.GetInt64("id", 0)
+	err := service.DeleteFapiaoById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *HisChargeApiController) GetFaPiaoRecord() {
+	id, _ := c.GetInt64("id", 0)
+	fapiaoRecord, err := service.FindFapiaoById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": fapiaoRecord,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
 }
 
 func (c *HisChargeApiController) GetChargeStatisticsDetail() {

controllers/public_api_controller.go

 }
 
 func (c *PublicApiController) HandleOrder() {
-	orders, _ := service.GetAllHisOrder()
-
-	for index, item := range orders {
-		item.FaPiaoCode = "144072080589"
-		var zero string
-		if 1520+int64(index) >= 1000 {
-			zero = "0000" + strconv.FormatInt(1520+int64(index), 10)
-		} else if 1520+int64(index) >= 10000 {
-			zero = "000" + strconv.FormatInt(1520+int64(index), 10)
-		} else if 1520+int64(index) >= 100000 {
-			zero = "00" + strconv.FormatInt(1520+int64(index), 10)
-		} else if 1520+int64(index) >= 1000000 {
-			zero = "0" + strconv.FormatInt(1520+int64(index), 10)
-		} else {
-			zero = strconv.FormatInt(1520+int64(index), 10)
+	orders, _ := service.GetAllHisOrder(10138)
+	record, _ := service.FindFapiaoByIsUse(10138)
+	last_order, _ := service.GetAllHisOrderTwo(10138)
+	if record.ID > 0 {
+		for index, item := range orders {
+			item.FaPiaoCode = record.FapiaoCode
+			var zero string
+			max_number, _ := strconv.ParseInt(last_order.FaPiaoNumber, 10, 64)
+			number, _ := strconv.ParseInt(record.FapiaoNumber, 10, 64)
+			number = number + max_number
+			if number+int64(index) >= 1000 {
+				zero = "0000" + strconv.FormatInt(number+int64(index), 10)
+			} else if number+int64(index) >= 10000 {
+				zero = "000" + strconv.FormatInt(number+int64(index), 10)
+			} else if number+int64(index) >= 100000 {
+				zero = "00" + strconv.FormatInt(number+int64(index), 10)
+			} else if number+int64(index) >= 1000000 {
+				zero = "0" + strconv.FormatInt(number+int64(index), 10)
+			} else {
+				zero = strconv.FormatInt(number+int64(index), 10)
+			}
+			item.FaPiaoNumber = zero
+			item.FaPiaoBatchnumberId = record.ID
+			service.SaveOrder(item)
 		}
-		item.FaPiaoNumber = zero
-		service.SaveOrder(item)
 	}
 }
 

models/his_charge_models.go

 func (HisLabelPrintInfo) TableName() string {
 	return "his_label_print_info"
 }
+
+type HisFapiaoRecord struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	FapiaoCode   string `gorm:"column:fapiao_code" json:"fapiao_code" form:"fapiao_code"`
+	FapiaoNumber string `gorm:"column:fapiao_number" json:"fapiao_number" form:"fapiao_number"`
+	IsUse        int64  `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	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"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+}
+
+func (HisFapiaoRecord) TableName() string {
+	return "his_fapiao_record"
+}

models/his_models.go

 	Way                   int64                  `gorm:"column:way" json:"way" form:"way"`
 	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"`
+	HisOrderInfo          HisOrderInfo           `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"order_info"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
 
 	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"`
-	IsCheckTeam   int64  `gorm:"-" json:"is_check_team" form:"is_check_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"`
+	IsCheckTeam   int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	HisOrderInfo  HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
 }
 
 func (HisPrescriptionProject) TableName() string {
 	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
 	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	Diagnosis               string                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	FaPiaoBatchnumberId     int64                   `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
 }
 
 func (HisOrder) TableName() string {

service/app_version.go

 	writeDb.Save(&his)
 }
 
-func GetAllHisOrder() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106 AND status = 1 AND order_status = 2 AND settle_accounts_date < 1623168000").Find(&his).Error
+func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code == '' AND fa_piao_number == '' ", org_id).Find(&his).Error
+	return
+}
+
+func GetAllHisOrderTwo(org_id int64) (his models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code <> '' AND fa_piao_number <> '' ", org_id).Last(&his).Error
 	return
 }
 
 func GetLastHisOrder() (his models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 4 AND status = 1 AND order_status = 2").Last(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106 AND status = 1 AND order_status = 2").Last(&his).Error
 	return
 }
 
 	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
 	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count              int64   `gorm:"column:count" json:"count" form:"count"`
+	Count              string  `gorm:"column:count" json:"count" form:"count"`
 	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	MedListCodg        string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
 	SingleDose         string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
 	writeDb.Model(&HisPrescriptionProjectTemplate{}).Where("id = ?", project_id).Updates(map[string]interface{}{"status": 0})
 	writeDb.Model(&HisPrescriptionInfoTemplateTwo{}).Where("id = ?", p_id).Updates(map[string]interface{}{"status": 0})
 }
+
+func SaveOrder(order *models.HisOrder) {
+	writeDb.Save(&order)
+}

service/his_charge_service.go

 import (
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
+	"time"
 )
 
 func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.ChargePatient, err error) {
 	err = db.Where("id = ?", id).First(&labels).Error
 	return
 }
+
+func AddSigleFapiaoRecord(dealer *models.HisFapiaoRecord) (err error, record *models.HisFapiaoRecord) {
+	err = writeDb.Create(&dealer).Error
+	return err, dealer
+}
+
+func ModifyFapiao(mesick *models.HisFapiaoRecord) error {
+	err := writeDb.Save(&mesick).Error
+
+	return err
+}
+
+func UpdateFapiaoIsUse(org_id int64) {
+	writeDb.Model(&models.HisFapiaoRecord{}).Where("user_org_id = ?", org_id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "is_use": 0})
+
+}
+
+func FindAllFapiaoList(orgId int64, page int64, limit int64) (list []*models.HisFapiaoRecord, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisFapiaoRecord{})
+	db = db.Where("user_org_id = ? AND status = 1", orgId)
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	return
+}
+
+func DeleteFapiaoById(id int64) error {
+	err := writeDb.Model(&models.HisFapiaoRecord{}).Where("id = ? AND status = 1", id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+	return err
+}
+
+func FindFapiaoById(id int64) (*models.HisFapiaoRecord, error) {
+	dealer := &models.HisFapiaoRecord{}
+	err := readDb.Model(&models.HisFapiaoRecord{}).Where("id = ? AND status = 1", id).First(&dealer).Error
+	return dealer, err
+}
+
+func FindFapiaoByIsUse(org_id int64) (models.HisFapiaoRecord, error) {
+	record := models.HisFapiaoRecord{}
+	err := readDb.Model(&models.HisFapiaoRecord{}).Where("user_org_id = ? AND status = 1 AND is_use = 1", org_id).First(&record).Error
+	return record, err
+}

service/his_hospital_service.go

 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3", org_id, record_date, patient_id).
 		Find(&prescription).Error
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 2 ", org_id, record_date, patient_id).
 		Find(&prescription).Error

service/his_service.go

 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3  AND order_status <> 2  ", org_id)
 	}).
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", org_id)
 	}).