历史排班

controllers/doctor_schedule_api_controller.go

@@ -1,13 +1,14 @@
 package controllers
 
 import (
+	"fmt"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	"time"
 )
 
 type DoctorScheduleApiController struct {
@@ -282,17 +283,17 @@ func (this *DoctorScheduleApiController) AddSchedule() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	doctor_id, _ := this.GetInt64("doctor_id")
-	fmt.Println("doctor_id", doctor_id)
+
 	doctor_type, _ := this.GetInt64("doctor_type")
-	fmt.Println("doctor_type", doctor_type)
+
 	start_time, _ := this.GetInt64("start_time")
-	fmt.Println("start_time", start_time)
+
 	end_time, _ := this.GetInt64("end_time")
-	fmt.Println("end_time", end_time)
+
 	schedule_type, _ := this.GetInt64("schedule_type")
-	fmt.Println("schedule_type", schedule_type)
+
 	schedule_week, _ := this.GetInt64("schedule_week")
-	fmt.Println("schedule_week", schedule_week)
+
 	schedule_date, _ := this.GetInt64("schedule_date")
 	schedule := models.StaffSchedule{
 		DoctorId:     doctor_id,

controllers/his_api_controller.go

@@ -1866,7 +1866,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 	patient, _ := service.GetPatientByIDTwo(adminInfo.CurrentOrgId, patient_id)
 
-	//保存处方出库
+	//自动出库的开关开启
 	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
 	//自动出库
@@ -1927,6 +1927,7 @@ func (c *HisApiController) CreateHisPrescription() {
 		}
 	}
 	if isMidicine == true {
+
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMedicineWrong)
 		return
 	}
@@ -1982,6 +1983,8 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
 								if drug.ID == 0 {
+
+									tx.Rollback()
 									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 									return
 								}
@@ -1997,18 +2000,20 @@ func (c *HisApiController) CreateHisPrescription() {
 								//查询该药品是否存在开药记录
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
 
-								//新增处方
+								//新增处方盘点库存是否充足
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
 									if prescribingNumberUnit == drug.MinUnit {
 										if drug.IsUse != 1 {
 											if drug.IsProject == 0 || drug.IsProject == 2 {
 												if all_count == 0 {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 													return
 												}
 
 												if prescribing_number > all_count {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 													return
 												}
@@ -2022,10 +2027,12 @@ func (c *HisApiController) CreateHisPrescription() {
 										if drug.IsUse != 1 {
 											if drug.IsProject == 0 || drug.IsProject == 2 {
 												if all_count == 0 {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 													return
 												}
 												if num > all_count {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 													return
 												}
@@ -2036,6 +2043,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 
 								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
+								//不使用保存处方出库
 								if drugOutConfig.IsOpen != 1 {
 									//修改处方
 									for _, advice := range advices {
@@ -2064,6 +2072,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
 										if drug.ID == 0 {
+											tx.Rollback()
 											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 											return
 										}
@@ -2085,10 +2094,12 @@ func (c *HisApiController) CreateHisPrescription() {
 												if drug.IsUse != 1 {
 													if drug.IsProject == 0 || drug.IsProject == 2 {
 														if all_count == 0 {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
 														if prescribing_number > all_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
@@ -2101,10 +2112,12 @@ func (c *HisApiController) CreateHisPrescription() {
 													if drug.IsUse != 1 {
 														if drug.IsProject == 0 || drug.IsProject == 2 {
 															if all_count == 0 {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 																return
 															}
 															if num > all_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 																return
 															}
@@ -2146,6 +2159,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												//如果修改的差数量 大于库存数量
 												if drug.IsUse != 1 {
 													if (number_count - device_number) > total_count {
+														tx.Rollback()
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
@@ -2197,6 +2211,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
 								if drug.ID == 0 {
+									tx.Rollback()
 									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 									return
 								}
@@ -2221,6 +2236,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
+
 									batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 
 									if prescribingNumberUnit == drug.MinUnit {
@@ -2229,10 +2245,12 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											if drug.IsProject == 0 || drug.IsProject == 2 {
 												if all_count == 0 {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 													return
 												}
 												if prescribing_number > all_count {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 													return
 												}
@@ -2240,6 +2258,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											if adminInfo.CurrentOrgId == 10215 {
 												if prescribing_number > batch_number_all_count {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
 												}
@@ -2253,10 +2272,12 @@ func (c *HisApiController) CreateHisPrescription() {
 										if drug.IsUse != 1 {
 											if drug.IsProject == 0 || drug.IsProject == 2 {
 												if all_count == 0 {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 													return
 												}
 												if num > all_count {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 													return
 												}
@@ -2264,6 +2285,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											if adminInfo.CurrentOrgId == 10215 {
 												if num > batch_number_all_count {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
 												}
@@ -2302,6 +2324,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
 										if drug.ID == 0 {
+											tx.Rollback()
 											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 											return
 										}
@@ -2329,10 +2352,12 @@ func (c *HisApiController) CreateHisPrescription() {
 												if drug.IsUse != 1 {
 													if drug.IsProject == 0 || drug.IsProject == 2 {
 														if all_count == 0 {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
 														if prescribing_number > all_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
@@ -2340,6 +2365,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 													if adminInfo.CurrentOrgId == 10215 {
 														if prescribing_number > batch_number_all_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
 														}
@@ -2354,10 +2380,12 @@ func (c *HisApiController) CreateHisPrescription() {
 													if drug.IsUse != 1 {
 														if drug.IsProject == 0 || drug.IsProject == 2 {
 															if all_count == 0 {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 																return
 															}
 															if num > all_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 																return
 															}
@@ -2365,6 +2393,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 														if adminInfo.CurrentOrgId == 10215 {
 															if prescribing_number > batch_number_all_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 																return
 															}
@@ -2412,15 +2441,18 @@ func (c *HisApiController) CreateHisPrescription() {
 												if drug.IsUse != 1 {
 													if drug.IsProject == 0 || drug.IsProject == 2 {
 														if total_count == 0 {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
 														if (number_count - device_number) > total_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
 
 														if (number_count - device_number) > batch_number_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
 														}
@@ -2449,6 +2481,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 														if out_count > 0 {
 															if (number_count - device_number) > in_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
 																return
 															}
@@ -2461,6 +2494,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															fmt.Println("sum_in_count", sum_in_count)
 															//如果修改的数量大于有库存的第一个批次
 															if number_count > sum_in_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(warehouseInfo.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(warehouseInfo.StockMinNumber, 10) + drug.MinUnit)
 																return
 															}
@@ -2584,10 +2618,12 @@ func (c *HisApiController) CreateHisPrescription() {
 												if drug.IsUse != 1 {
 													if drug.IsProject == 0 || drug.IsProject == 2 {
 														if all_count == 0 {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
 														if prescribing_number > all_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
@@ -2595,6 +2631,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 													if adminInfo.CurrentOrgId == 10215 {
 														if prescribing_number > batch_number_all_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
 														}
@@ -2609,10 +2646,12 @@ func (c *HisApiController) CreateHisPrescription() {
 													if drug.IsUse != 1 {
 														if drug.IsProject == 0 || drug.IsProject == 2 {
 															if all_count == 0 {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 																return
 															}
 															if num > all_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 																return
 															}
@@ -2620,6 +2659,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 														if adminInfo.CurrentOrgId == 10215 {
 															if prescribing_number > batch_number_all_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 																return
 															}
@@ -2659,16 +2699,21 @@ func (c *HisApiController) CreateHisPrescription() {
 												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 												number_count = prescribingNumberInt
 											}
+											fmt.Println("number_count--------------", number_count)
+											fmt.Println("device_number--------------", device_number)
+											fmt.Println("batch_number_count", batch_number_count)
 											//如果修改的数量大于之前修改的数量
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
 												if drug.IsUse != 1 {
 													if drug.IsProject == 0 || drug.IsProject == 2 {
 														if total_count == 0 {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
 														if (number_count - device_number) > total_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
@@ -2676,6 +2721,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 													if adminInfo.CurrentOrgId == 10215 {
 														if (number_count - device_number) > batch_number_count {
+															tx.Rollback()
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
 														}
@@ -2703,6 +2749,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 														if out_count > 0 {
 															if (number_count - device_number) > in_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
 																return
 															}
@@ -2714,11 +2761,13 @@ func (c *HisApiController) CreateHisPrescription() {
 															warehouseInfo, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
 															sum_in_count = warehouseInfo.StockMaxNumber*drug.MinNumber + warehouseInfo.StockMinNumber
 															if sum_in_count == 0 {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(warehouseInfo.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(warehouseInfo.StockMinNumber, 10) + drug.MinUnit)
 																return
 															}
 															//如果修改的数量大于有库存的第一个批次
 															if number_count > sum_in_count {
+																tx.Rollback()
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(warehouseInfo.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(warehouseInfo.StockMinNumber, 10) + drug.MinUnit)
 																return
 															}
@@ -2790,10 +2839,12 @@ func (c *HisApiController) CreateHisPrescription() {
 										stock_counts := strconv.FormatInt(stock_count, 10)
 										stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
 										if stock_total_count == 0 {
+											tx.Rollback()
 											c.ServeDynamicFailJsonSend(project_name + "库存不足")
 											return
 										}
 										if totals > stock_total_count {
+											tx.Rollback()
 											c.ServeDynamicFailJsonSend(project_name + "库存不足")
 											return
 										}
@@ -2817,10 +2868,12 @@ func (c *HisApiController) CreateHisPrescription() {
 
 												//库存不足
 												if stock_count == 0 {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(project_name + "库存不足")
 													return
 												}
 												if (parsetotal - count) > stock_count {
+													tx.Rollback()
 													c.ServeDynamicFailJsonSend(project_name + "库存不足")
 													return
 												}
@@ -2896,10 +2949,12 @@ func (c *HisApiController) CreateHisPrescription() {
 											stock_counts := strconv.FormatInt(stock_count, 10)
 											stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
 											if stock_total_count == 0 {
+												tx.Rollback()
 												c.ServeDynamicFailJsonSend(project_name + "库存不足")
 												return
 											}
 											if totals > stock_total_count {
+												tx.Rollback()
 												c.ServeDynamicFailJsonSend(project_name + "库存不足")
 												return
 											}
@@ -3117,7 +3172,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3308,16 +3363,23 @@ func (c *HisApiController) CreateHisPrescription() {
 										s.Price = lastWarehouse.RetailPrice
 									}
 									if s.Price == 0 {
-										s.Price = lastWarehouse.RetailPrice
+										if lastWarehouse.ID == 0 {
+											lastWarehouseTwo, _ := service.FindLastDrugWarehousingInfoByIDTwo(s.DrugId, storeConfig.DrugStorehouseOut)
+											s.Price = lastWarehouseTwo.RetailPrice
+										}
+
 									}
 								}
 
 								//查询保存处方出库开关是否打开
 								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
+
 								if drugOutConfig.IsOpen == 1 {
+
 									drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, s.DrugId)
 									// 查询该药品最后一次出库记录
 									druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(s.DrugId, patient_id, recordDateTime, s.ID)
+
 									if len(druginfo) > 0 {
 										//回退库存
 										for _, it := range druginfo {
@@ -3337,8 +3399,10 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											}
 										}
+
 										//删除记录
-										service.DeleteDrugAutoWarehouseSeven(s.DrugId, patient_id, recordDateTime, s.ID)
+										service.DeleteNewDrugAutoWarehouseSeven(s.DrugId, patient_id, recordDateTime, s.ID)
+
 									}
 
 									service.CreateHisDoctorAdviceOne(&s, tx)
@@ -3472,8 +3536,55 @@ func (c *HisApiController) CreateHisPrescription() {
 								timeFormat := tempTime.Format("20060102150405")
 								s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 								service.CreateHisDoctorAdviceOne(&s, tx)
-
+								//list, _ := service.GetHisToday(s.PatientId, s.AdviceDate, s.UserOrgId, s.DrugId, tx)
+								//var count_total int64
+								//var count_one int64
+								//for _, its := range list {
+								//	baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
+								//	if its.PrescribingNumberUnit == baseDrug.MaxUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+								//		prescribingNumberTenty := strconv.FormatFloat(its.PrescribingNumber, 'f', -1, 64)
+								//		prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+								//		count_total += prescribingNumberSevenTy * baseDrug.MinNumber
+								//	}
+								//
+								//	if its.PrescribingNumberUnit == baseDrug.MinUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+								//		prescribingNumberTenty := strconv.FormatFloat(its.PrescribingNumber, 'f', -1, 64)
+								//		prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+								//		count_total += prescribingNumberSevenTy
+								//	}
+								//
+								//	if its.PrescribingNumberUnit == baseDrug.MaxUnit && baseDrug.MaxUnit == baseDrug.MinUnit {
+								//		prescribingNumberTenty := strconv.FormatFloat(its.PrescribingNumber, 'f', -1, 64)
+								//		prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+								//		count_total += prescribingNumberSevenTy
+								//	}
+								//
+								//	drugAuto, _ := service.GetLastDrugAuto(its.ID, its.DrugId, its.AdviceDate, its.PatientId,its.UserOrgId, tx)
+								//
+								//	if drugAuto.CountUnit == baseDrug.MaxUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+								//
+								//		count_one = drugAuto.Count * baseDrug.MinNumber
+								//	}
+								//
+								//	if drugAuto.CountUnit == baseDrug.MinUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+								//
+								//		count_one = drugAuto.Count
+								//	}
+								//
+								//	if drugAuto.CountUnit == baseDrug.MaxUnit && baseDrug.MaxUnit == baseDrug.MinUnit {
+								//
+								//		count_one = drugAuto.Count
+								//	}
+								//	fmt.Println("count_one==================", count_one)
+								//	fmt.Println("count_total==================", count_total)
+								//	if count_total != count_one {
+								//
+								//		service.UpdateTodayHis(its.DrugId, its.AdviceDate, its.PatientId, its.UserOrgId, baseDrug.MinUnit, count_total, its.ID, tx)
+								//	}
+								//
+								//}
 								tx.Commit()
+
 								keySix := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 								redis.Set(keySix, "", time.Second)
 								keyFive := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
@@ -3859,265 +3970,8 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 
 			}
-
-			//查询今日该患者开的药品处方
-			//hisdoctorlist, _ := service.GetNewHisAdviceListByDrugIdTwo(patient_id, recordDateTime, adminInfo.CurrentOrgId, tx)
-			//drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
-
-			//药品出库
-			//if drugOutConfig.IsOpen == 1 {
-			//	for _, item := range hisdoctorlist {
-			//		drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, item.DrugId)
-			//
-			//		// 查询该药品最后一次出库记录
-			//		druginfo, _ := service.GetLastNewDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID, tx)
-			//
-			//		if len(druginfo) > 0 {
-			//			//回退库存
-			//			for _, it := range druginfo {
-			//
-			//				if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-			//
-			//					service.ModifyNewDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId, tx)
-			//
-			//				}
-			//				if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-			//
-			//					service.ModifyNewDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId, tx)
-			//
-			//				}
-			//				if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-			//
-			//					service.ModifyNewDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId, tx)
-			//
-			//				}
-			//			}
-			//		}
-			//
-			//		//删除记录
-			//		service.DeleteNewDrugAutoWarehouseSeven(item.DrugId, patient_id, recordDateTime, item.ID, tx)
-			//		//查询最后一次数据
-			//		if drugOutConfig.IsOpen == 1 {
-			//			//出库
-			//			if drug.IsUse == 2 {
-			//				creater := adminInfo.AdminUser.Id
-			//
-			//				service.NewHisDrugsDelivery(item.UserOrgId, creater, item, tx)
-			//
-			//			}
-			//
-			//			//更新字典里面的库存
-			//			stockInfo, _ := service.GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId, tx)
-			//			var sum_count int64
-			//			for _, its := range stockInfo {
-			//				baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
-			//				if its.MaxUnit == baseDrug.MaxUnit {
-			//					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
-			//				}
-			//				sum_count += its.StockMaxNumber + its.StockMinNumber
-			//			}
-			//			//更新基础库存
-			//			service.UpdateNewBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId, tx)
-			//			//剩余库存
-			//			service.UpdateNewDrugStockCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, sum_count, tx)
-			//
-			//			over, _ := service.FindNewOverCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, tx)
-			//			service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
-			//
-			//		}
-			//	}
-			//}
-
-			//耗材保存处方出库
-			//if goodOutConfig.IsOpen == 1 {
-			//
-			//	//查询今日耗材出库数量
-			//	hisgoodlist, _ := service.GetHisGoodList(patient_id, recordDateTime, adminInfo.CurrentOrgId)
-			//
-			//	for _, item := range hisgoodlist {
-			//
-			//		//查询历史出库数据
-			//		flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(item.PatientId, item.RecordDate, item.ProjectId, item.ID)
-			//		var out_count_five int64
-			//		for _, item := range flowGood {
-			//			out_count_five += item.Count
-			//		}
-			//
-			//		parseIntCount, _ := strconv.ParseInt(item.Count, 10, 64)
-			//
-			//		if out_count_five != parseIntCount {
-			//
-			//			//查询耗材最后一次出库记录
-			//			wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(item.ProjectId, patient_id, recordDateTime, item.ID)
-			//			//查询默认出库仓库库存
-			//			storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
-			//			if len(wareOut) > 0 {
-			//
-			//				for _, it := range wareOut {
-			//					//回退库存
-			//					service.ModifyGoodWarehouseInfo(it.GoodId, it.WarehouseInfotId, it.OrgId, it.Count)
-			//
-			//					//删除出库记录
-			//					service.DeleteGoodWarehouseOutInfo(it.GoodId, it.SysRecordTime, it.OrgId, it.ProjectId)
-			//
-			//				}
-			//			}
-			//
-			//			timeStr := time.Now().Format("2006-01-02")
-			//			timeArr := strings.Split(timeStr, "-")
-			//			total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
-			//
-			//			total = total + 1
-			//			warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-			//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-			//			number = number + total
-			//			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-			//
-			//			operation_time := time.Now().Unix()
-			//			creater := c.GetAdminUserInfo().AdminUser.Id
-			//
-			//			recordDateStr := time.Now().Format("2006-01-02")
-			//			recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-			//			nowtime := recordDate.Unix()
-			//			warehouseOut := models.WarehouseOut{
-			//				WarehouseOutOrderNumber: warehousing_out_order,
-			//				OperationTime:           operation_time,
-			//				OrgId:                   adminInfo.CurrentOrgId,
-			//				Creater:                 creater,
-			//				Ctime:                   time.Now().Unix(),
-			//				Status:                  1,
-			//				WarehouseOutTime:        nowtime,
-			//				Type:                    1,
-			//				StorehouseId:            storeConfig.StorehouseOutInfo,
-			//				IsCheck:                 1,
-			//				IsSys:                   1,
-			//			}
-			//			//查询是否生成出库单
-			//			out, _ := service.FindPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime)
-			//
-			//			if out.ID == 0 {
-			//				service.AddSigleWarehouseOut(&warehouseOut)
-			//			}
-			//
-			//			lastOut, _ := service.FindLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime)
-			//
-			//			goodObj, _ := service.GetGoodInformationByGoodIdThirty(item.ProjectId)
-			//			houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-			//
-			//			dialyPrepareOne := models.DialysisBeforePrepare{
-			//				GoodTypeId:   goodObj.GoodTypeId,
-			//				GoodId:       item.ProjectId,
-			//				PatientId:    item.PatientId,
-			//				RecordDate:   item.RecordDate,
-			//				UserOrgId:    adminInfo.CurrentOrgId,
-			//				Count:        parseIntCount,
-			//				Ctime:        time.Now().Unix(),
-			//				Creater:      creater,
-			//				Status:       1,
-			//				StorehouseId: houseConfig.StorehouseOutInfo,
-			//				ProjectId:    item.ID,
-			//			}
-			//			goodinfo, _ := service.GetGoodInformationByGoodIdThirty(item.ProjectId)
-			//			if goodinfo.IsUser == 2 || goodinfo.IsUser == 0 {
-			//
-			//				//查询历史出库数据
-			//				flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(item.PatientId, item.RecordDate, item.ProjectId, item.ID)
-			//				var out_count int64
-			//				for _, item := range flowGood {
-			//					out_count += item.Count
-			//				}
-			//
-			//				//如果历史数和当前数据不想等才进行退库出库
-			//				if out_count != parseIntCount {
-			//					service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
-			//
-			//					service.UpdateAutomaticReduce(item.PatientId, item.RecordDate, item.ProjectId, item.ID)
-			//					detail := models.AutomaticReduceDetail{
-			//						WarehouseOutId:          0,
-			//						WarehouseOutOrderNumber: "",
-			//						PatientId:               item.PatientId,
-			//						Ctime:                   time.Now().Unix(),
-			//						Mtime:                   0,
-			//						Status:                  1,
-			//						RecordTime:              item.RecordDate,
-			//						OrgId:                   item.UserOrgId,
-			//						GoodId:                  item.ProjectId,
-			//						GoodTypeId:              0,
-			//						Count:                   parseIntCount,
-			//						Type:                    0,
-			//						ProjectId:               item.ID,
-			//						StorehouseId:            0,
-			//					}
-			//
-			//					service.CreateAutoDetail(detail)
-			//
-			//					//查询剩余库存
-			//					goodList, _ := service.GetAllGoodSumCount(item.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo)
-			//					var sum_count int64
-			//					for _, item := range goodList {
-			//						sum_count += item.StockCount
-			//					}
-			//
-			//					//更新剩余库存
-			//					service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.CurrentOrgId, sum_count)
-			//
-			//					//耗材
-			//					service.UpdateGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.CurrentOrgId)
-			//				}
-			//
-			//			}
-			//
-			//			if goodinfo.IsUser == 1 && goodinfo.IsWarehouse == 1 {
-			//				//查询历史出库数据
-			//				flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(item.PatientId, item.RecordDate, item.ProjectId, item.ID)
-			//				var out_count int64
-			//				for _, item := range flowGood {
-			//					out_count += item.Count
-			//				}
-			//				//如果历史数和当前数据不想等才进行退库出库
-			//				if out_count != parseIntCount {
-			//					service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
-			//
-			//					service.UpdateAutomaticReduce(item.PatientId, item.RecordDate, item.ProjectId, item.ID)
-			//					detail := models.AutomaticReduceDetail{
-			//						WarehouseOutId:          0,
-			//						WarehouseOutOrderNumber: "",
-			//						PatientId:               item.PatientId,
-			//						Ctime:                   time.Now().Unix(),
-			//						Mtime:                   0,
-			//						Status:                  1,
-			//						RecordTime:              item.RecordDate,
-			//						OrgId:                   item.UserOrgId,
-			//						GoodId:                  item.ProjectId,
-			//						GoodTypeId:              0,
-			//						Count:                   parseIntCount,
-			//						Type:                    0,
-			//						ProjectId:               item.ID,
-			//						StorehouseId:            0,
-			//					}
-			//
-			//					service.CreateAutoDetail(detail)
-			//
-			//					//查询剩余库存
-			//					goodList, _ := service.GetAllGoodSumCount(item.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo)
-			//					var sum_count int64
-			//					for _, item := range goodList {
-			//						sum_count += item.StockCount
-			//					}
-			//
-			//					//更新剩余库存
-			//					service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.CurrentOrgId, sum_count)
-			//
-			//					//耗材
-			//					service.UpdateGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.CurrentOrgId)
-			//				}
-			//
-			//			}
-			//
-			//		}
-			//	}
-			//}
 		}
+
 		tx.Commit()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -9628,9 +9628,6 @@ func (this *DialysisAPIController) ExectionMobileAdvice() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		}
 	}
-
-	fmt.Println("config233322333223", config.IsOpen)
-
 	//血透客户
 	if config.IsOpen == 2 || config.IsOpen == 0 {
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1288,6 +1288,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		ids = strings.Split(advice_ids, ",")
 		if len(execution_time) <= 0 {
 			utils.ErrorLog("execution_time")
+			tx.Rollback()
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
@@ -1297,6 +1298,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		if errs != nil {
 			utils.ErrorLog(errs.Error())
+			tx.Rollback()
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
@@ -1304,16 +1306,19 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		var err error
 		for _, item := range advices {
 			if item.ExecutionState == 1 {
+				tx.Rollback()
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
 				return
 			}
 
 			if item.Checker >= 0 && item.Checker == adminInfo.AdminUser.Id {
+				tx.Rollback()
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 				return
 			}
 
 			if item.StartTime > theTime.Unix() {
+				tx.Rollback()
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
 				return
 			}
@@ -1341,6 +1346,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					infor, _ := service.GetDialysisInformationByRecordDate(item.PatientId, item.AdviceDate, item.UserOrgId, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
+						tx.Rollback()
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
 						return
 					}
@@ -1436,7 +1442,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 					advice, _ := service.FindHisDoctorAdviceByIdTwo(adminInfo.Org.Id, item.ID, tx)
-					tx.Commit()
+					tx.Rollback()
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "7",
 						"advice": advice,
@@ -1489,6 +1495,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				var total int64
 				var prescribing_number_total int64
 
+				//保存处方出库
 				config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
 
 				if config.IsOpen != 1 {
@@ -1529,7 +1536,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
-							tx.Commit()
+							tx.Rollback()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",
 								"advice": advice,
@@ -1555,7 +1562,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
-							tx.Commit()
+							tx.Rollback()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "3",
 								"advice": advice,
@@ -1578,7 +1585,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
-							tx.Commit()
+							tx.Rollback()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "2",
 								"advice": advice,
@@ -1588,10 +1595,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 
-					fmt.Println("hhahhahahahhhhhha", prescribing_number_total)
-					fmt.Println("total0000000000000", total)
-					fmt.Println("medical22222222222222", medical.IsUse)
-					fmt.Println("config.isp", config.IsOpen)
 					if prescribing_number_total <= total {
 
 						pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
@@ -1601,9 +1604,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if config.IsOpen != 1 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 
-									//service.NewHisDrugsDelivery(adminInfo.Org.Id, creater, &advice, tx)
-									//service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-
 									if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 10265 {
 										//查询该药品是否有出库记录
 										flowMap, _ := service.GetDrugFLowByAdviceByIdOne(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate, tx)
@@ -1625,7 +1625,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 												}
 												service.CreateDrugError(drugError)
 											}
-											tx.Commit()
+											tx.Rollback()
 											c.ServeSuccessJSON(map[string]interface{}{
 												"msg":    "6",
 												"advice": advice,
@@ -1662,7 +1662,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 												}
 												service.CreateDrugError(drugError)
 											}
-											tx.Commit()
+											tx.Rollback()
 											c.ServeSuccessJSON(map[string]interface{}{
 												"msg":    "6",
 												"advice": advice,
@@ -1693,26 +1693,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 
-				//fmt.Println("config+++++++++++", config.IsOpen)
-				//fmt.Println("config+++++++++++", item.UserOrgId)
-				//
-				//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)
-				//}
-
 			}
 		}
 		tx.Commit()

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -1431,16 +1431,16 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			}
 		}
 
-		if org_id == 10206 || org_id == 10344 {
-			hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
-			project, _ := service.GetHisPrescriptionProjectList(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
-			if len(hisAdvice) > 0 {
-				service.UpdateHisAdviceObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
-			}
-			if len(project) > 0 {
-				service.UpdateProjectObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
-			}
-		}
+		//if org_id == 10206 || org_id == 10344 {
+		//	hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+		//	project, _ := service.GetHisPrescriptionProjectList(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+		//	if len(hisAdvice) > 0 {
+		//		service.UpdateHisAdviceObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+		//	}
+		//	if len(project) > 0 {
+		//		service.UpdateProjectObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+		//	}
+		//}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "ok",

controllers/patient_api_controller.go

@@ -2798,7 +2798,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//1.判断是否启用药品管理和自备药出库功能
 
-		//药品管理信息
+		//药品自动出库开关管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
 
 		if drugStockConfig.IsOpen == 1 {
@@ -2806,46 +2806,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			advices, _ := service.GetHisExecutionDoctorsTwo(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
 				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
-				//查询这个患者这个患者这个药已经出库的所有数量
-				//advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-				//drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-				//var total_count int64 // 现在出库的
-				//var drug_count int64  // 已经出库的
-				//for _, it := range advicelist {
-				//	if it.PrescribingNumberUnit == medical.MaxUnit {
-				//		prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
-				//		prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				//		total_count += prenumber * medical.MinNumber
-				//	}
-				//	if it.PrescribingNumberUnit == medical.MinUnit {
-				//		prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
-				//		prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				//		total_count += prenumber
-				//	}
-				//
-				//}
-				//
-				//
-				//for _, its := range drugoutlist {
-				//	if its.CountUnit == medical.MaxUnit {
-				//		drug_count += its.Count * medical.MinNumber
-				//	}
-				//	if its.CountUnit == medical.MinUnit {
-				//		drug_count += its.Count
-				//	}
-				//}
-				//fmt.Println("total_count23232323232323232wode",total_count)
-				//fmt.Println("total_count23232323232323232wode",drug_count)
-				//if total_count == drug_count {
-				//	c.ServeSuccessJSON(map[string]interface{}{
-				//		"msg":    "1",
-				//		"advice": advice,
-				//	})
-				//	return
-				//}
 
 				var total int64
 				var prescribing_number_total int64
+				//药品保存处方出库
 				config, _ := service.GetDrugOpenConfigOne(adminUserInfo.CurrentOrgId)
 				if config.IsOpen != 1 {
 					//查询默认出库仓库

controllers/pharmacy_controller.go

@@ -335,6 +335,8 @@ func (this *PharmacyController) GetPharmacyContent() {
 	appId := this.GetAdminUserInfo().CurrentAppId
 	adminUserES, _ := service.GetAllAdminUserES(orgid, appId)
 	allDoctor, _ := service.GetAllDoctor(orgid, appId)
+
+	prescriptionListByToDay, _ := service.GetPrescriptionListByToDay(orgid, patient_id, stime)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -349,6 +351,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 	return_value["zoneList"] = zoneList
 	return_value["adminUserES"] = adminUserES
 	return_value["doctors"] = allDoctor
+	return_value["prescription"] = prescriptionListByToDay
 
 	//if is_medicine == 1{发药时间先不展示
 	//	return_value["time"] = time

controllers/schedule_api_controller.go

@@ -742,16 +742,16 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						}
 					}
 
-					if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
-						hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
-						project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
-						if len(hisAdvice) > 0 {
-							service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
-						}
-						if len(project) > 0 {
-							service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
-						}
-					}
+					//if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
+					//	hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+					//	project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+					//	if len(hisAdvice) > 0 {
+					//		service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+					//	}
+					//	if len(project) > 0 {
+					//		service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+					//	}
+					//}
 					service.SaveSch(&schedule)
 				}
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)

controllers/self_drug_api_congtroller.go

@@ -2950,7 +2950,7 @@ func (this *SelfDrugApiController) GetGoodExpiryDateQuery() {
 		goodIds = append(goodIds, it.ID)
 	}
 	list, total, err := service.GetGoodExpiryDateQuery(storehouse_id, expiry_type, keyword, page, limit, orgId, ids, goodIds, nowtime, endTime)
-	fmt.Println("total233223322332323232323223", total)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 
 	if err != nil {

controllers/sign_api_controller.go

@@ -1238,9 +1238,10 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	list, _ := service.GetAllDialysisOrder(10490)
+	list, _ := service.GetAllDialysisOrder(10469)
 	for _, item := range list {
-		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+		schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
 	}
 
 	//drugList, _ := service.GetAllBaseDrugList(10571)

service/gobal_config_service.go

@@ -1368,3 +1368,12 @@ func GetMobiledialysiOrder(user_org_id int64, patient_id int64, record_date int6
 
 	return dialysisOrder, err
 }
+
+func GetPrescriptionListByToDay(user_org_id int64, patient_id int64, record_Date int64) (models.HisPrescriptionInfo, error) {
+
+	prescriptionInfo := models.HisPrescriptionInfo{}
+
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date = ? and status =1", user_org_id, patient_id, record_Date).Find(&prescriptionInfo).Error
+
+	return prescriptionInfo, err
+}

service/his_service.go

@@ -905,6 +905,44 @@ func CreateHisDoctorAdviceOne(s *models.HisDoctorAdviceInfo, tx *gorm.DB) (err e
 	return
 }
 
+func GetHisToday(patient_id int64, advice_date int64, user_org_id int64, drug_id int64, tx *gorm.DB) (list []*models.HisDoctorAdviceInfo, err error) {
+
+	err = tx.Where("patient_id = ? and advice_date = ? and user_org_id = ? and status =1 and drug_id = ?", patient_id, advice_date, user_org_id, drug_id).Find(&list).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return list, err
+		}
+	}
+	return list, err
+}
+
+func GetLastDrugAuto(advice_id int64, drug_id int64, advice_date int64, patient_id int64, user_org_id int64, tx *gorm.DB) (models.DrugAutomaticReduceDetail, error) {
+
+	automaticReduceDetail := models.DrugAutomaticReduceDetail{}
+
+	err := XTReadDB().Where("advice_id = ? and drug_id = ? and record_time= ? and patient_id =? and status=1 and org_id = ?", advice_id, drug_id, advice_date, patient_id, user_org_id).Find(&automaticReduceDetail).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return automaticReduceDetail, err
+		}
+	}
+	return automaticReduceDetail, err
+}
+
+func UpdateTodayHis(drug_id int64, advice_date int64, patient_id int64, user_org_id int64, min_unit string, count_total int64, id int64, tx *gorm.DB) (models.XtDrugAutomaticReduceDetail, error) {
+
+	drugAutomaticReduceDetail := models.XtDrugAutomaticReduceDetail{}
+
+	err = tx.Model(&drugAutomaticReduceDetail).Where("drug_id = ? and record_time = ? and patient_id =? and org_id = ? and status=1 and advice_id = ?", drug_id, advice_date, patient_id, user_org_id, id).Updates(map[string]interface{}{"count": count_total, "count_unit": min_unit}).Error
+	if err != nil {
+		tx.Rollback()
+		return drugAutomaticReduceDetail, err
+	}
+	return drugAutomaticReduceDetail, err
+}
+
 func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo) (err error) {
 
 	tx := writeDb.Begin()

service/new_warehouse_service.go

@@ -4144,6 +4144,7 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			AdviceId:                advice.ID,
 		}
 
+		fmt.Println("天激发阿凡达阿道夫阿道夫阿道夫阿道夫阿道夫阿道夫阿道夫阿道夫阿道夫")
 		AddNewSigleDrugAutoReduceRecordInfo(details, tx)
 
 		return nil

service/pharmacy_service.go

@@ -865,12 +865,16 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 	if len(adviceList) > 0 {
 		for _, item := range adviceList {
 
-			//扣减库存
-			err = HisDrugsDelivery(orgid, creater, item)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
+			pharmacyConfig := IsPharmacyConfig(orgid)
+			if pharmacyConfig == true {
+				//扣减库存
+				err = HisDrugsDelivery(orgid, creater, item)
+				if err != nil {
+					err = fmt.Errorf("!:%v", err)
+					return
+				}
 			}
+
 			//修改发药状态
 			err = UpdateIsMedicalHisAdvice(item.ID)
 			if err != nil {

service/schedule_service.go

@@ -1524,8 +1524,14 @@ 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 = ?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
-	return dialysisprescription, err
+
+	if org_id == 10340 {
+		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").Last(&dialysisprescription).Error
+		return dialysisprescription, err
+	} else {
+		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
+	}
 
 }
 
@@ -1838,23 +1844,23 @@ func GetHisPrescriptionProjectList(patient_id int64, record_date int64, user_org
 
 func UpdateProjectObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
-	err = XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("patient_id = ? and record_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("patient_id = ? and record_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.HisPrescription{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id =?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.HisPrescription{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id =?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
 func UpdateAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
-	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
 func UpdateHisAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
-	err = XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 

service/self_drug_service.go

@@ -2002,7 +2002,7 @@ func GetDrugWarehouseInfoName(drugid int64, orgid int64) (info []*models.DrugWar
 
 func UpdateDrugById(id int64, orgid int64, limit_count int64, total_count int64) error {
 
-	err := XTWriteDB().Model(&models.BaseDrugLibTen{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_stock_limit_count": limit_count, "total_count": total_count}).Error
+	err := XTWriteDB().Model(&models.BaseDrugLibTen{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_stock_limit_count": limit_count, "sum_count": total_count}).Error
 	return err
 }
 

service/sign_service.go

@@ -2112,14 +2112,22 @@ func UpdateAllPatient(id int64, diagose string, orgid int64) error {
 
 func GetAllDialysisOrder(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", 21767).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1", 28449).Find(&list).Error
 
 	return list, err
 }
 
-func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64) error {
+func GetLastScheduleByUserOrg(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64) (models.Schedule, error) {
 
-	err := XTWriteDB().Model(&models.XtSchedule{}).Where("schedule_date =? and user_org_id =? and patient_id =?", schedule_date, user_org_id, patient_id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1}).Error
+	schedule := models.Schedule{}
+	err := XTReadDB().Where("patient_id = ? and schedule_date = ? and status=0", patient_id, schedule_date).First(&schedule).Error
+
+	return schedule, err
+}
+
+func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64, id int64) error {
+
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("id = ?", id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1}).Error
 	return err
 }
 

service/stock_service.go

@@ -876,6 +876,11 @@ func FindLastDrugWarehousingInfoByID(drug_id int64, storehouse_id int64) (info m
 	return info, err
 }
 
+func FindLastDrugWarehousingInfoByIDTwo(drug_id int64, storehouse_id int64) (info models.XtDrugWarehouseInfo, err error) {
+	err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 and storehouse_id = ? and is_check = 1", drug_id, storehouse_id).Order("ctime").Last(&info).Error
+	return info, err
+}
+
 func FindNewLastDrugWarehousingInfoByID(drug_id int64, storehouse_id int64, tx *gorm.DB) (info models.XtDrugWarehouseInfo, err error) {
 	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) and storehouse_id = ? and is_check = 1", drug_id, storehouse_id).Order("ctime").First(&info).Error
 	if err != gorm.ErrRecordNotFound {
@@ -5923,14 +5928,11 @@ func DeleteDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time in
 	return err
 }
 
-func DeleteNewDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time int64, advice_id int64, tx *gorm.DB) error {
+func DeleteNewDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time int64, advice_id int64) error {
+
+	err := XTWriteDB().Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1", drugid, patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 
-	err := tx.Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
-	err = tx.Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
 	return err
 }
 

service/warhouse_service.go

@@ -7849,7 +7849,6 @@ func NewHisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdv
 	if isHasWay {
 		//判断当天当前机构有没有创建出库单，没有则创建
 		out, err := FindNewDrugStockOutByIsSys(orgID, 1, record_time, tx)
-		fmt.Println(out)
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
 		if err == gorm.ErrRecordNotFound {
 			timeStr := time.Now().Format("2006-01-02")