Merge remote-tracking branch 'origin/20230223_xt_api_new_branch' into 20230223_xt_api_new_branch

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10440 //机构id
+		subscibe.OrgId = 9671 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10440 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 15388 //4
+		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15487 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -328,7 +328,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10440 //机构id小英9675或4
+		subscibe.OrgId = 9671 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,8 +338,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10440 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 15388 //4
+		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15487 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

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

@@ -6205,6 +6205,12 @@ func (c *HisApiController) GetUploadInfo() {
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_ways := c.GetString("pay_ways")
 
+	cash_pay := c.GetString("cash_pay")
+	band_card_pay := c.GetString("band_card_pay")
+	wechat_pay := c.GetString("wechat_pay")
+	ali_pay := c.GetString("ali_pay")
+	jifen_pay := c.GetString("jifen_pay")
+
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
 	discount_price, _ := c.GetFloat("discount_price")
@@ -6529,6 +6535,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/manage_service.go

@@ -1036,7 +1036,7 @@ func GetTimeData(equitid int64, orgid int64, timenow int64) (information []*mode
 	//db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
 	//err = db.Raw("select id,date,class,zone,bed_number,patient_id,contagion,dialysis_mode,start_time,end_time,dialysis_hour,hyperfiltratio,weight_loss,warning_value,user_total,move,failure_stage,fault_description,code_information,disinfect_type,disinfectant_type,disinfection,machine_run,fluid_path,disinfectant,disinfection_status,disinfection_residue,long_time,disinfec_startime,disinfec_endtime,dialysis_checked,dialysis_name,norms,dialysis_concentration,germ_checked,germ_name,germ_number,clean,sign_name,status,ctime,mtime,user_org_id,equiment_id,bed,stime from xt_device_information where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= ? and equiment_id = ? and user_org_id = ?",timenow,equitid, orgid).Error
 	day := time.Now().Day()
-	oldMonth := day - 30
+	oldMonth := day - 90
 	t := time.Date(time.Now().Year(), time.Now().Month(), oldMonth, time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
 
 	err = UserReadDB().Model(&information).Where("date>= ? and date <= ? and equiment_id = ? and user_org_id = ? and dialysis_checked = 1 ", t.Unix(), timenow, equitid, orgid).Find(&information).Error

service/pharmacy_service.go

@@ -679,12 +679,15 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 			if PettyCash(v.DrugId) {
 				continue
 			}
-			////判断药品库存是否充足
-			kou := FenDrugInventory(v, orgid)
-			if !kou {
-				err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
-				return
+			if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 && orgid != 10387 {
+				////判断药品库存是否充足
+				kou := FenDrugInventory(v, orgid)
+				if !kou {
+					err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
+					return
+				}
 			}
+
 			//扣减库存
 			err = FenStock(orgid, creater, v)
 			if err != nil {
@@ -2000,7 +2003,7 @@ func GetAllValidDeviceZones02(orgID int64) ([]*models.DeviceZone, error) {
 
 func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
 
-	db := XTReadDB().Model(&advice).Where("status= 1")
+	db := XTReadDB().Model(&advice).Where("status= 1 and is_medicine = 0")
 
 	if orgid > 0 {
 		db = db.Where("user_org_id = ?", orgid)

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -107,13 +107,13 @@ type AdminUserListTwo struct {
 
 func GetAllAdminUsers(orgId int64, appid int64) (list []*AdminUserList, err error) {
 	db := p_service.UserReadDB()
-	err = db.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	err = db.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }
 
 func GetAllName(orgId int64, appid int64) (list []AdminUserListTwo, err error) {
 	db := p_service.UserReadDB()
-	err = db.Table("sgj_user_admin_role as uar").Joins("left join sgj_user_admin as ua on ua.id = uar.admin_user_id").Joins("left join sgj_user_admin_electronic_signature  as e on e.creator = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and ua.status=1 and e.status = 1 and e.org_id = ? and e.app_id = ?", orgId, appid, orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,e.url").Scan(&list).Error
+	err = db.Table("sgj_user_admin_role as uar").Joins("left join sgj_user_admin as ua on ua.id = uar.admin_user_id").Joins("left join sgj_user_admin_electronic_signature  as e on e.creator = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1 and e.status = 1 and e.org_id = ? and e.app_id = ?", orgId, appid, orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,e.url").Scan(&list).Error
 	return
 }
 

service/stock_service.go

@@ -1161,7 +1161,7 @@ func FindWarehousingInfoByIdOne(id []int64) (list []*models.WarehousingInfo, err
 }
 
 func FindDrugWarehousingInfoById(id int64, org_id int64) (list []*VMDrugWarehouseInfo, err error) {
-	err = readDb.Model(&VMDrugWarehouseInfo{}).Preload("Drug", "status = 1 AND org_id = ? AND find_in_set('停用',drug_status) = 0", org_id).Where("warehousing_id = ? AND status = 1", id).Find(&list).Error
+	err = readDb.Model(&VMDrugWarehouseInfo{}).Preload("Drug", "status = 1 AND org_id = ? AND find_in_set('',drug_status) = 0", org_id).Where("warehousing_id = ? AND status = 1", id).Find(&list).Error
 	return list, err
 }
 
@@ -3772,7 +3772,7 @@ func GetWarehouseOrderInfoList(orgid int64) (list []*models.WarehousingInfo, err
 
 func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib, err error) {
 
-	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用'", orgid)
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1 and find_in_set('停用',drug_status) = 0", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
@@ -3788,7 +3788,8 @@ func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib
 
 func GetSearchDrugListSix(keywords string, orgid int64, storehouse_id int64) (drug []*models.BaseDrugLib, err error) {
 
-	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  AND find_in_set('停用',x.drug_status) = 0'", orgid)
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1 and find_in_set('停用',drug_status) = 0", orgid)
+
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {