历史排班

controllers/dialysis_api_controller.go

@@ -3419,9 +3419,9 @@ func adviceFormDatas(advice *models.DoctorAdvice, data []byte, action string) (c
 }
 
 func (c *DialysisApiController) GetDialysisOrder() {
-	xtno := c.GetString("xtno")
+	//xtno := c.GetString("xtno")
 	xtdate := c.GetString("xtdate")
-
+	patient_id, _ := c.GetInt64("patient_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", xtdate+" 00:00:00", loc)
@@ -3438,7 +3438,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 
-	patientInfo, _ := service.FindPatientWithDeviceByNo(adminUserInfo.CurrentOrgId, xtno, xttime)
+	patientInfo, _ := service.FindPatientWithDeviceByPatientId(adminUserInfo.CurrentOrgId, patient_id, xttime)
 
 	//透析单
 	dialysisOrder, _ := service.MobileGetSchedualDialysisRecordTen(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -719,6 +719,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if medical.IsUse == 1 {
+								service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 									"advice": advice,
@@ -729,14 +730,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+									service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "3",
 										"advice": advice,
 										"ids":    ids,
 									})
 									return
+
 								}
 								if prescribing_number_total > total {
+									service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "2",
 										"advice": advice,
@@ -752,7 +756,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					//出库
 					for _, item := range advices {
 						if item.Way == 1 {
-
 							//查询是否出库按钮开启
 							adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
 							//查询改药品信息
@@ -760,14 +763,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if adviceSetting.IsAdviceOpen == 1 {
 								//查询是否出库按钮开启
 								prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+								//患者发药
 								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
 								if prescriptionConfig.IsOpen == 1 {
 									if medical.IsUse == 2 {
 										if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											//查询今日是否出库
+											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+											if drugOutInfo.ID == 0 {
+												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											}
+
 										}
 										if pharmacyConfig.IsOpen != 1 {
-											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+											if drugOutInfo.ID == 0 {
+												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											}
 										}
 
 										//更新字典里面的库存
@@ -788,10 +800,32 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
 								if medical.IsUse == 2 {
 									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+										if drugOutInfo.ID == 0 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										}
 									}
 									if pharmacyConfig.IsOpen != 1 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										drugError := models.XtDrugError{
+											ID:                    0,
+											UserOrgId:             item.UserOrgId,
+											DrugId:                item.DrugId,
+											RecordDate:            item.AdviceDate,
+											PatientId:             item.PatientId,
+											Remark:                "恒泰中医院出库开始",
+											Status:                1,
+											Ctime:                 time.Now().Unix(),
+											Mtime:                 0,
+											Prescribingnumber:     item.PrescribingNumber,
+											PrescribingNumberUnit: item.PrescribingNumberUnit,
+											SumCount:              0,
+										}
+										service.CreateDrugError(drugError)
+										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+										if drugOutInfo.ID == 0 {
+
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										}
 									}
 
 									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
@@ -855,6 +889,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if medical.IsUse == 1 {
+								service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 									"advice": advice,
@@ -864,6 +899,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+									service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "3",
 										"advice": advice,
@@ -872,6 +908,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 								if prescribing_number_total > total {
+									service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "2",
 										"advice": advice,
@@ -891,10 +928,18 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
 							if medical.IsUse == 2 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									//查询今日是否出库
+									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+									if drugOutInfo.ID == 0 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									}
 								}
 								if pharmacyConfig.IsOpen != 1 {
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									//查询今日是否出库
+									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+									if drugOutInfo.ID == 0 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									}
 								}
 
 								//更新字典里面的库存

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 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 {
+	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 || this.GetAdminUserInfo().CurrentOrgId == 10340 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 

service/dialysis_service.go

@@ -2090,3 +2090,9 @@ func UpdateLastMonitorRecordToday(accumulated_blood_volume float64, id int64) er
 	err := XTWriteDB().Model(&models.MonitoringRecord{}).Where(" id = ? and status= 1", id).Update(map[string]interface{}{"accumulated_blood_volume": accumulated_blood_volume}).Error
 	return err
 }
+
+func UpdateDoctorAdviceByExcecute(id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("id = ? and user_org_id = ? and status =1").Updates(map[string]interface{}{"execution_time": 0, "execution_staff": 0, "execution_state": 0}).Error
+	return err
+}

service/patient_service.go

@@ -609,6 +609,15 @@ func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient mode
 	return
 }
 
+func FindPatientWithDeviceByPatientId(orgID int64, id int64, time int64) (patient models.SchedualPatient2, err error) {
+	err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("DeviceNumber", "org_id = ?", orgID).
+			Preload("DeviceZone", "org_id = ?", orgID).
+			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
+	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and id = ? and status = 1 ", orgID, id).First(&patient).Error
+	return
+}
+
 func CreatePatient(patient *models.Patients, contagions []int64, diseases []int64) (err error) {
 
 	user, _ := GetSgjUserByMobild(patient.Phone)

service/warhouse_service.go

@@ -83,6 +83,21 @@ func DrugsDelivery(orgID int64, creater int64, advice *models.DoctorAdvice) (err
 // 药品自动出库 递归方式
 func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DoctorAdvice) (err error) {
 
+	drugError := models.XtDrugError{
+		ID:                    0,
+		UserOrgId:             advice.UserOrgId,
+		DrugId:                advice.DrugId,
+		RecordDate:            advice.AdviceDate,
+		PatientId:             advice.PatientId,
+		Remark:                "恒泰中医院出库进来",
+		Status:                1,
+		Ctime:                 time.Now().Unix(),
+		Mtime:                 0,
+		Prescribingnumber:     advice.PrescribingNumber,
+		PrescribingNumberUnit: advice.PrescribingNumberUnit,
+		SumCount:              0,
+	}
+	CreateDrugError(drugError)
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -249,6 +264,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			IsCheck:                 1,
 			OverCount:               sum_count,
+			AdviceId:                advice.ID,
 		}
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
@@ -282,6 +298,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
 			LastPrice:               warehouse.Price,
 			OverCount:               sum_count,
+			AdviceId:                advice.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -302,6 +319,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			CountUnit:               drup.MinUnit,
 			WarehouseInfoId:         warehouse.ID,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -346,6 +364,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			IsCheck:                 1,
+			AdviceId:                advice.ID,
 		}
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
@@ -366,6 +385,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			CountUnit:               drup.MinUnit,
 			WarehouseInfoId:         warehouse.ID,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -455,6 +475,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
 			LastPrice:               warehouse.Price,
 			OverCount:               sum_count,
+			AdviceId:                advice.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -7489,3 +7510,12 @@ func UpdateHisAdviceById(id int64) error {
 	err := XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"execution_time": "", "execution_staff": "", "execution_state": 2}).Error
 	return err
 }
+
+func GetAdviceIsOut(advice_id int64, user_org_id int64, patient_id int64, advice_date int64, drug_id int64) (models.DrugWarehouseOutInfo, error) {
+
+	advice := models.DrugWarehouseOutInfo{}
+
+	err := XTReadDB().Where("advice_id = ? and org_id = ? and patient_id = ? and sys_record_time = ? and status=1 and drug_id = ?", advice_id, user_org_id, patient_id, advice_date, drug_id).Find(&advice).Error
+
+	return advice, err
+}