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

controllers/his_api_controller.go

@@ -5257,11 +5257,11 @@ func (c *HisApiController) DeletePrescription() {
 	new_prescription, p_err := service.GetPrescriptionById(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
 	new_prescriptions, _ := service.GetHisPrescription(c.GetAdminUserInfo().CurrentOrgId, new_prescription.PatientId, new_prescription.RecordDate, new_prescription.PType)
 
-	for _, item := range new_prescriptions {
-		if item.IsMedicine == 1 {
-			isMedicine = true
-		}
+	//for _, item := range new_prescriptions {
+	if new_prescription.IsMedicine == 1 {
+		isMedicine = true
 	}
+	//}
 
 	for _, item := range new_prescriptions {
 		if item.OrderStatus == 4 {
@@ -5811,11 +5811,11 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 
 	//获取今天该患者所有处方，判断是否发药或者收费
 	new_prescriptions, _ := service.GetHisPrescription(c.GetAdminUserInfo().CurrentOrgId, new_prescription.PatientId, new_prescription.RecordDate, new_prescription.PType)
-	for _, item := range new_prescriptions {
-		if item.IsMedicine == 1 {
-			isMedicine = true
-		}
+	//for _, item := range new_prescriptions {
+	if new_prescription.IsMedicine == 1 {
+		isMedicine = true
 	}
+	//}
 	for _, item := range new_prescriptions {
 		if item.OrderStatus == 4 {
 			isCharge = true
@@ -7638,6 +7638,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					}
 					//advice.Groupno = hisAdvice.Groupno
 				} else {
+					advice.IsMedicine = 0
 					ctime := time.Now().Unix()
 					advice.CreatedTime = ctime
 					advice.UpdatedTime = ctime
@@ -7645,6 +7646,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 				}
 			}
 		} else {
+			advice.IsMedicine = 0
 			ctime := time.Now().Unix()
 			advice.CreatedTime = ctime
 			advice.UpdatedTime = ctime

controllers/new_stock_api_controller.go

@@ -73,6 +73,9 @@ func (c *NewStockApiController) GetDrugChange() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 
+	is_sale, _ := c.GetInt64("is_sale")
+	is_bg, _ := c.GetInt64("is_bg")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -98,7 +101,7 @@ func (c *NewStockApiController) GetDrugChange() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
-	list, total, _ := service.GetNewDrugFlow(orgId, limit, page, startTime, endTime)
+	list, total, _ := service.GetNewDrugFlow(orgId, limit, page, startTime, endTime, is_sale, is_bg)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	houseList, _ := service.GetAllStoreHouseList(orgId)

models/his_charge_models.go

@@ -371,6 +371,7 @@ type NewChargeDetail struct {
 	PType             string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	ItemId            int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Pdate             string  `gorm:"column:pdate" json:"pdate" form:"pdate"`
 }
 
 type NewHisChargeOrder struct {

models/new_drug_stock.go

@@ -60,10 +60,15 @@ type NewDrugFlow struct {
 	Remark                    string                 `gorm:"column:remark" json:"remark" form:"remark"`
 	OperateTime               int64                  `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
 	SaleDate                  string                 `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
-	PCount                    float64
-	SDate                     string
-	PDate                     int64
-	Unit                      string
+	IsSale                    int64                  `gorm:"column:is_sale" json:"is_sale" form:"is_sale"`
+	IsChange                  int64                  `gorm:"column:is_change" json:"is_change" form:"is_change"`
+	Bchno                     string                 `gorm:"column:bchno" json:"bchno" form:"bchno"`
+	BgBchno                   string                 `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
+
+	PCount float64
+	SDate  string
+	PDate  int64
+	Unit   string
 }
 
 func (NewDrugFlow) TableName() string {

models/new_stock.go

@@ -33,6 +33,7 @@ type DrugWarehouseInfoTenOne struct {
 	PcDate                    int64       `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
 	IsPc                      int64       `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
 	IsBg                      int64       `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
+	BgBchno                   string      `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
 }
 
 func (DrugWarehouseInfoTenOne) TableName() string {

service/new_stock_medical_insurance_service.go

@@ -30,7 +30,7 @@ func FindAllDrugWarehousingInfo(org_id int64, is_pc int64, is_bg int64, start_ti
 	return list, err
 }
 
-func GetNewDrugFlow(orgid int64, limit int64, page int64, startTime int64, endTime int64) (drug_flow []*models.NewDrugFlow, total int64, err error) {
+func GetNewDrugFlow(orgid int64, limit int64, page int64, startTime int64, endTime int64, is_sale int64, is_bg int64) (drug_flow []*models.NewDrugFlow, total int64, err error) {
 
 	offset := (page - 1) * limit
 	db := XTReadDB().Model(drug_flow).Where("status = 1")
@@ -43,6 +43,13 @@ func GetNewDrugFlow(orgid int64, limit int64, page int64, startTime int64, endTi
 	if endTime > 0 {
 		db = db.Where("ctime<=?", endTime)
 	}
+	if is_sale != 3 {
+		db = db.Where("is_sale = ?", is_sale)
+	}
+	if is_bg != 3 {
+		db = db.Where("is_change = ?", is_bg)
+	}
+
 	//if stock_type > 0 {
 
 	//手动入库