Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/patient_api_controller.go

@@ -1573,171 +1573,382 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	advice.ExecutionTime = theTime.Unix()
 	// advice.Checker = checker
 
-	adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
-	fmt.Println("adviceName", adviceName.Way)
-	timeStr := time.Now().Format("2006-01-02")
-	fmt.Println("timestr", timeStr)
-
-	//如果医嘱已执行，生成自备药出库单
-	//来自药品库
-	if adviceName.ExecutionState == 1 && adviceName.Way == 1 {
-
-		//查询是否开启药品库
-		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 {
+	//adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+	//fmt.Println("adviceName", adviceName.Way)
+
+	//处理出库相关逻辑
+
+	//1.判断是否启用药品管理和自备药出库功能
+
+	//药品管理信息
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
+
+	//自备药信息
+	privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
+	fmt.Println("drugStockConfig9999999999999", drugStockConfig.IsOpen)
+	if drugStockConfig.IsOpen == 1 {
+		adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+		//isHasWay := false //用来判断是否包含来自药品库的医嘱
+
+		if adviceName.Way == 1 {
+			fmt.Println("药品库进来没有--------------------")
+			out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, adviceName.RecordDate)
+			fmt.Println("err================", err)
+			if err == gorm.ErrRecordNotFound {
+				//没有记录，则创建出库单
+				timeStr := time.Now().Format("2006-01-02")
 				timeArr := strings.Split(timeStr, "-")
 				total, _ := service.FindAllDrugWarehouseOut(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,
+				warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+				creater := adminUserInfo.AdminUser.Id
+				warehouseOut := models.DrugWarehouseOut{
+					WarehouseOutOrderNumber: warehousing_out_order,
+					OperationTime:           time.Now().Unix(),
+					OrgId:                   adminUserInfo.CurrentOrgId,
+					Creater:                 creater,
+					Ctime:                   time.Now().Unix(),
+					Status:                  1,
+					WarehouseOutTime:        adviceName.RecordDate,
+					Dealer:                  0,
+					Manufacturer:            0,
+					Type:                    1,
+					IsSys:                   1,
+				}
+				fmt.Println("触发了梅花园")
+				err := service.AddSigleDrugWarehouseOut(&warehouseOut)
+				if err != nil {
+					utils.TraceLog("创建出库单失败 err = %v", err)
+				} else {
+					if adviceName.Way == 1 {
+						if adviceName.PrescribingNumber > 0 {
+							warehouseOutInfo := &models.DrugWarehouseOutInfo{
+								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+								WarehouseOutId:          warehouseOut.ID,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								Remark:                  "",
+								OrgId:                   adminUserInfo.CurrentOrgId,
+								Type:                    1,
+								Manufacturer:            0,
+								Dealer:                  0,
+								IsSys:                   1,
+								SysRecordTime:           adviceName.RecordDate,
+								DrugId:                  adviceName.DrugId,
+							}
+							prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+							warehouseOutInfo.Count = count
+							stockInInfo, _ := service.FindLastDrugStockInInfoRecord(adviceName.DrugId, adminUserInfo.CurrentOrgId)
+							warehouseOutInfo.Price = stockInInfo.Price
+							err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+							if err == nil {
+								details := &models.DrugAutomaticReduceDetail{
+									WarehouseOutId:          warehouseOutInfo.ID,
+									WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+									PatientId:               adviceName.PatientId,
+									Ctime:                   time.Now().Unix(),
+									Mtime:                   time.Now().Unix(),
+									Status:                  1,
+									RecordTime:              adviceName.RecordDate,
+									OrgId:                   adminUserInfo.CurrentOrgId,
+									DrugId:                  adviceName.DrugId,
+									Count:                   count,
+								}
+								service.AddSigleDrugAutoReduceRecordInfo(details)
+							}
+						}
+					}
+				}
+			} else if err == nil {
+
+				if adviceName.Way == 1 {
+					outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, adviceName.DrugId, out.ID, out.WarehouseOutOrderNumber)
+					if err == gorm.ErrRecordNotFound {
+						warehouseOutInfo := &models.DrugWarehouseOutInfo{
+							WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+							WarehouseOutId:          out.ID,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							Remark:                  "",
+							OrgId:                   adminUserInfo.CurrentOrgId,
+							Type:                    1,
+							Manufacturer:            0,
+							Dealer:                  0,
+							IsSys:                   1,
+							SysRecordTime:           adviceName.RecordDate,
+						}
+
+						stockInInfo, _ := service.FindLastDrugStockInInfoRecord(adviceName.DrugId, adminUserInfo.CurrentOrgId)
+						warehouseOutInfo.Price = stockInInfo.Price
+						warehouseOutInfo.DrugId = adviceName.DrugId
+						prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+						warehouseOutInfo.Count = count
+						err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+						if err == nil {
+							details := &models.DrugAutomaticReduceDetail{
+								WarehouseOutId:          warehouseOutInfo.ID,
+								WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+								PatientId:               adviceName.PatientId,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   time.Now().Unix(),
+								Status:                  1,
+								RecordTime:              adviceName.RecordDate,
+								OrgId:                   adminUserInfo.CurrentOrgId,
+								DrugId:                  adviceName.DrugId,
+								Count:                   count,
+							}
+							service.AddSigleDrugAutoReduceRecordInfo(details)
+						}
+
+					} else if err == nil { //记录存在，则将增加数量
+						if outInfo.ID > 0 {
+							prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+							service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
+						}
+
+						count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, adviceName.RecordDate, adviceName.DrugId, adviceName.PatientId)
+						if count == 0 {
+							prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+							details := &models.DrugAutomaticReduceDetail{
+								WarehouseOutId:          outInfo.ID,
+								WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+								PatientId:               adviceName.PatientId,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   time.Now().Unix(),
+								Status:                  1,
+								RecordTime:              adviceName.RecordDate,
+								OrgId:                   adminUserInfo.CurrentOrgId,
+								DrugId:                  adviceName.DrugId,
+								Count:                   count,
+							}
+							service.AddSigleDrugAutoReduceRecordInfo(details)
+						} else if count == 1 {
+							prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+							service.UpdateDrugUserInfoDetails(adviceName.DrugId, adviceName.RecordDate, adminUserInfo.CurrentOrgId, adviceName.PatientId, count, &outInfo)
+						}
+
+					}
 				}
-				service.CreateDrugWarehoue(&warehouse)
-			}
 
-			timeArr := strings.Split(timeStr, "-")
-			total, _ := service.FindAllDrugWarehouseOut(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.FindAllDrugWarehouseOut(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.FindAllDrugWarehouseOut(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)
 		}
 	}
 
-	if adviceName.ExecutionState == 1 && adviceName.Way == 2 {
-
-		//是否开启自备药
-		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.FindAllDrugWarehouseOut(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)
-
-			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:        adviceName.DrugId,
-				UserOrgId:      adminUserInfo.CurrentOrgId,
+	fmt.Println("222222222222", privateDrugConfig.DrugStart)
+	adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+	if adviceName.Way == 2 {
+		if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
+			fmt.Println("进来了没有-------------------------------")
+			adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+			fmt.Println("3333333333", adviceName.ExecutionState)
+			if adviceName.ExecutionState == 1 {
+				prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllDrugWarehouseOut(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)
+				//插入自备药出库单
+				outStock := models.XtSelfOutStock{
+					DrugName:       adviceName.AdviceName,
+					DrugNameId:     adviceName.DrugId,
+					DrugSpec:       adviceName.AdviceDesc,
+					OutstoreNumber: count,
+					AdminUserId:    adminUserInfo.AdminUser.Id,
+					StorckTime:     adviceName.RecordDate,
+					UserOrgId:      adminUserInfo.CurrentOrgId,
+					CreatedTime:    time.Now().Unix(),
+					Status:         1,
+					PatientId:      adviceName.PatientId,
+					ExitMode:       2,
+					MedicId:        adviceName.DrugId,
+					StockOutNumber: warehousing_out_order,
+				}
+				service.CreateOutStock(&outStock)
 			}
-			//创建出库单,自动出库
-			service.CreateOutStock(&outStock)
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":    "ok",
-				"advice": advice,
-			})
-			return
 		}
-
 	}
 
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":    "ok",
+		"advice": advice,
+	})
+	return
+
+	////如果医嘱已执行，生成自备药出库单
+	//  //来自药品库
+	//  if adviceName.ExecutionState == 1 && adviceName.Way == 1 {
+	//
+	//    //查询是否开启药品库
+	//    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.FindAllDrugWarehouseOut(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.FindAllDrugWarehouseOut(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.FindAllDrugWarehouseOut(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.FindAllDrugWarehouseOut(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)
+	//    }
+	//}
+
+	//if adviceName.ExecutionState == 1 && adviceName.Way == 2 {
+	//
+	//	//是否开启自备药
+	//	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.FindAllDrugWarehouseOut(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)
+	//
+	//		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:        adviceName.DrugId,
+	//			UserOrgId:      adminUserInfo.CurrentOrgId,
+	//		}
+	//		//创建出库单,自动出库
+	//		service.CreateOutStock(&outStock)
+	//		c.ServeSuccessJSON(map[string]interface{}{
+	//			"msg":    "ok",
+	//			"advice": advice,
+	//		})
+	//		return
+	//	}
+	//
+	//}
+
 }
 
 func (c *PatientApiController) CheckGroupAdvice() {

controllers/self_drug_api_congtroller.go

@@ -45,6 +45,9 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getselfmedicallist", &SelfDrugApiController{}, "Get:GetSelfMedicalList")
 	beego.Router("/api/drug/getdrugdescbydrugname", &SelfDrugApiController{}, "Get:GetDrugDescByDrugName")
 	beego.Router("/api/drug/getdrugset", &SelfDrugApiController{}, "Get:GetDrugSet")
+	beego.Router("/api/drug/getallmedicallist", &SelfDrugApiController{}, "Get:GetAllMedicalList")
+	beego.Router("/api/drug/getstandname", &SelfDrugApiController{}, "Get:GetStandName")
+	beego.Router("/api/drug/getrullerlist", &SelfDrugApiController{}, "Get:GetRullerList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -131,15 +134,14 @@ func (this *SelfDrugApiController) GetRulleName() {
 
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	name := this.GetString("name")
-	rulleName, err := service.GetRulleName(orgId, name)
-	rullerList, err := service.GetRulleList(orgId, name)
+	id, _ := this.GetInt64("id")
+	drugId, _ := service.GetDrugId(id)
+	rullerList, err := service.GetRulleList(orgId, drugId.DrugId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"rulleName":  rulleName,
 		"rullerList": rullerList,
 	})
 }
@@ -162,6 +164,7 @@ func (this *SelfDrugApiController) SaveRulleName() {
 	drug_spec := this.GetString("drug_spec")
 	drug_stock_limit := this.GetString("drug_stock_limit")
 	drug_name_id, _ := this.GetInt64("drug_name_id")
+	drug_id, _ := this.GetInt64("drug_id")
 	price, _ := this.GetInt64("price")
 	prices := strconv.FormatInt(price, 10)
 	durg_price, _ := strconv.ParseFloat(prices, 64)
@@ -179,6 +182,7 @@ func (this *SelfDrugApiController) SaveRulleName() {
 		UserOrgId:      orgId,
 		Status:         1,
 		CreatedTime:    time.Now().Unix(),
+		DrugId:         drug_id,
 	}
 
 	err := service.SaveRulleName(&drugSpecName)
@@ -216,6 +220,8 @@ func (this *SelfDrugApiController) UpdatedRullerName() {
 	drug_spec := this.GetString("drug_spec")
 	unit := this.GetString("unit")
 	drug_name_id, _ := this.GetInt64("drug_name_id")
+	drug_id, _ := this.GetInt64("drug_id")
+
 	RullerName := models.XtStandName{
 		DrugName:       drug_name,
 		DrugStockLimit: drug_stock_limit,
@@ -223,16 +229,23 @@ func (this *SelfDrugApiController) UpdatedRullerName() {
 		DrugSpec:       drug_spec,
 		MinUnit:        unit,
 		DrugNameId:     drug_name_id,
+		DrugId:         drug_id,
 	}
-
-	err := service.UpdatedRullerName(id, &RullerName)
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+	_, errcode := service.GetIsExit(drug_name, drug_spec, id)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.UpdatedRullerName(id, &RullerName)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"RullerName": RullerName,
+		})
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"RullerName": RullerName,
-	})
+
 }
 
 func (this *SelfDrugApiController) GetAllDrugNameList() {
@@ -252,12 +265,11 @@ func (this *SelfDrugApiController) GetAllDrugNameList() {
 
 func (this *SelfDrugApiController) GetRullerListByDrugName() {
 
-	drug_name := this.GetString("drug_name")
-	fmt.Println(drug_name)
+	id := this.GetString("id")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	fmt.Println("orgid", orgId)
-	drugName, err := service.GetRullerListByDrugName(drug_name, orgId)
+	drugName, err := service.GetRullerListByDrugName(id, orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
@@ -282,7 +294,7 @@ func (this *SelfDrugApiController) SaveSelfMedicines() {
 		drug_name_id := int64(items["drug_name_id"].(float64))
 		drug_spec := items["drug_spec"].(string)
 		min_unit := items["min_unit"].(string)
-
+		drug_id := int64(items["drug_id"].(float64))
 		//根据drug_id
 		drugMedical, _ := service.GetBaseDrugMedical(drug_name_id)
 		medical := models.XtSelfMedical{
@@ -298,6 +310,7 @@ func (this *SelfDrugApiController) SaveSelfMedicines() {
 			PrescribingNumber:  drugMedical.PrescribingNumber,
 			DeliveryWay:        drugMedical.DeliveryWay,
 			SingleDose:         drugMedical.SingleDose,
+			DrugId:             drug_id,
 		}
 		//查询同个病人同个药品同个规格是否已存在
 		_, errcode := service.GetSelfMedicalByDrugName(drug_name, drug_spec, patient_id)
@@ -461,12 +474,12 @@ func (this *SelfDrugApiController) SaveOutStock() {
 func (this *SelfDrugApiController) DeleteDrugById() {
 	id, _ := this.GetInt64("id")
 	drug_name := this.GetString("drug_name")
-	fmt.Println("drug_name", drug_name)
+
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 
 	_, errcode := service.GetStandDrugByDrugName(drug_name, orgId)
-	fmt.Println("errcode2222222222222", errcode)
+
 	if errcode == gorm.ErrRecordNotFound {
 		service.DeleteDrugName(id)
 		returnData := make(map[string]interface{}, 0)
@@ -515,11 +528,22 @@ func (this *SelfDrugApiController) SaveRadio() {
 func (this *SelfDrugApiController) DeleteDrugStand() {
 
 	id, _ := this.GetInt64("id")
-	err := service.DeleteDrugStand(id)
-	fmt.Println(err)
-	returnData := make(map[string]interface{}, 0)
-	returnData["msg"] = "ok"
-	this.ServeSuccessJSON(returnData)
+	name := this.GetString("name")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	_, errcode := service.GetMedicalsByName(orgId, name)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.DeleteDrugStand(id)
+		fmt.Println(err)
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+	} else if errcode == nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
 }
 
 func (this *SelfDrugApiController) GetStockList() {
@@ -649,27 +673,46 @@ func (this *SelfDrugApiController) GetSelfMedicalList() {
 	patient_id, _ := this.GetInt64("patient_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	//查询该机构是否开启自备药
-	medical, _ := service.GetSetSelfMedical(orgId)
-
-	//查询该机构下的药品库
-	drugName, _ := service.GetAllDrugName(orgId)
-	//开启
-	if medical.DrugStart == 1 {
-		list, err := service.GetSelfMedicalList(patient_id)
-		if err != nil {
-			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
-			return
-		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"medicalList": list,
-			"drugName":    drugName,
-		})
-	} else {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"drugName": drugName,
-		})
-	}
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(orgId)
+	privateDrugConfig, _ := service.GetDrugSetByUserOrgId(orgId)
+	drugList, _ := service.GetAllBaseDrugLibList(orgId)
+	privateDrugList, _ := service.GetPrivateDrugList(patient_id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"base_drug_config":    drugStockConfig,
+		"private_drug_config": privateDrugConfig,
+		"base_drug_list":      drugList,
+		"private_drug_list":   privateDrugList,
+	})
+	////查询是否开启药品库
+	//config, _ := service.GetDruckStockConfig(orgId)
+	//
+	//fmt.Println("--------------------------",config.IsOpen)
+	////开启
+	//if config.IsOpen == 1 {
+	//  //查询该机构下的药品库
+	//  drugName, _ := service.GetAllDrugName(orgId)
+	//
+	//  //查询该机构是否开启自备药
+	//  medical, _ := service.GetSetSelfMedical(orgId)
+	//  fmt.Println("medical+++++++++++++++++",medical.DrugStart)
+	//  //开启
+	//  if medical.DrugStart == 1 {
+	//    list, err := service.GetSelfMedicalList(patient_id)
+	//    if err != nil {
+	//      this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+	//      return
+	//    }
+	//    this.ServeSuccessJSON(map[string]interface{}{
+	//      "medicalList": list,
+	//      "drugName":    drugName,
+	//    })
+	//  } else {
+	//    this.ServeSuccessJSON(map[string]interface{}{
+	//      "drugName": drugName,
+	//    })
+	//  }
+	//}
 }
 
 func (this *SelfDrugApiController) GetDrugDescByDrugName() {
@@ -727,3 +770,46 @@ func (this *SelfDrugApiController) GetDrugSet() {
 	})
 
 }
+
+func (this *SelfDrugApiController) GetAllMedicalList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, err := service.GetAllMedicalList(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugName": list,
+	})
+}
+
+func (this *SelfDrugApiController) GetStandName() {
+
+	name := this.GetString("name")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	rullerlist, err := service.GetRulleName(orgId, name)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rullerlist": rullerlist,
+	})
+}
+
+func (this *SelfDrugApiController) GetRullerList() {
+	id, _ := this.GetInt64("id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	rullerList, err := service.GetRulleList(orgId, id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rullerlist": rullerList,
+	})
+}

models/self_drug_models.go

@@ -95,6 +95,7 @@ type XtStandName struct {
 	CreatedTime    int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime    int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	DrugName       string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugId         int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 }
 
 func (XtStandName) TableName() string {
@@ -133,6 +134,7 @@ type XtSelfMedical struct {
 	PrescribingNumber  float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
 	DeliveryWay        string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 	SingleDose         float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DrugId             int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 }
 
 func (XtSelfMedical) TableName() string {

service/self_drug_service.go

@@ -50,9 +50,15 @@ func GetRulleName(orgid int64, name string) (baseDrug []*models.XtBaseDrug, err
 	return baseDrug, err
 }
 
-func GetRulleList(orgid int64, name string) (rulleName []*models.XtStandName, err error) {
+func GetDrugId(id int64) (models.XtSelfMedical, error) {
+	medical := models.XtSelfMedical{}
+	err := XTReadDB().Model(&medical).Where("id = ? and status = 1", id).Find(&medical).Error
+	return medical, err
+}
 
-	err = XTReadDB().Model(&rulleName).Where("user_org_id = ? and drug_name = ? and status = 1", orgid, name).Find(&rulleName).Error
+func GetRulleList(orgid int64, id int64) (rulleName []*models.XtStandName, err error) {
+
+	err = XTReadDB().Model(&rulleName).Where("user_org_id = ? and drug_id = ? and status = 1", orgid, id).Find(&rulleName).Error
 	return rulleName, err
 }
 
@@ -74,21 +80,40 @@ func GetRullerNameDetail(id int64) (models.XtStandName, error) {
 	return rullerName, err
 }
 
+func GetIsExit(drugname string, drugspec string, id int64) (*models.XtStandName, error) {
+
+	standName := models.XtStandName{}
+	err := XTReadDB().Model(&standName).Where("drug_name = ? and drug_spec = ? and id <> ? and status = 1", drugname, drugspec, id).Find(&standName).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &standName, nil
+}
+
 func UpdatedRullerName(id int64, re *models.XtStandName) error {
 
-	err := XTWriteDB().Model(&re).Where("id=?", id).Update(map[string]interface{}{"drug_spec": re.DrugSpec, "min_unit": re.MinUnit, "price": re.Price, "drug_stock_limit": re.DrugStockLimit, "drug_name": re.DrugName, "drug_name_id": re.DrugNameId}).Error
+	err := XTWriteDB().Model(&re).Where("id=?", id).Update(map[string]interface{}{"drug_spec": re.DrugSpec, "min_unit": re.MinUnit, "price": re.Price, "drug_stock_limit": re.DrugStockLimit, "drug_name": re.DrugName, "drug_name_id": re.DrugNameId, "drug_id": re.DrugId}).Error
 	return err
 }
 
-func GetAllDrugNameList(orgid int64) (rullername []*models.XtStandName, err error) {
+//func GetAllDrugNameList(orgid int64) (rullername []*models.XtStandName, err error) {
+//
+//	err = XTReadDB().Group("drug_name").Model(&rullername).Where("user_org_id = ? and status = 1", orgid).Find(&rullername).Error
+//	return rullername, err
+//}
+
+func GetAllDrugNameList(orgid int64) (drugName []*models.XtDrugName, err error) {
 
-	err = XTReadDB().Group("drug_name").Model(&rullername).Where("user_org_id = ? and status = 1", orgid).Find(&rullername).Error
-	return rullername, err
+	err = XTReadDB().Model(&drugName).Where("user_org_id = ? and status = 1", orgid).Find(&drugName).Error
+	return drugName, err
 }
 
 func GetRullerListByDrugName(drugname string, orgid int64) (rullername []*models.XtStandName, err error) {
 
-	err = XTReadDB().Model(&rullername).Where("drug_name = ? and user_org_id = ? and status = 1", drugname, orgid).Find(&rullername).Error
+	err = XTReadDB().Model(&rullername).Where("drug_id = ? and user_org_id = ? and status = 1", drugname, orgid).Find(&rullername).Error
 	return rullername, err
 }
 
@@ -146,8 +171,8 @@ func GetStandDrugByDrugName(drugname string, orgid int64) (*models.XtStandName,
 	return &standname, nil
 }
 
-func DeleteDrugName(id int64) (models.XtSelfMedical, error) {
-	standName := models.XtSelfMedical{}
+func DeleteDrugName(id int64) (models.XtDrugName, error) {
+	standName := models.XtDrugName{}
 	err := XTWriteDB().Model(&standName).Where("id = ?", id).Update(map[string]interface{}{"status": 0}).Error
 	return standName, err
 }
@@ -176,6 +201,19 @@ func UpdateDrugSet(set *models.XtDrugSet, orgid int64) error {
 	return err
 }
 
+func GetMedicalsByName(orgid int64, drugname string) (*models.XtSelfMedical, error) {
+
+	medical := models.XtSelfMedical{}
+	err := XTReadDB().Model(&medical).Where("user_org_id = ? and drug_name = ? and status = 1", orgid, drugname).Find(&medical).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &medical, nil
+}
+
 func DeleteDrugStand(id int64) error {
 
 	standName := models.XtStandName{}
@@ -335,6 +373,13 @@ func GetDrugDataByPatientId(patientid int64) (selfMedical []*models.XtSelfMedica
 	return selfMedical, err
 }
 
+func GetDruckStockConfig(orgid int64) (models.XtDrugStockConfig, error) {
+
+	drugConfig := models.XtDrugStockConfig{}
+	err := XTReadDB().Model(&drugConfig).Where("org_id = ? and status = 1", orgid).Find(&drugConfig).Error
+	return drugConfig, err
+}
+
 func GetSetSelfMedical(orgid int64) (models.XtDrugSet, error) {
 	medical := models.XtDrugSet{}
 	err := XTReadDB().Model(&medical).Where("user_org_id = ? and status = 1", orgid).Find(&medical).Error
@@ -493,3 +538,9 @@ func GetPrivateDrugList(patient_id int64, org_id int64) (pds []*PrivateDrug, err
 	err = XTReadDB().Model(&PrivateDrug{}).Preload("PrivateDrug", "status = 1 AND user_org_id = ? AND patient_id = ? ", org_id, patient_id).Where("patient_id = ? and status = 1 AND user_org_id = ?", patient_id, org_id).Group("drug_name").Find(&pds).Error
 	return
 }
+
+func GetAllMedicalList(orgid int64) (list []*models.XtSelfMedical, err error) {
+
+	err = XTReadDB().Model(&list).Where("user_org_id = ? and status = 1", orgid).Group("drug_name").Find(&list).Error
+	return list, err
+}