库存流水展示

controllers/dialysis_api_controller.go

@@ -6034,14 +6034,17 @@ func (this *DialysisApiController) GetDialysisAdviceToday() {
 
 	schedule_type, _ := this.GetInt64("schedule_type")
 
-	partion_type, _ := this.GetInt64("partion_type")
+	//partion_type, _ := this.GetInt64("partion_type")
 
+	partion_type := this.GetString("partion_type")
+	var ids []string
+	ids = strings.Split(partion_type, ",")
 	start_time := this.GetString("selected_date")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
-	list, err := service.GetDialysisAdviceSchedulistTen(orgId, schedule_type, partion_type, startTime.Unix())
+	list, err := service.GetDialysisAdviceSchedulistTen(orgId, schedule_type, ids, startTime.Unix())
 
 	drug, _ := service.GetAllBaseDrugListTwenty(orgId)
 	_, config := service.FindXTHisRecordByOrgId(orgId)

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -136,7 +136,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
@@ -259,6 +259,8 @@ func (this *PrintDataAPIController) CourseRecordPrintData() {
 	patient, _ := service.GetPatientDetail(adminUserInfo.CurrentOrgId, patient_id)
 
 	adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+
+	operators, err := service.GetAdminUserEsTwo(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -267,6 +269,7 @@ func (this *PrintDataAPIController) CourseRecordPrintData() {
 			"record":    record,
 			"patient":   patient,
 			"adminUser": adminUser,
+			"operators": operators,
 		})
 	}
 }

service/dialysis_solution_service.go

@@ -495,7 +495,7 @@ func GetDialysisAdviceSchedulistSeven(orgID int64, schedule_type int64, partitio
 
 }
 
-func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
+func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
 
 	db := XTReadDB().Model(&models.VmBloodScheduleOne{}).Where("status = 1")
 
@@ -505,8 +505,8 @@ func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_
 	if schedule_type > 0 {
 		db = db.Where("schedule_type = ?", schedule_type)
 	}
-	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+	if len(partition_id) > 0 {
+		db = db.Where("partition_id in(?)", partition_id)
 	}
 
 	if orgID > 0 {

service/pharmacy_service.go

@@ -646,7 +646,7 @@ 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) + "库存不足")
@@ -675,48 +675,52 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 		return err1
 	}
 
-	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 {
-		return
-	}
-	xid := make([]int64, 0)
-	for _, v := range xids {
-		xid = append(xid, v.Id)
-	}
-	var advice []*models.HisDoctorAdviceInfo
-	err = tx.Raw("select * from xt_doctor_advice where id in (?) and status = 1", xid).Scan(&advice).Error
-	if err != nil {
-		return
-	}
-	for _, v := range advice {
-		tmp_bool := IsPharmacyConfig(orgid)
-		if tmp_bool {
-			if PettyCash(v.DrugId) {
-				continue
-			}
-			kou := FenDrugInventory(v, orgid)
-			if !kou {
-				err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
-				return
-			}
-			//扣减库存
-			err = FenStock(orgid, creater, v)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
+	//针对大丰响水
+	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 {
+		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 {
+			return
+		}
+		xid := make([]int64, 0)
+		for _, v := range xids {
+			xid = append(xid, v.Id)
+		}
+		var advice []*models.HisDoctorAdviceInfo
+		err = tx.Raw("select * from xt_doctor_advice where id in (?) and status = 1", xid).Scan(&advice).Error
+		if err != nil {
+			return
+		}
+
+		for _, v := range advice {
+			tmp_bool := IsPharmacyConfig(orgid)
+			if tmp_bool {
+				if PettyCash(v.DrugId) {
+					continue
+				}
+				kou := FenDrugInventory(v, orgid)
+				if !kou {
+					err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
+					return
+				}
+				//扣减库存
+				err = FenStock(orgid, creater, v)
+				if err != nil {
+					err = fmt.Errorf("!:%v", err)
+					return
+				}
 			}
 		}
-	}
-	//修改状态
-	errs1 := XTWriteDB().Model(&models.XtDoctorAdviceL{}).Where("id in (?)", xid).Updates(map[string]interface{}{
-		"is_medicine":     1,
-		"people":          0,
-		"dispensing_time": time_now,
-		"updated_time":    time.Now().Unix(),
-	}).Error
-	if errs1 != nil {
-		return errs1
+		//修改状态
+		errs1 := XTWriteDB().Model(&models.XtDoctorAdviceL{}).Where("id in (?)", xid).Updates(map[string]interface{}{
+			"is_medicine":     1,
+			"people":          0,
+			"dispensing_time": time_now,
+			"updated_time":    time.Now().Unix(),
+		}).Error
+		if errs1 != nil {
+			return errs1
+		}
 	}
 
 	//生成明细记录

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -104,6 +104,7 @@ type DialysisOrderVM struct {
 	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	QualityNurseId int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
+	Url            string          `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (DialysisOrderVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -479,3 +479,11 @@ func GetBatchSummerVM(orgid int64, patient_id int64, assessment_date int64) (*Su
 	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and assessment_date =? and status = 1", orgid, patient_id, assessment_date).Find(&SummerVM).Error
 	return &SummerVM, err
 }
+
+func GetAdminUserEsTwo(orgid int64) (admin []*models.UserAdminRoles, err error) {
+	db := p_service.UserReadDB().Table("sgj_user_admin_role as x").Where("x.status =1")
+	table := p_service.UserReadDB().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
+	return admin, err
+}

service/schedule_service.go

@@ -356,7 +356,7 @@ func UpdateScheduleOne(id int64, schedule models.Schedule) error {
 }
 
 // 参数一：当前操作的患者的排班     参数二被替换床位对应的排班
-func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) error {
+func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) (err error) {
 	utx := XTWriteDB().Begin()
 	//床位
 	var tempBedID int64
@@ -388,12 +388,12 @@ func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) error {
 	schone.ScheduleType = tempTypeTwo
 	schtwo.ScheduleType = tempTypeID
 
-	if err := utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "is_export": 90000}).Error; err != nil {
+	if err = utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "is_export": 90000}).Error; err != nil {
 		utx.Rollback()
 		return err
 	}
 
-	if err := utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "is_export": 90000}).Error; err != nil {
+	if err = utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "is_export": 90000}).Error; err != nil {
 		utx.Rollback()
 		return err
 	}
@@ -401,7 +401,7 @@ func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) error {
 	return err
 }
 
-func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) error {
+func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) (err error) {
 	utx := XTWriteDB().Begin()
 	//床位
 	var tempBedID int64