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

@@ -3189,13 +3189,15 @@ func (c *HisApiController) GetUploadInfo() {
 	if tempOrder.ID == 0 {
 		if settle_accounts_type == 1 { //日结
 			fmt.Println(reg_type)
-			if reg_type == 11 {
-				fmt.Println(reg_type)
+
+			if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
+
 				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
 			} else {
 				prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
 			}
 		} else { //月结
+
 			start_time_str := c.GetString("start_time")
 			end_time_str := c.GetString("end_time")
 			timeLayout := "2006-01-02"
@@ -3249,6 +3251,10 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 		}
 
+		if reg_type == 1111 || reg_type == 1112 {
+			reg_type = 11
+		}
+
 		allTotal := fmt.Sprintf("%.4f", total)
 		totals, _ := strconv.ParseFloat(allTotal, 64)
 		order := &models.HisOrder{
@@ -5014,7 +5020,7 @@ func (c *HisApiController) PreSettle() {
 
 	if settle_accounts_type == 1 { //日结
 
-		if reg_type == 11 {
+		if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
 
 			prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
 		} else {

controllers/manager_center_api_controller.go

@@ -1440,6 +1440,8 @@ func (c *ManagerCenterApiController) GetAllManufacturer() {
 func (c *ManagerCenterApiController) CreateGoodInfo() {
 	good_id, _ := c.GetInt64("good_id", 0)
 	specification_name := c.GetString("specification_name")
+	register_number := c.GetString("register_number")
+
 	good_unit, _ := c.GetInt64("good_unit", -1)
 	buy_price, _ := c.GetFloat("buy_price", 0)
 	sell_price, _ := c.GetFloat("sell_price", 0)
@@ -1540,6 +1542,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		PackingPrice:                packing_price,
 		DefaultCountUnit:            default_count_unit,
 		MinUnit:                     min_unit,
+		RegisterNumber:              register_number,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1601,6 +1604,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	default_count_unit := c.GetString("default_count_unit")
 	min_unit := c.GetString("min_unit")
 	total, _ := c.GetFloat("total")
+	register_number := c.GetString("register_number")
 
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -1652,6 +1656,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		DefaultCountUnit:            default_count_unit,
 		MinUnit:                     min_unit,
 		Total:                       total,
+		RegisterNumber:              register_number,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

models/good_models.go

@@ -80,6 +80,7 @@ type GoodInfo struct {
 	StWarehousingInfo           []*StWarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
 	CancelStockInfo             []*CancelStockInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"cancel_stock_info"`
 	GoodSotckInfo               []*GoodSotckInfo     `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_stock_in"`
+	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (GoodInfo) TableName() string {

models/his_charge_models.go

@@ -172,6 +172,7 @@ type HisChargeGoodInfo struct {
 	GoodName           string `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	GoodUnit           int64  `gorm:"column:good_unit" json:"good_unit"`
 	SpecificationnName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	RegisterNumber     string `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (HisChargeGoodInfo) TableName() string {

models/his_models.go

@@ -467,9 +467,8 @@ type TempHisOrder struct {
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
 	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	AccountPrice          float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
-
-	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
-	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	FaPiaoCode            string    `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber          string    `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
 
 	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 
@@ -508,6 +507,7 @@ type HisPrescription struct {
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 	HisPrescriptionInfo    HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	HisOrder               HisOrder                  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 	Total                  string                    `gorm:"-" json:"total" form:"total"`
 	PType                  int64                     `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`

models/stock_models.go

@@ -317,6 +317,7 @@ type WarehousingGoodInfo struct {
 	Dealers           Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 	BuyPrice          float64      `gorm:"column:buy_price" json:"buy_price"`
 	Total             float64      `gorm:"column:total" json:"total" form:"total"`
+	RegisterNumber    string       `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (WarehousingGoodInfo) TableName() string {

models/stock_query_models.go

@@ -14,6 +14,7 @@ type StockInfo struct {
 	QueryWarehouseOutInfo []QueryWarehouseOutInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehouseout_info"`
 	QueryCancelStockInfo  []QueryCancelStockInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_cancel_stock_info"`
 	GoodsType             GoodsType               `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
+	RegisterNumber        string                  `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (StockInfo) TableName() string {

service/stock_service.go

@@ -246,6 +246,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"packing_price":                  goodInfo.PackingPrice,
 		"default_count_unit":             goodInfo.DefaultCountUnit,
 		"min_unit":                       goodInfo.MinUnit,
+		"register_number":                goodInfo.RegisterNumber,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})