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

controllers/dialysis_api_controller.go

@@ -3441,7 +3441,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	//透析单
 	dialysisOrder, _ := service.MobileGetSchedualDialysisRecordTen(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-	fmt.Println("dialysisOrder----------------", dialysisOrder)
+
 	if dialysisOrder != nil {
 		if dialysisOrder.FinishNurse > 0 {
 			operatorIDs = append(operatorIDs, dialysisOrder.FinishNurse)

controllers/his_api_controller.go

@@ -6845,6 +6845,11 @@ func (c *HisApiController) GetUploadInfo() {
 			SetlTime:              tm.Format("2006-01-02 15:04:05"),
 			Decimal:               decimal,
 			OthDesc:               oth_desc,
+			CashPay:               cash_pay,
+			WechatPay:             wechat_pay,
+			AliPay:                ali_pay,
+			JifenPay:              jifen_pay,
+			BandCardPay:           band_card_pay,
 		}
 		err = service.CreateOrderTX(order, tx)
 		if err != nil {

models/his_charge_models.go

@@ -172,6 +172,13 @@ type HisChargeSettleOrder struct {
 	SettleStartTime     int64   `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
 	SettleEndTime       int64   `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
 	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+
+	CashPay     string `gorm:"cash_pay" json:"cash_pay" form:"cash_pay"`
+	BandCardPay string `gorm:"band_card_pay" json:"band_card_pay" form:"band_card_pay"`
+	WechatPay   string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
+	AliPay      string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
+	JifenPay    string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
+	OthDesc     string `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
 }
 
 func (HisChargeSettleOrder) TableName() string {

models/his_models.go

@@ -1044,6 +1044,12 @@ type HisOrder struct {
 	OthDesc               string  `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
 	PayWays               string  `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 
+	CashPay     string `gorm:"cash_pay" json:"cash_pay" form:"cash_pay"`
+	BandCardPay string `gorm:"band_card_pay" json:"band_card_pay" form:"band_card_pay"`
+	WechatPay   string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
+	AliPay      string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
+	JifenPay    string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
+
 	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"`
 

service/dialysis_service.go

@@ -872,7 +872,7 @@ func GetAdminUserES(orgID int64, appID int64, ids []int64) (es []*models.AdminUs
 //}
 
 func GetAdminUserEsOne(orgid int64) (admin []*models.UserAdminRoles, err error) {
-	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status =1")
+	db := readUserDb.Table("sgj_user_admin_role as x")
 	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
 	fmt.Println("table", table)
 	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error

service/pharmacy_service.go

@@ -709,7 +709,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	}
 
 	//针对大丰响水
-	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 {
+	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 && orgid != 10387 {
 		err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and "+
 			"user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
 		if err != nil {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -84,7 +84,7 @@ func GetMedicalStaffs(orgID int64, appID int64) ([]*MedicalStaffVM, error) {
 	// 	Error
 
 	err := db.Table("sgj_user_admin_electronic_signature").
-		Where("org_id=? and app_id=? and status=1", orgID, appID).
+		Where("org_id=? and app_id=?", orgID, appID).
 		Select("creator as id, url as es_url").Scan(&staffs).Error
 
 	if err != nil {

service/stock_service.go

@@ -3820,7 +3820,7 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 
 func GetSearchGoodListSix(keywords string, orgid int64, storehouse_id int64) (good []*models.GoodInfo, err error) {
 
-	db := XTReadDB().Model(&good).Where("org_id =? and status = 1 and good_status <> '停用'", orgid)
+	db := XTReadDB().Model(&good).Where("org_id =? and status = 1  AND find_in_set('停用',good_status) = 0", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(good_name Like ?)", likekey).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {