历史排班

controllers/his_api_controller.go

@@ -1648,9 +1648,11 @@ func (c *HisApiController) GetHisPatientInfo() {
 				if info.RetailPrice > 0 {
 					subItem.Drug.MinPrice = info.RetailPrice
 
-					service.UpdatePrescriptionAdvice(subItem.DrugId, admin.CurrentOrgId, info.RetailPrice, subItem.PatientId)
+					if admin.CurrentOrgId != 10598 {
 
-					service.UpdateBaseMinPrice(subItem.DrugId, admin.CurrentOrgId, info.RetailPrice)
+						service.UpdatePrescriptionAdvice(subItem.DrugId, admin.CurrentOrgId, info.RetailPrice, subItem.PatientId)
+						service.UpdateBaseMinPrice(subItem.DrugId, admin.CurrentOrgId, info.RetailPrice)
+					}
 
 				}
 			}
@@ -1665,9 +1667,11 @@ func (c *HisApiController) GetHisPatientInfo() {
 					if info.Price > 0 {
 						subItem.GoodInfo.PackingPrice = info.Price
 
-						service.UpdatePrescriptionProject(subItem.ProjectId, admin.CurrentOrgId, info.Price, subItem.PatientId)
+						if admin.CurrentOrgId != 10598 {
 
-						service.UpdateGood(subItem.ProjectId, admin.CurrentOrgId, info.Price)
+							service.UpdatePrescriptionProject(subItem.ProjectId, admin.CurrentOrgId, info.Price, subItem.PatientId)
+							service.UpdateGood(subItem.ProjectId, admin.CurrentOrgId, info.Price)
+						}
 
 					}
 				}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1696,22 +1696,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				//fmt.Println("config+++++++++++", config.IsOpen)
 				//fmt.Println("config+++++++++++", item.UserOrgId)
 				//
-				//if config.IsOpen == 1 && item.UserOrgId == 10210 {
-				//
-				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-				//	//更新字典里面的库存
-				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-				//	var sum_count int64
-				//	for _, its := range stockInfo {
-				//		if its.MaxUnit == medical.MaxUnit {
-				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-				//		}
-				//		sum_count += its.StockMaxNumber + its.StockMinNumber
-				//	}
-				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-				//	//剩余库存
-				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				//}
+				if config.IsOpen == 1 && item.UserOrgId == 10402 {
+
+					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//更新字典里面的库存
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					var sum_count int64
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					//剩余库存
+					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
 
 			}
 		}

controllers/sign_api_controller.go

@@ -1232,17 +1232,17 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.ModifyPatient(item.PatientId, item.Count)
 	//}
 
-	//list, _ := service.GetNewAllpatient(orgId)
-	//
-	//for _, item := range list {
-	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
-	//}
+	list, _ := service.GetNewAllpatient(orgId)
 
-	list, _ := service.GetAllDialysisOrder(6963)
 	for _, item := range list {
-		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+		service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	}
 
+	//list, _ := service.GetAllDialysisOrder(6963)
+	//for _, item := range list {
+	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+	//}
+
 	//drugList, _ := service.GetAllBaseDrugList(10571)
 	//for _, item := range drugList {
 	//	//service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)

models/pharmacy_models.go

@@ -46,16 +46,19 @@ func (TmpPatientOne) TableName() string {
 
 // 药品信息
 type PharmacyContent struct {
-	Name         string //名称
-	SingleDosage string //单次用量
-	Usage        string //用法
-	Frequency    string //频率
-	Days         string //天数
-	Total        string //总量
-	Doctor       string //开立医生
-	DataSources  string //数据来源
-	Remarks      string //备注
-	DrugId       int64
+	Name           string //名称
+	SingleDosage   string //单次用量
+	Usage          string //用法
+	Frequency      string //频率
+	Days           string //天数
+	Total          string //总量
+	Doctor         string //开立医生
+	DataSources    string //数据来源
+	Remarks        string //备注
+	DrugId         int64
+	ExecutionTime  int64
+	ExecutionStaff int64
+	ExecutionState int64
 }
 
 // 发药明细列表

service/dialysis_service.go

@@ -1493,7 +1493,6 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 func SaveHisDoctorAdviceOne(advice *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
 	err = tx.Save(&advice).Error
 	if err != nil {
-
 		tx.Rollback()
 		return
 	}

service/pharmacy_service.go

@@ -321,16 +321,19 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 
 		for _, v := range tmp {
 			pp = append(pp, &models.PharmacyContent{
-				Name:         v.AdviceName,
-				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
-				Usage:        v.DeliveryWay,
-				Frequency:    v.ExecutionFrequency,
-				Days:         config.ToString(v.Day) + "天",
-				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
-				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
-				DataSources:  "his处方",
-				Remarks:      v.Remark, //备注
-				DrugId:       v.DrugId,
+				Name:           v.AdviceName,
+				SingleDosage:   config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:          v.DeliveryWay,
+				Frequency:      v.ExecutionFrequency,
+				Days:           config.ToString(v.Day) + "天",
+				Total:          config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:         GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
+				DataSources:    "his处方",
+				Remarks:        v.Remark, //备注
+				DrugId:         v.DrugId,
+				ExecutionState: v.ExecutionState,
+				ExecutionStaff: v.ExecutionStaff,
+				ExecutionTime:  v.ExecutionTime,
 			})
 		}
 
@@ -351,16 +354,19 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 
 		for _, v := range tmp_advice {
 			pp = append(pp, &models.PharmacyContent{
-				Name:         v.AdviceName,
-				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
-				Usage:        v.DeliveryWay,
-				Frequency:    v.ExecutionFrequency,
-				Days:         "-",
-				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
-				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
-				DataSources:  "临时医嘱",
-				Remarks:      v.Remark,
-				DrugId:       v.DrugId,
+				Name:           v.AdviceName,
+				SingleDosage:   config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:          v.DeliveryWay,
+				Frequency:      v.ExecutionFrequency,
+				Days:           "-",
+				Total:          config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:         GetAdminUserName(v.AdviceDoctor, orgid),
+				DataSources:    "临时医嘱",
+				Remarks:        v.Remark,
+				DrugId:         v.DrugId,
+				ExecutionState: v.ExecutionState,
+				ExecutionStaff: v.ExecutionStaff,
+				ExecutionTime:  v.ExecutionTime,
 			})
 		}
 		return

service/schedule_service.go

@@ -1524,7 +1524,7 @@ func GetDoctorAdviceListSchedule(org_id int64, patient_id int64) (advices []*mod
 func GetLastDialysisPrescriptionTwo(org_id int64, patient_id int64, mode_id int64, schedule_date int64) (models.NewDialysisPrescription, error) {
 
 	dialysisprescription := models.NewDialysisPrescription{}
-	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date>=1704038400 and record_date<?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date = ?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
 	return dialysisprescription, err
 
 }

service/sign_service.go

@@ -2099,7 +2099,7 @@ func UpdateSchPatient(patient_id int64, schedule_date int64, user_org_id int64,
 
 func GetNewAllpatient(org_id int64) (list []*models.XtPatientsNew, err error) {
 
-	err = XTReadDB().Where("status =1 and user_org_id =10265").Find(&list).Error
+	err = XTReadDB().Where("status =1 and user_org_id =?", org_id).Find(&list).Error
 
 	return list, err
 }