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

controllers/his_api_controller.go

@@ -540,14 +540,16 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								if prescribingNumberUnit == drug.MinUnit {
 									if prescribing_number > drug.Total {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 								} else {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if num > drug.Total {
-											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 											return
 										}
 									}
@@ -591,7 +593,9 @@ func (c *HisApiController) CreateHisPrescription() {
 										return
 									}
 									if totals > good.Total {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
+
+										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 
@@ -1860,6 +1864,11 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 		}
 	}
 
+	if json["groupno"] != nil || reflect.TypeOf(json["groupno"]).String() == "float64" {
+		groupno := int64(json["groupno"].(float64))
+		advice.Groupno = groupno
+	}
+
 	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
 		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
 		advice.PrescribingNumber = prescribingNumber
@@ -1884,6 +1893,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.Checker = hisAdvice.Checker
 					advice.CheckState = hisAdvice.CheckState
 					advice.StartTime = hisAdvice.StartTime
+					//advice.Groupno = hisAdvice.Groupno
 
 				}
 			}

controllers/mobile_api_controllers/advice_api_controller.go

@@ -1,7 +0,0 @@
-package mobile_api_controllers
-
-type AdviceAPIController struct {
-	MobileBaseAPIAuthController
-}
-
-// /m/api/dialysis/advices [get]

controllers/mobile_api_controllers/patient_api_controller.go

@@ -849,6 +849,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		})
 		return
 	} else if origin == 2 {
+		var ids []string
+		advice_ids := c.GetString("advice_id")
+		ids = strings.Split(advice_ids, ",")
 
 		if len(execution_time) <= 0 {
 			utils.ErrorLog("execution_time")
@@ -865,107 +868,117 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 		adminInfo := c.GetMobileAdminUserInfo()
 		creater := c.GetMobileAdminUserInfo().AdminUser.Id
-		advice_id, _ := c.GetInt64("advice_id")
-		advices, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
-		if advices.ExecutionState == 1 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
-			return
-		}
-		if advices.Checker >= 0 && advices.Checker == adminInfo.AdminUser.Id {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
-			return
-		}
-		if advices.StartTime > theTime.Unix() {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
-			return
+		advices, _ := service.FindHisDoctorAdviceByIds(adminInfo.Org.Id, ids)
+		var err error
+		for _, item := range advices {
+			if item.ExecutionState == 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
+				return
+			}
+
+			if item.Checker >= 0 && item.Checker == adminInfo.AdminUser.Id {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
+				return
+			}
+
+			if item.StartTime > theTime.Unix() {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
+				return
+			}
+
+			item.ExecutionState = 1
+			item.ExecutionStaff = adminInfo.AdminUser.Id
+			item.ExecutionTime = theTime.Unix()
+			err = service.SaveHisDoctorAdvice(item)
 		}
-		advices.ExecutionState = 1
-		advices.ExecutionStaff = adminInfo.AdminUser.Id
-		advices.ExecutionTime = theTime.Unix()
-		err := service.SaveHisDoctorAdvice(&advices)
-		var ids []string
-		ids = append(ids, strconv.FormatInt(advices.ID, 10))
+
 		if err == nil {
+
 			//药品管理信息
 			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 			if drugStockConfig.IsOpen == 1 {
-				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
-				//查询该药品是否有库存
-				//  list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
-				//  prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-				//  count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				//  if list.Count == 0 {
-				//    c.ServeSuccessJSON(map[string]interface{}{
-				//      "msg":    "1",
-				//      "advice": advice,
-				//      "ids":    ids,
-				//    })
-				//    return
-				//  }
-				//  if count > list.Count {
-				//    c.ServeSuccessJSON(map[string]interface{}{
-				//      "msg":    "2",
-				//      "advice": advice,
-				//      "ids":    ids,
-				//    })
-				//    return
-				//}
-				var total int64
-				var prescribing_number_total int64
-				//查询该药品是否有库存
-				list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
-
-				//查询改药品信息
-				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
-				//判断单位是否相等
-				if medical.MaxUnit == advice.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					//转化为最小单位
-					total = list.Count * medical.MinNumber
-					prescribing_number_total = count * medical.MinNumber
-				}
-				if medical.MinUnit == advice.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-					prescribing_number_total = count
-				}
+				for _, item := range advices {
+
+					advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+					//查询该药品是否有库存
+					//  list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
+					//  prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+					//  count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					//  if list.Count == 0 {
+					//    c.ServeSuccessJSON(map[string]interface{}{
+					//      "msg":    "1",
+					//      "advice": advice,
+					//      "ids":    ids,
+					//    })
+					//    return
+					//  }
+					//  if count > list.Count {
+					//    c.ServeSuccessJSON(map[string]interface{}{
+					//      "msg":    "2",
+					//      "advice": advice,
+					//      "ids":    ids,
+					//    })
+					//    return
+					//}
+					var total int64
+					var prescribing_number_total int64
+					//查询该药品是否有库存
+					list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
+
+					//查询改药品信息
+					medical, _ := service.GetBaseDrugMedical(advice.DrugId)
+					//判断单位是否相等
+					if medical.MaxUnit == advice.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						total = list.Count * medical.MinNumber
+						prescribing_number_total = count * medical.MinNumber
+					}
+					if medical.MinUnit == advice.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count
+					}
 
-				fmt.Println("数量一", prescribing_number_total)
-				fmt.Println("数量二", total)
+					fmt.Println("数量一", prescribing_number_total)
+					fmt.Println("数量二", total)
 
-				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "3",
-						"advice": advice,
-						"ids":    ids,
-					})
-					return
-				}
-				if prescribing_number_total > total {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "2",
-						"advice": advice,
-						"ids":    ids,
-					})
-					return
-				}
-				if prescribing_number_total <= total {
-					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "1",
-						"advice": advice,
-						"ids":    ids,
-					})
-					return
+					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "3",
+							"advice": advice,
+							"ids":    ids,
+						})
+						return
+					}
+					if prescribing_number_total > total {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "2",
+							"advice": advice,
+							"ids":    ids,
+						})
+						return
+					}
+					if prescribing_number_total <= total {
+						service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "1",
+							"advice": advice,
+							"ids":    ids,
+						})
+						return
+					}
 				}
 			}
+
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "ok",
 				"advice": advices,
 				"ids":    ids,
 			})
+
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		}
@@ -1176,41 +1189,37 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			"advice": advice,
 		})
 	} else if origin == 2 {
-		fmt.Println("金鳌地方 大房贷首付地方阿凡达阿方")
 		adminInfo := c.GetMobileAdminUserInfo()
-		advice_id, _ := c.GetInt64("advice_id")
-		advices, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
-
-		if advices.CheckState == 1 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
-			return
-		}
-		if advices.ExecutionStaff >= 0 && advices.ExecutionStaff == adminInfo.AdminUser.Id {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
-			return
+		var ids []string
+		advice_ids := c.GetString("advice_id")
+		ids = strings.Split(advice_ids, ",")
+		advices, _ := service.FindHisDoctorAdviceByIds(adminInfo.Org.Id, ids)
+		var err error
+		for _, item := range advices {
+			if item.CheckState == 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
+				return
+			}
+			if item.ExecutionStaff >= 0 && item.ExecutionStaff == adminInfo.AdminUser.Id {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
+				return
+			}
+			item.Checker = adminInfo.AdminUser.Id
+			item.CheckTime = time.Now().Unix()
+			item.CheckState = 1
+			err = service.SaveHisDoctorAdvice(item)
 		}
-
-		advices.Checker = adminInfo.AdminUser.Id
-		advices.CheckTime = time.Now().Unix()
-		advices.CheckState = 1
-
-		err := service.SaveHisDoctorAdvice(&advices)
-
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "ok",
 				"advice": advices,
 			})
-
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
-
 		}
-
 	}
 	return
-
 }
 
 func (c *PatientApiController) EditAssessmentBeforeDislysis() {

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -324,14 +324,17 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 
 								if prescribingNumberUnit == drug.MinUnit {
 									if prescribing_number > drug.Total {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 								} else {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if num > drug.Total {
-											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+
+											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 											return
 										}
 									}
@@ -374,7 +377,9 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 										return
 									}
 									if totals > good.Total {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
+
+										//c.ServeFailJSONWithSGJErro，rCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 
@@ -706,6 +711,11 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 			advice.DrugId = drug_id
 		}
 	}
+	if json["groupno"] != nil || reflect.TypeOf(json["groupno"]).String() == "float64" {
+		groupno := int64(json["groupno"].(float64))
+		advice.Groupno = groupno
+	}
+
 	if json["advice_id"] != nil && reflect.TypeOf(json["advice_id"]).String() == "float64" {
 		advice_id := int64(json["advice_id"].(float64))
 		advice.ID = advice_id
@@ -719,6 +729,7 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 					advice.CheckTime = hisAdvice.CheckTime
 					advice.Checker = hisAdvice.Checker
 					advice.CheckState = hisAdvice.CheckState
+					//advice.Groupno = hisAdvice.Groupno
 					//advice.StartTime = hisAdvice.StartTime
 
 				}

controllers/new_mobile_api_controllers/new_self_drug_api_router.go

@@ -1,9 +0,0 @@
-package new_mobile_api_controllers
-
-import "github.com/astaxie/beego"
-
-func NewDrugApiControllersRegisterRouters() {
-
-	beego.Router("/m/api/drug/getselfmedicallist", &NewDrugApiController{}, "Get:GetSelfMedicalList")
-	beego.Router("/m/api/getdrugdescbydrugname", &NewDrugApiController{}, "Get:GetDrugDescByDrugName")
-}

controllers/schedule_api_controller.go

@@ -2363,7 +2363,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	if week_type > 0 {
-		list, err := service.GetWeekDayScheduleById(orgId, targetDay.Unix(), week_time)
+		list, err := service.GetWeekDayScheduleById(orgId, targetDay.Unix(), week_time, zone)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

enums/error_code.go

@@ -489,6 +489,13 @@ func MakeFailResponseJSON(errMsg string, errCode int) map[string]interface{} {
 	return json
 }
 
+func MakeDynamicFailResponseJSON(errMsg string) map[string]interface{} {
+	json := make(map[string]interface{})
+	json["msg"] = errMsg
+	json["state"] = 0
+	return json
+}
+
 func MakeFailResponseJSONWithSGJError(err *SGJError) map[string]interface{} {
 	if err == nil {
 		utils.WarningLog("MakeFailResponseJSONWithSGJError 参数err 不能为空")

routers/router.go

@@ -2,7 +2,6 @@ package routers
 
 import (
 	"XT_New/controllers"
-	//admin_api "XT_New/controllers/admin_api_controllers"
 	m_api "XT_New/controllers/mobile_api_controllers"
 	new_m_api "XT_New/controllers/new_mobile_api_controllers"
 	"github.com/astaxie/beego"

service/dialysis_service.go

@@ -1150,6 +1150,11 @@ func FindHisDoctorAdviceById(orgID int64, id int64) (advice models.HisDoctorAdvi
 	return
 }
 
+func FindHisDoctorAdviceByIds(orgID int64, ids []string) (advice []*models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id=? and status=1 and id in (?)", orgID, ids).Find(&advice).Error
+	return
+}
+
 func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 	err = writeDb.Save(&advice).Error
 	return

service/schedule_service.go

@@ -564,7 +564,7 @@ func GetWeekDaySchedule(orgID int64, scheduleDate int64, scheduleDates *time.Tim
 	return
 }
 
-func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64) (list []*models.VmSchedulesRemind, err error) {
+func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64, zone int64) (list []*models.VmSchedulesRemind, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
@@ -576,17 +576,20 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64)
 	if scheduleType > 0 {
 		db = db.Where("x.schedule_type = ?", scheduleType)
 	}
+	if zone > 0 {
+		db = db.Where("x.partition_id = ?", zone)
+	}
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id asc")
+		return db.Where("status =1").Order("id desc")
 	}).Find(&list).Error
 
 	return list, err
 }
 
-func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone int64) (list []*models.VmSchedules, err error) {
+func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone int64) (list []*models.VmSchedulesRemind, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
@@ -599,12 +602,14 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		db = db.Where("x.schedule_type = ?", scheduleType)
 	}
 	if zone > 0 {
-		db = db.Where("s.partition_id = ?", zone)
+		db = db.Where("x.partition_id = ?", zone)
 	}
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", "user_org_id =? and status = 1", orgid).Find(&list).Error
+	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Order("id desc")
+	}).Find(&list).Error
 
 	return list, err
 }