11月8日库存管理

controllers/patient_api_controller.go

@@ -6,6 +6,8 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"github.com/jinzhu/gorm"
+
 	//"github.com/jinzhu/gorm"
 	"math"
 	"math/rand"
@@ -1881,9 +1883,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			theTimes := theTime.Format("2006-01-02")
 
-			fmt.Println("theTIME", theTime)
 			keyFour := "scheduals_" + theTimes + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
-			fmt.Println("keyFour323223323232323232", keyFour)
+
 			redis.Set(keyFour, "", time.Second)
 			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
 			redis.Set(keyFive, "", time.Second)
@@ -1904,7 +1905,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			fmt.Println("theTIME", theTime)
 			keyFour := "scheduals_" + theTimes + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
-			fmt.Println("keyFour323223323232323232", keyFour)
+
 			redis.Set(keyFour, "", time.Second)
 			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
 			redis.Set(keyFive, "", time.Second)
@@ -1927,7 +1928,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//药品管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
-		fmt.Println("000000000000000000000000000000000000", drugStockConfig.IsOpen)
+
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
 			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
@@ -1947,9 +1948,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					total = list.Count*medical.MinNumber + list.StockMinNumber
 					prescribing_number_total = count * medical.MinNumber
 				}
-				fmt.Println("单位1", medical.MinUnit)
-				fmt.Println("d单位23", advice.PrescribingNumberUnit)
-				fmt.Println("hhhhhhh", list.Count)
+				//fmt.Println("单位1", medical.MinUnit)
+				//fmt.Println("d单位23", advice.PrescribingNumberUnit)
+				//fmt.Println("hhhhhhh", list.Count)
 				if medical.MinUnit == advice.PrescribingNumberUnit {
 					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
@@ -1959,8 +1960,48 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				}
 
-				fmt.Println("数量一", prescribing_number_total)
-				fmt.Println("数量二", total)
+				//fmt.Println("要出库的数量", prescribing_number_total)
+				//fmt.Println("库存", total)
+
+				//查询该药品的医嘱记录
+				//advicelist, _ := service.GetHisAdviceListByDrugId(advice.DrugId, advice.PatientId, advice.AdviceDate)
+				//
+				//if(advicelist.ID > 0){
+				//  //获取上一次的出库记录
+				//  record, _ := service.GetDrugAutoReduceRecordOne(advice.DrugId, advice.PatientId, advice.AdviceDate)
+				//  var out_count int64
+				//  for _, res := range record {
+				//   if(res.CountUnit == medical.MaxUnit){
+				//      res.Count = res.Count * medical.MinNumber
+				//   }
+				//   if(res.CountUnit == medical.MinUnit){
+				//     res.Count = res.Count
+				//   }
+				//    out_count += res.Count
+				//  }
+				//  fmt.Println("上次",out_count)
+				//  fmt.Println("这次出库",prescribing_number_total)
+				//  fmt.Println("总库存",total)
+				//  fmt.Println("差2332332323232232323",prescribing_number_total - out_count)
+				//  //判断库存
+				//  if((prescribing_number_total - out_count) > 0){
+				//
+				//     if((prescribing_number_total - out_count) > total){
+				//       c.ServeSuccessJSON(map[string]interface{}{
+				//         "msg":    "2",
+				//         "advice": advice,
+				//       })
+				//       return
+				//     }else{
+				//       service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+				//       break
+				//     }
+				//  }else{
+				//    service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+				//    break
+				//  }
+				//
+				//}
 
 				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -1985,6 +2026,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					})
 					return
 				}
+
 			}
 
 		}
@@ -4047,18 +4089,34 @@ func (c *PatientApiController) GetRemindPatientList() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
 	adminUserInfo := c.GetAdminUserInfo()
-	total, patients, err := service.GetAllWaitRemindPatient(adminUserInfo.CurrentOrgId, page, limit)
+	total, patients, _ := service.GetAllWaitRemindPatient(adminUserInfo.CurrentOrgId, page, limit)
 
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	_, errcode := service.GetOrgFollowIsExist(c.GetAdminUserInfo().CurrentOrgId)
+	if errcode == gorm.ErrRecordNotFound {
+		information, err := service.GetAdminUserRoleInformation(0)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"total":       total,
+			"patients":    patients,
+			"information": information,
+		})
+	} else if errcode == nil {
+		information, err := service.GetAdminUserRoleInformation(0)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"total":       total,
+			"patients":    patients,
+			"information": information,
+		})
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"total":    total,
-		"patients": patients,
-	})
-
 }
 
 func (c *PatientApiController) PostIsOpenRemind() {