修改redis清除数据时间

controllers/patient_api_controller.go

@@ -254,29 +254,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                    adminUserInfo.CurrentOrgId,
-		UserId:                       0,
-		Avatar:                       patients.Avatar,
-		PatientType:                  patients.PatientType,
-		DialysisNo:                   patients.DialysisNo,
-		AdmissionNumber:              patients.AdmissionNumber,
-		Source:                       patients.Source,
-		Lapseto:                      patients.Lapseto,
-		PartitionId:                  patients.PartitionId,
-		BedId:                        patients.BedId,
-		Name:                         patients.Name,
-		Alias:                        patients.Alias,
-		Gender:                       patients.Gender,
-		MaritalStatus:                patients.MaritalStatus,
-		IdCardNo:                     patients.IdCardNo,
-		Birthday:                     patients.Birthday,
-		ReimbursementWayId:           patients.ReimbursementWayId,
-		HealthCareType:               patients.HealthCareType,
-		HealthCareNo:                 patients.HealthCareNo,
-		HealthCareDueDate:            patients.HealthCareDueDate,
-		Height:                       patients.Height,
-		BloodType:                    patients.BloodType,
-		Rh:                           patients.Rh,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		UserId:             0,
+		Avatar:             patients.Avatar,
+		PatientType:        patients.PatientType,
+		DialysisNo:         patients.DialysisNo,
+		AdmissionNumber:    patients.AdmissionNumber,
+		Source:             patients.Source,
+		Lapseto:            patients.Lapseto,
+		PartitionId:        patients.PartitionId,
+		BedId:              patients.BedId,
+		Name:               patients.Name,
+		Alias:              patients.Alias,
+		Gender:             patients.Gender,
+		MaritalStatus:      patients.MaritalStatus,
+		IdCardNo:           patients.IdCardNo,
+		Birthday:           patients.Birthday,
+		ReimbursementWayId: patients.ReimbursementWayId,
+		HealthCareType:     patients.HealthCareType,
+		HealthCareNo:       patients.HealthCareNo,
+		HealthCareDueDate:  patients.HealthCareDueDate,
+		Height:             patients.Height,
+		BloodType:          patients.BloodType,
+		Rh:                 patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -322,28 +322,28 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
-		IsInfectious:                 patients.IsInfectious,
-		RemindCycle:                  patients.RemindCycle,
-		ResponseResult:               patients.ResponseResult,
-		IsOpenRemind:                 patients.IsOpenRemind,
-		FirstTreatmentDate:           patients.FirstTreatmentDate,
-		DialysisAge:                  patients.DialysisAge,
-		ExpenseKind:                  patients.ExpenseKind,
-		TellPhone:                    patients.TellPhone,
-		ContactName:                  patients.ContactName,
-		BloodPatients:                1,
-		SlowPatients:                 0,
-		MemberPatients:               0,
-		EcommerPatients:              "",
-		BloodId:                      patients.ID,
-		SlowId:                       0,
-		MemberId:                     0,
-		MemberFistdate:               0,
-		MemberPatienttype:            0,
-		MemberTreatement:             0,
-		EquitmentId:                  "",
-		UserSysBeforeCount:           patient.UserSysBeforeCount,
+		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
+		IsInfectious:             patients.IsInfectious,
+		RemindCycle:              patients.RemindCycle,
+		ResponseResult:           patients.ResponseResult,
+		IsOpenRemind:             patients.IsOpenRemind,
+		FirstTreatmentDate:       patients.FirstTreatmentDate,
+		DialysisAge:              patients.DialysisAge,
+		ExpenseKind:              patients.ExpenseKind,
+		TellPhone:                patients.TellPhone,
+		ContactName:              patients.ContactName,
+		BloodPatients:            1,
+		SlowPatients:             0,
+		MemberPatients:           0,
+		EcommerPatients:          "",
+		BloodId:                  patients.ID,
+		SlowId:                   0,
+		MemberId:                 0,
+		MemberFistdate:           0,
+		MemberPatienttype:        0,
+		MemberTreatement:         0,
+		EquitmentId:              "",
+		UserSysBeforeCount:       patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -481,28 +481,28 @@ func (c *PatientApiController) EditPatient() {
 		return
 	}
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                 patient.UserOrgId,
-		UserId:                    patient.UserId,
-		Avatar:                    patient.Avatar,
-		PatientType:               patient.PatientType,
-		DialysisNo:                patient.DialysisNo,
-		AdmissionNumber:           patient.AdmissionNumber,
-		Source:                    patient.Source,
-		PartitionId:               patient.PartitionId,
-		BedId:                     patient.BedId,
-		Name:                      patient.Name,
-		Alias:                     patient.Alias,
-		Gender:                    patient.Gender,
-		MaritalStatus:             patient.MaritalStatus,
-		IdCardNo:                  patient.IdCardNo,
-		Birthday:                  patient.Birthday,
-		ReimbursementWayId:        patient.ReimbursementWayId,
-		HealthCareType:            patient.HealthCareType,
-		HealthCareNo:              patient.HealthCareNo,
-		HealthCareDueDate:         patient.HealthCareDueDate,
-		Height:                    patient.Height,
-		BloodType:                 patient.BloodType,
-		Rh:                        patient.Rh,
+		UserOrgId:          patient.UserOrgId,
+		UserId:             patient.UserId,
+		Avatar:             patient.Avatar,
+		PatientType:        patient.PatientType,
+		DialysisNo:         patient.DialysisNo,
+		AdmissionNumber:    patient.AdmissionNumber,
+		Source:             patient.Source,
+		PartitionId:        patient.PartitionId,
+		BedId:              patient.BedId,
+		Name:               patient.Name,
+		Alias:              patient.Alias,
+		Gender:             patient.Gender,
+		MaritalStatus:      patient.MaritalStatus,
+		IdCardNo:           patient.IdCardNo,
+		Birthday:           patient.Birthday,
+		ReimbursementWayId: patient.ReimbursementWayId,
+		HealthCareType:     patient.HealthCareType,
+		HealthCareNo:       patient.HealthCareNo,
+		HealthCareDueDate:  patient.HealthCareDueDate,
+		Height:             patient.Height,
+		BloodType:          patient.BloodType,
+		Rh:                 patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -544,19 +544,19 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
-		IsInfectious:              patient.IsInfectious,
-		RemindCycle:               patient.RemindCycle,
-		ResponseResult:            patient.ResponseResult,
-		IsOpenRemind:              patient.IsOpenRemind,
-		FirstTreatmentDate:        patient.FirstTreatmentDate,
-		DialysisAge:               patient.DialysisAge,
-		ExpenseKind:               patient.ExpenseKind,
-		TellPhone:                 patient.TellPhone,
-		ContactName:               patient.ContactName,
-		UpdatedTime:               time.Now().Unix(),
-		BloodPatients:             1,
-		Lapseto:                   patient.Lapseto,
+		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
+		IsInfectious:             patient.IsInfectious,
+		RemindCycle:              patient.RemindCycle,
+		ResponseResult:           patient.ResponseResult,
+		IsOpenRemind:             patient.IsOpenRemind,
+		FirstTreatmentDate:       patient.FirstTreatmentDate,
+		DialysisAge:              patient.DialysisAge,
+		ExpenseKind:              patient.ExpenseKind,
+		TellPhone:                patient.TellPhone,
+		ContactName:              patient.ContactName,
+		UpdatedTime:              time.Now().Unix(),
+		BloodPatients:            1,
+		Lapseto:                  patient.Lapseto,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -1577,16 +1577,46 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	fmt.Println("adviceName", adviceName.Way)
 	timeStr := time.Now().Format("2006-01-02")
 	fmt.Println("timestr", timeStr)
+
 	//如果医嘱已执行，生成自备药出库单
 	//来自药品库
 	if adviceName.ExecutionState == 1 && adviceName.Way == 1 {
-		timeLayout := "2006-01-02"
-		loc, _ := time.LoadLocation("Local")
-		//产询今日是否存在出库单
-		timeStr := time.Now().Format("2006-01-02")
-		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", timeStr+" 00:00:00", loc)
-		_, errcode := service.GetDrugWareseOut(theTime.Unix(), adminUserInfo.CurrentOrgId)
-		if errcode == gorm.ErrRecordNotFound {
+
+		//查询是否开启药品库
+		stockConfig, _ := service.GetDrugStockConfig(adminUserInfo.CurrentOrgId)
+		//开启药品库
+		if stockConfig.IsOpen == 1 {
+			timeLayout := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+			//产询今日是否存在出库单
+			timeStr := time.Now().Format("2006-01-02")
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", timeStr+" 00:00:00", loc)
+			_, errcode := service.GetDrugWareseOut(theTime.Unix(), adminUserInfo.CurrentOrgId)
+			if errcode == gorm.ErrRecordNotFound {
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+				total = total + 1
+				warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+				number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+				number = number + total
+				warehousing_out_order = "YPRKD" + strconv.FormatInt(number, 10)
+				//查询厂家
+				drug, _ := service.GetManufacturer(adviceName.DrugId)
+				//创建
+				warehouse := models.XtDrugWarehouse{
+					WarehousingOrder: warehousing_out_order,
+					OperationTime:    theTime.Unix(),
+					Creater:          adminUserInfo.AdminUser.Id,
+					OrgId:            adminUserInfo.CurrentOrgId,
+					Status:           1,
+					WarehousingTime:  theTime.Unix(),
+					Manufacturer:     drug.Manufacturer,
+					Type:             1,
+				}
+				service.CreateDrugWarehoue(&warehouse)
+			}
+
 			timeArr := strings.Split(timeStr, "-")
 			total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
 
@@ -1595,144 +1625,127 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
 			number = number + total
 			warehousing_out_order = "YPRKD" + strconv.FormatInt(number, 10)
-			//查询厂家
 			drug, _ := service.GetManufacturer(adviceName.DrugId)
-			//创建
-			warehouse := models.XtDrugWarehouse{
-				WarehousingOrder: warehousing_out_order,
-				OperationTime:    theTime.Unix(),
-				Creater:          adminUserInfo.AdminUser.Id,
-				OrgId:            adminUserInfo.CurrentOrgId,
-				Status:           1,
-				WarehousingTime:  theTime.Unix(),
-				Manufacturer:     drug.Manufacturer,
-				Type:             1,
+			out := models.XtDrugWarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           theTime.Unix(),
+				Creater:                 adminUserInfo.AdminUser.Id,
+				OrgId:                   adminUserInfo.CurrentOrgId,
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				WarehouseOutTime:        theTime.Unix(),
+				Manufacturer:            drug.Manufacturer,
+				Type:                    1,
+				IsSys:                   1,
 			}
-			service.CreateDrugWarehoue(&warehouse)
-		}
-
-		timeArr := strings.Split(timeStr, "-")
-		total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
-
-		total = total + 1
-		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-		number = number + total
-		warehousing_out_order = "YPRKD" + strconv.FormatInt(number, 10)
-		drug, _ := service.GetManufacturer(adviceName.DrugId)
-		out := models.XtDrugWarehouseOut{
-			WarehouseOutOrderNumber: warehousing_out_order,
-			OperationTime:           theTime.Unix(),
-			Creater:                 adminUserInfo.AdminUser.Id,
-			OrgId:                   adminUserInfo.CurrentOrgId,
-			Ctime:                   time.Now().Unix(),
-			Status:                  1,
-			WarehouseOutTime:        theTime.Unix(),
-			Manufacturer:            drug.Manufacturer,
-			Type:                    1,
-			IsSys:                   1,
-		}
-		service.CreateDrugWareHouseOut(&out)
-
-		//查询今日的出库单号
-		orderOut, _ := service.GetTodayWareHousringOrder(theTime.Unix(), adminUserInfo.CurrentOrgId)
-		prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
-		outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-		timeArrs := strings.Split(timeStr, "-")
-		totals, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
-
-		totals = totals + 1
-		warehousing_out_orders := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArrs[0] + timeArrs[1] + timeArrs[2] + "000"
-		numbers, _ := strconv.ParseInt(warehousing_out_orders, 10, 64)
-		number = numbers + totals
-		warehousing_out_order = "YPCKD" + strconv.FormatInt(numbers, 10)
-		info := models.XtDrugWarehouseOutInfo{
-			WarehouseOutId:          orderOut.ID,
-			DrugId:                  adviceName.DrugId,
-			Count:                   outStoreNumber,
-			Price:                   drug.RetailPrice,
-			TotalPrice:              drug.RetailPrice,
-			ProductDate:             theTime.Unix(),
-			Ctime:                   time.Now().Unix(),
-			Status:                  1,
-			OrgId:                   adminUserInfo.CurrentOrgId,
-			IsCancel:                2,
-			WarehouseOutOrderNumber: warehousing_out_order,
-			Type:                    1,
-			Manufacturer:            orderOut.Manufacturer,
-			IsSys:                   1,
-			SysRecordTime:           theTime.Unix(),
-		}
-		service.CreateWareHouseOutInfo(&info)
-
-		timeArrss := strings.Split(timeStr, "-")
-		totalss, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
-
-		totalss = totalss + 1
-		warehousing_out_orderss := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArrss[0] + timeArrss[1] + timeArrss[2] + "000"
-		numberss, _ := strconv.ParseInt(warehousing_out_orderss, 10, 64)
-		number = numberss + totalss
-		warehousing_out_order = "YPCKD" + strconv.FormatInt(numberss, 10)
-		detail := models.XtDrugAutomaticReduceDetail{
-			WarehouseOutOrderNumber: warehousing_out_order,
-			WarehouseOutId:          orderOut.ID,
-			PatientId:               adviceName.PatientId,
-			Ctime:                   time.Now().Unix(),
-			RecordTime:              theTime.Unix(),
-			OrgId:                   adminUserInfo.CurrentOrgId,
-			GoodId:                  adviceName.DrugId,
-			Count:                   outStoreNumber,
-			Status:                  1,
+			service.CreateDrugWareHouseOut(&out)
+
+			//查询今日的出库单号
+			orderOut, _ := service.GetTodayWareHousringOrder(theTime.Unix(), adminUserInfo.CurrentOrgId)
+			prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+			outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			timeArrs := strings.Split(timeStr, "-")
+			totals, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+			totals = totals + 1
+			warehousing_out_orders := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArrs[0] + timeArrs[1] + timeArrs[2] + "000"
+			numbers, _ := strconv.ParseInt(warehousing_out_orders, 10, 64)
+			number = numbers + totals
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(numbers, 10)
+			info := models.XtDrugWarehouseOutInfo{
+				WarehouseOutId:          orderOut.ID,
+				DrugId:                  adviceName.DrugId,
+				Count:                   outStoreNumber,
+				Price:                   drug.RetailPrice,
+				TotalPrice:              drug.RetailPrice,
+				ProductDate:             theTime.Unix(),
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				OrgId:                   adminUserInfo.CurrentOrgId,
+				IsCancel:                2,
+				WarehouseOutOrderNumber: warehousing_out_order,
+				Type:          1,
+				Manufacturer:  orderOut.Manufacturer,
+				IsSys:         1,
+				SysRecordTime: theTime.Unix(),
+			}
+			service.CreateWareHouseOutInfo(&info)
+
+			timeArrss := strings.Split(timeStr, "-")
+			totalss, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+			totalss = totalss + 1
+			warehousing_out_orderss := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArrss[0] + timeArrss[1] + timeArrss[2] + "000"
+			numberss, _ := strconv.ParseInt(warehousing_out_orderss, 10, 64)
+			number = numberss + totalss
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(numberss, 10)
+			detail := models.XtDrugAutomaticReduceDetail{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				WarehouseOutId:          orderOut.ID,
+				PatientId:               adviceName.PatientId,
+				Ctime:                   time.Now().Unix(),
+				RecordTime:              theTime.Unix(),
+				OrgId:                   adminUserInfo.CurrentOrgId,
+				GoodId:                  adviceName.DrugId,
+				Count:                   outStoreNumber,
+				Status:                  1,
+			}
+			service.CreateAotoMaticReduceDetail(&detail)
 		}
-		service.CreateAotoMaticReduceDetail(&detail)
 	}
 
 	if adviceName.ExecutionState == 1 && adviceName.Way == 2 {
 
-		prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
-		outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
-
-		total = total + 1
-		warehousing_out_order := strconv.FormatInt(adminUserInfo.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)
-
-		medicalName, errcode := service.GetSelfMedicalByDrugName(adviceName.AdviceName, adviceName.AdviceDesc, adviceName.PatientId)
-		if errcode == gorm.ErrRecordNotFound {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":    "ok",
-				"advice": advice,
-			})
-			return
-		} else if errcode == nil {
-			outStock := models.XtSelfOutStock{
-				DrugName:       adviceName.AdviceName,
-				DrugSpec:       adviceName.AdviceDesc,
-				OutstoreNumber: outStoreNumber,
-				AdminUserId:    adminUserInfo.AdminUser.Id,
-				CreatedTime:    time.Now().Unix(),
-				Status:         1,
-				PatientId:      adviceName.PatientId,
-				StockOutNumber: warehousing_out_order,
-				ExitMode:       2,
-				StorckTime:     adviceName.AdviceDate,
-				MedicId:        medicalName.ID,
-				DrugNameId:     medicalName.DrugNameId,
-				UserOrgId:      adminUserInfo.CurrentOrgId,
+		//是否开启自备药
+		medicalSet, _ := service.GetSetSelfMedical(adminUserInfo.CurrentOrgId)
+		//开启自备药，生成出库单
+		if medicalSet.DrugStart == 1 {
+			prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+			outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(adminUserInfo.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)
+
+			medicalName, errcode := service.GetSelfMedicalByDrugName(adviceName.AdviceName, adviceName.AdviceDesc, adviceName.PatientId)
+			if errcode == gorm.ErrRecordNotFound {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "ok",
+					"advice": advice,
+				})
+				return
+			} else if errcode == nil {
+				outStock := models.XtSelfOutStock{
+					DrugName:       adviceName.AdviceName,
+					DrugSpec:       adviceName.AdviceDesc,
+					OutstoreNumber: outStoreNumber,
+					AdminUserId:    adminUserInfo.AdminUser.Id,
+					CreatedTime:    time.Now().Unix(),
+					Status:         1,
+					PatientId:      adviceName.PatientId,
+					StockOutNumber: warehousing_out_order,
+					ExitMode:       2,
+					StorckTime:     adviceName.AdviceDate,
+					MedicId:        medicalName.ID,
+					DrugNameId:     medicalName.DrugNameId,
+					UserOrgId:      adminUserInfo.CurrentOrgId,
+				}
+				//创建出库单,自动出库
+				service.CreateOutStock(&outStock)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "ok",
+					"advice": advice,
+				})
+				return
 			}
-			//创建出库单,自动出库
-			service.CreateOutStock(&outStock)
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":    "ok",
-				"advice": advice,
-			})
-			return
 		}
+
 	}
 
 }

controllers/self_drug_api_congtroller.go

@@ -44,6 +44,7 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getdrugdatabypatientid", &SelfDrugApiController{}, "Get:GetDrugDataByPatientId")
 	beego.Router("/api/drug/getselfmedicallist", &SelfDrugApiController{}, "Get:GetSelfMedicalList")
 	beego.Router("/api/drug/getdrugdescbydrugname", &SelfDrugApiController{}, "Get:GetDrugDescByDrugName")
+	beego.Router("/api/drug/getdrugset", &SelfDrugApiController{}, "Get:GetDrugSet")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -64,14 +65,22 @@ func (this *SelfDrugApiController) GetAllDrugName() {
 
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
+
+	//查询药品库是否开启
+	//configStock, _ := service.GetDrugStockConfig(orgId)
+	//if configStock.IsOpen == 1 {
+	//
+	//}
+
 	drugName, err := service.GetAllDrugName(orgId)
 	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "查寻成功")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"drugName": drugName,
 	})
+
 }
 
 func (this *SelfDrugApiController) SaveDrugName() {
@@ -515,16 +524,20 @@ func (this *SelfDrugApiController) GetStockList() {
 	startimeUnix := theTime.Unix()
 	keyword := this.GetString("keyword")
 	fmt.Println("keyword", keyword)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	//获取
+	medicalList, _ := service.GetMedicalList(patientid, orgId, keyword)
 	//统计总数量
-	stocklist, err := service.GetStockList(patientid, startimeUnix, keyword)
-
+	stocklist, err := service.GetStockList(patientid, startimeUnix, keyword, orgId)
 	//统计出库数量
-	outStocklist, err := service.GetOutStockList(patientid, startimeUnix, keyword)
+	outStocklist, err := service.GetOutStockList(patientid, startimeUnix, keyword, orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
+		"medicalList":  medicalList,
 		"stocklist":    stocklist,
 		"outStocklist": outStocklist,
 	})
@@ -690,3 +703,18 @@ func (this *SelfDrugApiController) GetDrugDescByDrugName() {
 	}
 
 }
+
+func (this *SelfDrugApiController) GetDrugSet() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	drugSet, err := service.GetDrugSet(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugSet": drugSet,
+	})
+
+}

models/self_drug_models.go

@@ -101,6 +101,23 @@ func (XtStandName) TableName() string {
 	return "xt_stand_name"
 }
 
+type XtSelfMedicals struct {
+	DrugName    string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugSpec    string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DrugNameId  int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	MinUnit     string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StoreNumber int64  `gorm:"column:store_number" json:"store_number" form:"store_number"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	StorckTime  int64  `gorm:"column:storck_time" json:"storck_time" form:"storck_time"`
+	MedicId     int64  `gorm:"column:medic_id" json:"medic_id" form:"medic_id"`
+	Remarks     string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Total       int64
+}
+
 type XtSelfMedical struct {
 	DrugName           string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
 	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
@@ -146,6 +163,21 @@ func (XtSelfStock) TableName() string {
 	return "xt_self_stock"
 }
 
+type SelfOutStock struct {
+	DrugName       string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugSpec       string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DrugNameId     int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	Remarks        string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	OutstoreNumber int64  `gorm:"column:outstore_number" json:"outstore_number" form:"outstore_number"`
+	AdminUserId    int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	StorckTime     int64  `gorm:"column:storck_time" json:"storck_time" form:"storck_time"`
+	MedicId        int64  `gorm:"column:medic_id" json:"medic_id" form:"medic_id"`
+	Count          int64
+}
+
 type XtSelfOutStock struct {
 	ID             int64  `gorm:"column:id" json:"id" form:"id"`
 	DrugName       string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
@@ -348,3 +380,16 @@ type DrugWarehousingInfo struct {
 	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Count  int64
 }
+
+type XtDrugStockConfig struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsOpen     int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	CreateTime int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
+}
+
+func (XtDrugStockConfig) TableName() string {
+	return "xt_drug_stock_config"
+}

service/self_drug_service.go

@@ -14,7 +14,7 @@ func GetCurrentPatient(orgid int64) (patients []*models.DrugPatients, err error)
 
 func GetAllDrugName(orgid int64) (baseDrug []*models.XtBaseDrug, err error) {
 
-	err = XTReadDB().Group("drug_name").Where("org_id = ? and status = 1", orgid).Find(&baseDrug).Error
+	err = XTReadDB().Group("drug_name").Where("org_id = ? and status = 1 and find_in_set('停用',drug_status) = 0", orgid).Find(&baseDrug).Error
 	return baseDrug, err
 
 }
@@ -177,36 +177,77 @@ func DeleteDrugStand(id int64) error {
 	return err
 }
 
-func GetStockList(patientid int64, startime int64, keyword string) (stock []*models.SelfStocks, err error) {
-	db := XTReadDB().Table("xt_self_stock as x").Where("x.status = 1")
+//func GetStockList(patientid int64, startime int64, keyword string) (stock []*models.SelfStocks, err error) {
+//	db := XTReadDB().Table("xt_self_stock as x").Where("x.status = 1")
+//	likeKey := "%" + keyword + "%"
+//	table := XTReadDB().Table("xt_patients as s")
+//	fmt.Println(table)
+//	if patientid > 0 {
+//		db = db.Where("x.patient_id = ?", patientid)
+//	}
+//	if startime > 0 {
+//		db = db.Where("x.storck_time <= ?", startime)
+//	}
+//	err = db.Group("x.drug_name,x.drug_spec").Select("x.id,x.drug_name,x.drug_name_id,x.drug_spec,x.remarks,x.store_number,x.admin_user_id,x.storck_time,x.user_org_id,x.stock_in_number,x.patient_id,x.min_unit,sum(x.store_number) as total").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&stock).Error
+//	return stock, err
+//}
+
+func GetStockList(patientid int64, startime int64, keyword string, orgid int64) (stock []*models.XtSelfMedicals, err error) {
 	likeKey := "%" + keyword + "%"
-	table := XTReadDB().Table("xt_patients as s")
-	fmt.Println(table)
+	db := XTReadDB().Table("xt_self_medical as x").Where("x.status = 1")
 	if patientid > 0 {
 		db = db.Where("x.patient_id = ?", patientid)
 	}
-	//if startime >0 {
-	//  db = db.Where("x.storck_time = ?", startime)
-	//}
-	err = db.Group("x.drug_name,x.drug_spec").Select("x.id,x.drug_name,x.drug_name_id,x.drug_spec,x.remarks,x.store_number,x.admin_user_id,x.storck_time,x.user_org_id,x.stock_in_number,x.patient_id,x.min_unit,sum(x.store_number) as total").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&stock).Error
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.drug_name,x.drug_spec").Select("x.id,x.drug_name,x.drug_name_id,x.drug_spec,x.min_unit,sum(t.store_number) as total,t.remarks,x.patient_id,t.stock_in_number,t.storck_time,t.admin_user_id,t.medic_id").Joins("left join xt_self_stock as t on t.medic_id = x.id").Where("t.storck_time<=?", startime).Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&stock).Error
 	return stock, err
 }
 
-func GetOutStockList(patientid int64, startime int64, keyword string) (outStock []*models.XtSelfOutStocks, err error) {
-	db := XTReadDB().Table("xt_self_out_stock as x").Where("x.status = 1")
+func GetOutStockList(patientid int64, startime int64, keyword string, orgid int64) (outStock []*models.SelfOutStock, err error) {
+
 	likeKey := "%" + keyword + "%"
-	table := XTReadDB().Table("xt_patients as s")
-	fmt.Println(table)
+	db := XTReadDB().Table("xt_self_medical as x").Where("x.status = 1")
 	if patientid > 0 {
 		db = db.Where("x.patient_id = ?", patientid)
 	}
-	//if startime > 0 {
-	//  db = db.Where("x.storck_time = ?", startime)
-	//}
-	err = db.Group("x.drug_name,x.drug_spec").Select("x.drug_name,x.drug_spec,x.patient_id,x.stock_out_number,sum(x.outstore_number) as count").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&outStock).Error
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.drug_name,x.drug_spec").Select("x.id,x.drug_name,x.drug_name_id,x.drug_spec,x.min_unit,sum(t.outstore_number) as count,t.remarks,x.patient_id,t.stock_out_number,t.storck_time,t.admin_user_id,t.medic_id").Joins("left join xt_self_out_stock as t on t.medic_id = x.id").Where("t.storck_time<=?", startime).Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&outStock).Error
 	return outStock, err
 }
 
+//func GetOutStockList(patientid int64, startime int64, keyword string) (outStock []*models.XtSelfOutStocks, err error) {
+//	db := XTReadDB().Table("xt_self_out_stock as x").Where("x.status = 1")
+//	likeKey := "%" + keyword + "%"
+//	table := XTReadDB().Table("xt_patients as s")
+//	fmt.Println(table)
+//	if patientid > 0 {
+//		db = db.Where("x.patient_id = ?", patientid)
+//	}
+//	if startime > 0 {
+//		db = db.Where("x.storck_time <= ?", startime)
+//	}
+//	err = db.Group("x.drug_name,x.drug_spec").Select("x.drug_name,x.drug_spec,x.patient_id,x.stock_out_number,sum(x.outstore_number) as count").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&outStock).Error
+//	return outStock, err
+//}
+
+func GetMedicalList(patientid int64, orgid int64, keyword string) (medical []*models.XtSelfMedicals, err error) {
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Table("xt_self_medical as x").Where("x.status = 1")
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.drug_name,x.id,x.drug_spec,x.patient_id,x.min_unit").Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Group("x.drug_name,x.drug_spec").Scan(&medical).Error
+	//err = XTReadDB().Model(&medical).Where("patient_id = ? and user_org_id = ? and status = 1", patientid, orgid).Group("drug_name,drug_spec").Find(&medical).Error
+	return medical, err
+}
+
 func GetStockOutDetail(durgname string, patientid int64) (stock []*models.XtSelfOutStock, err error) {
 
 	err = XTReadDB().Model(&stock).Where("drug_name = ? and patient_id = ? and status = 1", durgname, patientid).Find(&stock).Error
@@ -220,16 +261,14 @@ func DeleteDrugStockNumber(drugname string, patientid int64) (models.XtSelfStock
 }
 
 func GetStockDetail(drugname string, drugspec string, startime int64, endtime int64, patientid int64, orgid int64) (stock []*models.XtSelfStock, err error) {
-	fmt.Println("startime", startime)
-	fmt.Println("endtime", endtime)
-	err = XTReadDB().Model(&stock).Where("drug_name = ? and drug_spec = ? and patient_id =? and user_org_id = ? and status = 1", drugname, drugspec, patientid, orgid).Find(&stock).Error
+
+	err = XTReadDB().Model(&stock).Where("drug_name = ? and drug_spec = ? and patient_id =? and user_org_id = ? and status = 1 and storck_time>=? and storck_time<=?", drugname, drugspec, patientid, orgid, startime, endtime).Order("storck_time asc").Find(&stock).Error
 	return stock, err
 }
 
 func GetOutStockDetail(drugname string, drugspec string, startime int64, endtime int64, patientid int64, orgid int64) (outStock []*models.XtSelfOutStock, err error) {
-	fmt.Println(startime)
-	fmt.Println(endtime)
-	err = XTReadDB().Model(&outStock).Where("drug_name = ? and drug_spec=? and patient_id = ? and user_org_id = ? and status = 1", drugname, drugspec, patientid, orgid).Find(&outStock).Error
+
+	err = XTReadDB().Model(&outStock).Where("drug_name = ? and drug_spec=? and patient_id = ? and user_org_id = ? and status = 1 and storck_time>=? and storck_time<=?", drugname, drugspec, patientid, orgid, startime, endtime).Order("storck_time asc").Find(&outStock).Error
 	return outStock, err
 }
 
@@ -376,6 +415,20 @@ func CreateAotoMaticReduceDetail(detail *models.XtDrugAutomaticReduceDetail) err
 	return err
 }
 
+func GetDrugStockConfig(orgid int64) (models.XtDrugStockConfig, error) {
+
+	config := models.XtDrugStockConfig{}
+	err := XTReadDB().Model(&config).Where("org_id =? and status = 1", orgid).Find(&orgid).Error
+	return config, err
+}
+
+func GetDrugSet(orgid int64) (models.XtDrugSet, error) {
+
+	drugSet := models.XtDrugSet{}
+	err := XTReadDB().Model(&drugSet).Where("user_org_id =? and status = 1", orgid).Find(&drugSet).Error
+	return drugSet, err
+}
+
 type Drugs struct {
 	ID                 int64    `gorm:"column:id" json:"id" form:"id"`
 	DrugName           string   `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`