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

controllers/dialysis_record_api_controller.go

@@ -1145,7 +1145,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		}
 
 		//只针对广慈医院
-		if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.CurrentOrgId == 9987 || adminUserInfo.CurrentOrgId == 9526 || template.TemplateId == 32 || adminUserInfo.CurrentOrgId == 9918 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 4 {
+		if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.CurrentOrgId == 9987 || adminUserInfo.CurrentOrgId == 9526 || template.TemplateId == 32 || adminUserInfo.CurrentOrgId == 9918 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 4 || adminUserInfo.CurrentOrgId == 10447 {
 			// 查询病人是否有透前评估数据
 			befor, errcode := service.GetAssessmentBefor(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 			//如果有数据就插入
@@ -1370,6 +1370,11 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 		}
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
+
+		//新化博翔
+		if adminUserInfo.CurrentOrgId == 10447 || adminUserInfo.CurrentOrgId == 9675 {
+			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
+		}
 	}
 
 	if adminUserInfo.CurrentOrgId == 9583 {

controllers/his_api_controller.go

@@ -878,6 +878,8 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
 		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 
+		//获取是否开启保存耗材出库的开关
+		goodOutOpen, _ := service.GetGoodOutOpenConfigOne(adminInfo.CurrentOrgId)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"drugs":            drugs,
 			"advices_template": advices,
@@ -889,6 +891,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			"additions":        additions,
 			"diagnose":         diagnose,
 			"manufacturers":    manufacturers,
+			"goodOutOpen":      goodOutOpen,
 		})
 	}
 	if adminInfo.CurrentOrgId != 9675 && adminInfo.CurrentOrgId != 9671 && adminInfo.CurrentOrgId != 10215 {
@@ -919,6 +922,8 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
 		diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
 		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
+		//获取是否开启保存耗材出库的开关
+		goodOutOpen, _ := service.GetGoodOutOpenConfigOne(adminInfo.CurrentOrgId)
 
 		c.ServeSuccessJSON(map[string]interface{}{
 			"drugs":            drugs,
@@ -931,6 +936,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			"additions":        additions,
 			"diagnose":         diagnose,
 			"manufacturers":    manufacturers,
+			"goodOutOpen":      goodOutOpen,
 		})
 	}
 }
@@ -2344,6 +2350,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					}
 					//查询是否生成出库单
 					out, _ := service.FindPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime)
+
 					if out.ID == 0 {
 						service.AddSigleWarehouseOut(&warehouseOut)
 					}
@@ -5539,7 +5546,7 @@ type Custom struct {
 	ItemId           int64
 }
 
-//获取个人信息----挂号-----上传就诊信息
+// 获取个人信息----挂号-----上传就诊信息
 func (c *HisApiController) GetRegisterInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -5710,7 +5717,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 }
 
-//上传明细----结算
+// 上传明细----结算
 func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -6555,7 +6562,7 @@ func (c *HisApiController) GetUploadInfo() {
 	}
 }
 
-//退款
+// 退款
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	order, _ := service.GetHisOrderByID(order_id)
@@ -9359,7 +9366,7 @@ func RemoveRepeatedTeam(arr []*models.HisOrderInfoTwo) (newArr []*models.HisOrde
 	return
 }
 
-//修改处方退库操作 参数传修改之前的处方数据
+// 修改处方退库操作 参数传修改之前的处方数据
 func DeleteDrugWarehosueInfo(advice models.HisDoctorAdviceInfo) (err error) {
 
 	if advice.ExecutionState == 1 {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -270,7 +270,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
 	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 {
-		dewater_amount = dewater_amount * 1000
+		if adminUserInfo.Org.Id != 10447 {
+			dewater_amount = dewater_amount * 1000
+		}
+
 	}
 
 	if dewater_amount < 0 {
@@ -383,6 +386,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Bicarbonate = 31.1
 				newprescribe.DialysateFlow = 500
 			}
+			// 针对新化博翔
+			if adminUserInfo.Org.Id == 10447 {
+				newprescribe.DisplaceLiquiPart = 1
+				newprescribe.DisplaceLiquiValue = 32
+				newprescribe.DialysateFlow = 500
+			}
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -662,7 +671,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10318 {
 					evaluation.Remark = "患者已确认无发热，无流行病学接触史"
 				}
-				if adminUserInfo.Org.Id == 10340 {
+				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10447 {
 					evaluation.BreathingRate = "20"
 				}
 				if adminUserInfo.Org.Id == 10445 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1891,6 +1891,10 @@ func (c *DialysisAPIController) Finish() {
 		} else {
 			tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 		}
+		//新化博翔
+		if adminUserInfo.Org.Id == 10447 {
+			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
+		}
 
 	}
 
@@ -2537,6 +2541,13 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.PulseFrequency = befor.PulseFrequency
 			record.BreathingRate = befor.BreathingRate
 		}
+		//新化博翔
+		if adminUserInfo.Org.Id == 10447 {
+			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+			record.SystolicBloodPressure = befor.SystolicBloodPressure
+			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
+			record.BreathingRate = befor.BreathingRate
+		}
 		err := service.CreateMonitor(&record)
 
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
@@ -4433,6 +4444,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
+		fmt.Println("active------------------------------------", active)
+		fmt.Println("len------------------------------", len(goods))
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {

controllers/mobile_api_controllers/login_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -144,9 +145,13 @@ func (this *LoginAPIController) LoginByPwd() {
 
 		//设置cookie
 		mobile = mobile + "-" + strconv.FormatInt(org.Id, 10) + "-" + strconv.FormatInt(appRole.Id, 10)
+		fmt.Println("mobile-------------------------------------------------------", mobile)
 		token := utils.GenerateLoginToken(mobile)
+		fmt.Println("token-------------------------------------------------------", token)
 		expiration, _ := beego.AppConfig.Int64("mobile_token_expiration_second")
 		this.Ctx.SetCookie("token_cookie", token, expiration, "/")
+
+		fmt.Println("cookie获取--------------------------------------------------", this.Ctx.GetCookie("token_cookie"))
 		var configList interface{}
 		var dict_config_list interface{}
 

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 {
+	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 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -72,6 +72,13 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 			advice, _ := service.GetBatchDoctorAdvice(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
 			item.Advices = advice
 
+			//获取His医嘱
+			doctorAdvice, _ := service.GetHisBatchDoctorAdvice(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.HisAdvices = doctorAdvice
+
+			//获取项目
+			project, _ := service.GetHisBatchProject(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.HisPrescriptionProject = project
 			//双人核对
 			dobuleCheck, _ := service.GetBatchDobuleCheck(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
 			item.DoubleCheck = dobuleCheck
@@ -101,6 +108,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			}
 		}
+
 		if getScheduleErr != nil {
 			this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -108,6 +116,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		}
 
 		medicalStaffs, getMedicalStaffErr := service.GetMedicalStaffs(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+
 		if getMedicalStaffErr != nil {
 			this.ErrorLog("获取医护人员失败:%v", getMedicalStaffErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -127,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 {
+	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 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)

controllers/stock_in_api_controller.go

@@ -6278,6 +6278,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 				Dealer:                  dealer_id,
 				LicenseNumber:           warehouseInfo.LicenseNumber,
 				GoodTypeId:              good.GoodTypeId,
+				SysRecordTime:           time.Now().Unix(),
 			}
 
 			stockFlow := models.VmStockFlow{
@@ -6288,7 +6289,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 				Count:                   list.StockCount - item.Count,
 				UserOrgId:               warehouseInfo.OrgId,
 				PatientId:               0,
-				SystemTime:              0,
+				SystemTime:              time.Now().Unix(),
 				ConsumableType:          2,
 				IsSys:                   2,
 				WarehousingOrder:        "",

models/self_drug_models.go

@@ -957,6 +957,7 @@ type SgjDrugWarehouseOutInfo struct {
 	Number                  string     `gorm:"column:number" json:"number" form:"number"`
 	BatchNumber             string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PatientId               int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	IsCheck                 int64      `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	XtBaseDrug              XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 }
 

service/drug_stock_service.go

@@ -263,7 +263,7 @@ func GetDrugOutOrderPrintList(startime int64, endtime int64, orgid int64) (list
 
 func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64) (list []*models.SgjDrugWarehouseOutInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_out_info").Where("status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_out_info").Where("status = 1 and is_check=1")
 	if startime > 0 {
 		db = db.Where("ctime >=?", startime)
 	}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -819,25 +819,27 @@ func (PatientVMOne) TableName() string {
 }
 
 type ScheduleVMSix struct {
-	ID                       int64                       `gorm:"column:id" json:"id"`
-	PatientID                int64                       `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate             int64                       `gorm:"column:schedule_date" json:"schedule_date"`
-	BedID                    int64                       `gorm:"column:bed_id" json:"bed_id"`
-	PartitionId              int64                       `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	Patient                  *PatientVMSix               `gorm:"ForeignKey:PatientID" json:"patient"`
-	DialysisOrder            DialysisOrderVM             `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
-	Prescription             PrescriptionVM              `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
-	ReceiveAssessment        ReceiveAssessmentVM         `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
-	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
-	AssessmentBeforeDislysis AssessmentBeforeDislysisVM  `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
-	AssessmentAfterDislysis  AssessmentAfterDislysisVM   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
-	MonitoringRecords        []*MonitoringRecordVM       `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
-	DeviceNumber             *DeviceNumberVM             `gorm:"ForeignKey:BedID" json:"device_number"`
-	DeviceZone               *DeviceZoneVM               `gorm:"ForeignKey:PartitionId" json:"device_zone"`
-	Advices                  []*DoctorAdviceVM           `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
-	DoubleCheck              *DoubleCheckVM              `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
-	Summer                   *SummerVM                   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
-	LastAfterWeight          XtAssessmentAfterDislysisVM `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	ID                       int64                            `gorm:"column:id" json:"id"`
+	PatientID                int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate             int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	BedID                    int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PartitionId              int64                            `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	Patient                  *PatientVMSix                    `gorm:"ForeignKey:PatientID" json:"patient"`
+	DialysisOrder            DialysisOrderVM                  `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
+	Prescription             PrescriptionVM                   `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
+	ReceiveAssessment        ReceiveAssessmentVM              `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
+	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses         `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
+	AssessmentBeforeDislysis AssessmentBeforeDislysisVM       `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  AssessmentAfterDislysisVM        `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
+	MonitoringRecords        []*MonitoringRecordVM            `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
+	DeviceNumber             *DeviceNumberVM                  `gorm:"ForeignKey:BedID" json:"device_number"`
+	DeviceZone               *DeviceZoneVM                    `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	Advices                  []*DoctorAdviceVM                `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
+	DoubleCheck              *DoubleCheckVM                   `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
+	Summer                   *SummerVM                        `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
+	LastAfterWeight          XtAssessmentAfterDislysisVM      `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	HisAdvices               []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
+	HisPrescriptionProject   []*models.HisPrescriptionProject `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_project"`
 	Count                    int64
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -448,6 +448,18 @@ func GetBatchDoctorAdvice(orgid int64, patient_id int64, advice_date int64) (Doc
 	return DoctorAdviceVM, err
 }
 
+func GetHisBatchDoctorAdvice(orgid int64, patient_id int64, advice_date int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and advice_date = ? and status = 1", orgid, patient_id, advice_date).Order("start_time asc, groupno desc, id asc").Find(&advice).Error
+	return advice, err
+}
+
+func GetHisBatchProject(orgid int64, patient_id int64, advice_date int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date = ? and status= 1", orgid, patient_id, advice_date).Find(&project).Error
+	return project, err
+}
+
 func GetBatchDobuleCheck(orgid int64, patient_id int64, check_date int64) (*DoubleCheckVM, error) {
 
 	doubleCheckVM := DoubleCheckVM{}

service/stock_service.go

@@ -39,7 +39,7 @@ func FindAllDealerTotal(orgId int64) (total int64) {
 	return
 }
 
-//获取经销商的名称
+// 获取经销商的名称
 func FindAllDealerName(orgId int64) (tmp []*models.Dealer, err error) {
 	err = readDb.Model(&models.Dealer{}).Where("org_id = ? and status = 1", orgId).Find(&tmp).Error
 	return
@@ -91,7 +91,7 @@ func ModifyManufacturer(manufacturer *models.Manufacturer) error {
 	return err
 }
 
-//获取生产厂商名称
+// 获取生产厂商名称
 func FindAllManufacturerName(orgid int64) (tmp []*models.Manufacturer, err error) {
 	err = readDb.Model(&models.Manufacturer{}).Where("org_id = ? and status = 1", orgid).Find(&tmp).Error
 	return
@@ -3606,10 +3606,10 @@ func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
 	return list, err
 }
 
-//func GetAllDealerListTX(orgid int64,tx *gorm.DB) (list []*models.Dealer, err error) {
-//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
-//	return list, err
-//}
+//	func GetAllDealerListTX(orgid int64,tx *gorm.DB) (list []*models.Dealer, err error) {
+//		err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+//		return list, err
+//	}
 func GetDealerByName(orgid int64, name string) (*models.Dealer, error) {
 	var dealer models.Dealer
 	var err error
@@ -6515,7 +6515,7 @@ func GetAllDrugFlowById(drugid int64, patient_id int64, advicedate int64, orgid
 	return info, err
 }
 
-//耗材加库存
+// 耗材加库存
 func ModifyGoodAddInformation(good_id int64, sum_count int64, orgid int64) (models.GoodInfo, error) {
 
 	info := models.GoodInfo{}
@@ -6583,7 +6583,7 @@ func GetWarehouseInfoByIdTwenty(id int64, orgid int64) (models.WarehousingInfo,
 	return info, err
 }
 
-//药品加库存
+// 药品加库存
 func ModifyDrugAddInformation(drug_id int64, sum_count int64, orgid int64) (models.BaseDrugLib, error) {
 
 	info := models.BaseDrugLib{}
@@ -8372,7 +8372,7 @@ func DeleteGoodFlow(good_id int64, sys_record_time int64, org_id int64, project_
 func FindPrescriptionWarehouseOut(org_id int64, warehouse_out_time int64) (models.WarehouseOut, error) {
 
 	out := models.WarehouseOut{}
-	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ?", org_id, warehouse_out_time).Find(&out).Error
+	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ? and is_sys=1", org_id, warehouse_out_time).Find(&out).Error
 	return out, err
 
 }
@@ -8380,7 +8380,7 @@ func FindPrescriptionWarehouseOut(org_id int64, warehouse_out_time int64) (model
 func FindLastPrescriptionWarehouseOut(org_id int64, warehouse_out_time int64) (models.WarehouseOut, error) {
 
 	out := models.WarehouseOut{}
-	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ?", org_id, warehouse_out_time).Last(&out).Error
+	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ? and is_sys=1", org_id, warehouse_out_time).Last(&out).Error
 	return out, err
 
 }
@@ -8495,3 +8495,10 @@ func GetNewWarehouseOutInfoList(start_time int64, end_time int64, orgid int64, g
 	err = db.Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&info).Error
 	return info, err
 }
+
+func GetGoodOutOpenConfigOne(user_org_id int64) (models.XtGoodOutConfig, error) {
+
+	config := models.XtGoodOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
+	return config, err
+}

service/warhouse_service.go

@@ -9884,7 +9884,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 	//	return errors.New("库存数量不足")
 	//}
 
-	if warehouse.StockCount-maxNumber > 0 {
+	if warehouse.StockCount-maxNumber >= 0 {
 		warehouse.StockCount = warehouse.StockCount - maxNumber
 	} else {
 		warehouse.StockCount = warehouse.StockCount