库存调拨修改

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 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2546,6 +2546,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			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)
 
@@ -4443,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/print_data_api_controller.go

@@ -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)

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{}