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

controllers/data_api_controller.go

@@ -1015,8 +1015,7 @@ func (c *DataApiController) UpdateAdviceTemplate() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	id, _ := c.GetInt64("id", 0)
-	drug_id, _ := c.GetInt64("drug_id", 0)
-	fmt.Println("drug_id-------", drug_id)
+
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1070,7 +1069,8 @@ func (c *DataApiController) UpdateAdviceTemplate() {
 	template.FrequencyType = templatedata.FrequencyType
 	template.DayCount = templatedata.DayCount
 	template.WeekDays = templatedata.WeekDays
-	template.DrugId = drug_id
+	template.DrugId = template.DrugId
+	template.Way = template.Way
 
 	err = service.UpdateAdviceTemplate(template)
 	if err != nil {
@@ -1251,6 +1251,8 @@ func (c *DataApiController) CreateSubAdviceTemplate() {
 	execution_frequency := c.GetString("execution_frequency")
 	template_id, _ := c.GetInt64("template_id", 0)
 	parent_id, _ := c.GetInt64("parent_id", 0)
+	drug_id, _ := c.GetInt64("drug_id")
+	way, _ := c.GetInt64("way")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -1283,6 +1285,8 @@ func (c *DataApiController) CreateSubAdviceTemplate() {
 		ExecutionFrequency:    execution_frequency,
 		TemplateId:            template_id,
 		ParentId:              parent_id,
+		DrugId:                drug_id,
+		Way:                   way,
 	}
 
 	if template.AdviceName == "" {

controllers/dialysis_api_controller.go

@@ -1046,7 +1046,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	catheter_suture_other := c.GetString("catheter_suture_other")
 	edema := c.GetString("edema")
 	urine_volume, _ := c.GetFloat("urine_volume", 0)
-
+	special_treatment := c.GetString("special_treatment")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1102,6 +1102,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		CatheterSutureOther:            catheter_suture_other,
 		Edema:                          edema,
 		UrineVolume:                    urine_volume,
+		SpecialTreatment:               special_treatment,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -2571,6 +2572,11 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 			advice.DrugId = drug_id
 		}
 
+		if adviceNameM["drug_name_id"] != nil || reflect.TypeOf(adviceNameM["drug_name_id"]).String() == "float64" {
+			drug_name_id := int64(adviceNameM["drug_name_id"].(float64))
+			advice.DrugNameId = drug_name_id
+		}
+
 		if adviceNameM["week_day"] != nil && reflect.TypeOf(adviceNameM["week_day"]).String() == "string" {
 			week_day, _ := adviceNameM["week_day"].(string)
 			advice.WeekDay = week_day

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -149,7 +149,6 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 	fmt.Println(start_time)
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	orgId := this.GetMobileAdminUserInfo().Org.Id
-	//endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 23:59:59", loc)
 	keyword := this.GetString("keyword")
 	//获取透析参数数据
 	schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
@@ -158,37 +157,9 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 	var vlist []interface{}
 	var clist []interface{}
 	for _, item := range patient {
-
-		////查询当前日期的病人是否存在数据
-		//_, errcode := service.GetToDayDialysisPrescription(item.PatientId, orgId, startime.Unix())
-		//if errcode == gorm.ErrRecordNotFound {
-		//	//查询每个病人透析处方的最后一次数据
-		//	prescription, _ := service.GetLastDialysisPrescription(item.PatientId, orgId)
-		//	vlist = append(vlist, prescription)
-		//} else if errcode == nil {
-		//	//获取当前日期
-		//	prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgId, startime.Unix())
-		//	vlist = append(vlist, prescription)
-		//}
-
-		//查询每个病人当前日期是否存在数据
-		//_, errco := service.GetAotoMaticReduceByPatientId(item.PatientId, orgId, startime.Unix(), endtime.Unix())
-		//if errco == gorm.ErrRecordNotFound {
-		//	reduece, _ := service.GetMaticReduece(item.PatientId, orgId)
-		//	clist = append(clist, reduece)
-		//} else if errco == nil {
-		//	reduece, _ := service.GetMaticeReduceByPatientId(item.PatientId, orgId, startime.Unix(), endtime.Unix())
-		//	clist = append(clist, reduece)
-		//}
-
 		prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgId, startime.Unix())
 		vlist = append(vlist, prescription)
-		//reduece, _ := service.GetMaticeReduceByPatientId(item.PatientId, orgId, startime.Unix(), endtime.Unix())
-		//clist = append(clist, reduece)
 	}
-	//获取透析耗材数据
-	//consumables, err := service.GetDialysisConsumables(startime.Unix(), endtime.Unix(), orgId)
-
 	_, errors := service.FindStockOutByIsSys(orgId, 1, startime.Unix())
 
 	goodTypes, _ := service.FindAllGoodType(orgId) //two, err, i := service.PCGetDialysisGoodsTwo(orgId, startime.Unix(), scheduletype, partitiontype, page, limit, keyword)
@@ -196,7 +167,6 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 	if errors == gorm.ErrRecordNotFound {
 		dialysisGoods, _, total := service.PCGetDialysisGoodsTwo(orgId, startime.Unix(), scheduletype, partitiontype, page, limit, keyword)
 		for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
-
 			goodUser, _ := service.GetLastDialysisGoods(item.PatientId, orgId, startime.Unix())
 			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, orgId, startime.Unix())
 			item.LastAutomaticReduceDetail = goodUser

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)
@@ -1334,6 +1334,21 @@ func (c *PatientApiController) CreateGroupAdvice() {
 						child.PrescribingNumberUnit = childPrescribingNumberUnit
 					}
 
+					if childMap["drug_id"] != nil && reflect.TypeOf(childMap["drug_id"]).String() == "float64" {
+						drug_id := int64(childMap["drug_id"].(float64))
+						child.DrugId = drug_id
+					}
+
+					if childMap["way"] != nil && reflect.TypeOf(childMap["way"]).String() == "float64" {
+						way := int64(childMap["way"].(float64))
+						child.Way = way
+					}
+
+					if childMap["drug_name_id"] != nil && reflect.TypeOf(childMap["drug_name_id"]).String() == "float64" {
+						drug_name_id := int64(childMap["drug_name_id"].(float64))
+						child.DrugNameId = drug_name_id
+					}
+
 					child.DeliveryWay = advice.DeliveryWay
 					child.ExecutionFrequency = advice.ExecutionFrequency
 					advice.Children = append(advice.Children, &child)
@@ -1395,6 +1410,7 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	}
 
 	if advice.ParentId > 0 {
+
 		old, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, advice.ParentId)
 		if old.ID == 0 || old.PatientId != patient {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParentAdviceNotExist)
@@ -1414,6 +1430,7 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 		advice.DeliveryWay = old.DeliveryWay
 		advice.ExecutionFrequency = old.ExecutionFrequency
 		advice.GroupNo = old.GroupNo
+
 	}
 
 	advice.Status = 1
@@ -1578,9 +1595,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	advice.ExecutionTime = theTime.Unix()
 	// advice.Checker = checker
 
-	//adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
-	//fmt.Println("adviceName", adviceName.Way)
-
 	//处理出库相关逻辑
 
 	//1.判断是否启用药品管理和自备药出库功能
@@ -1590,49 +1604,134 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	//自备药信息
 	privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
-	fmt.Println("drugStockConfig9999999999999", drugStockConfig.IsOpen)
+	fmt.Println("", 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 = "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 {
+		//查询已经执行的医嘱
+		advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
+		for _, item := range advices {
+			fmt.Println("非自备要22222")
+			if item.Way == 1 {
+				out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
+				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 = "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:        item.RecordDate,
+						Dealer:                  0,
+						Manufacturer:            0,
+						Type:                    1,
+						IsSys:                   1,
+					}
+
+					err := service.AddSigleDrugWarehouseOut(&warehouseOut)
+					if err != nil {
+						utils.TraceLog("创建出库单失败 err = %v", err)
+					} else {
+						if item.Way == 1 {
+							if item.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:           item.RecordDate,
+									DrugId:                  item.DrugId,
+								}
+								prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								warehouseOutInfo.Count = count
+								stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+								warehouseOutInfo.Price = stockInInfo.Price
+								err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+								if err == nil {
+									details := &models.DrugAutomaticReduceDetail{
+										WarehouseOutId:          warehouseOutInfo.ID,
+										WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+										PatientId:               item.PatientId,
+										Ctime:                   time.Now().Unix(),
+										Mtime:                   time.Now().Unix(),
+										Status:                  1,
+										RecordTime:              item.RecordDate,
+										OrgId:                   adminUserInfo.CurrentOrgId,
+										DrugId:                  item.DrugId,
+										Count:                   count,
+									}
+									service.AddSigleDrugAutoReduceRecordInfo(details)
+									if err != nil {
+										utils.TraceLog("创建出库单失败 err = %v", err)
+									} else {
+										if item.Way == 1 {
+											if item.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:           item.RecordDate,
+													DrugId:                  item.DrugId,
+												}
+												prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+												count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+												warehouseOutInfo.Count = count
+												stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+												warehouseOutInfo.Price = stockInInfo.Price
+												err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+												if err == nil {
+													details := &models.DrugAutomaticReduceDetail{
+														WarehouseOutId:          warehouseOutInfo.ID,
+														WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+														PatientId:               item.PatientId,
+														Ctime:                   time.Now().Unix(),
+														Mtime:                   time.Now().Unix(),
+														Status:                  1,
+														RecordTime:              item.RecordDate,
+														OrgId:                   adminUserInfo.CurrentOrgId,
+														DrugId:                  item.DrugId,
+														Count:                   count,
+													}
+													service.AddSigleDrugAutoReduceRecordInfo(details)
+												}
+											}
+										}
+									}
+
+								}
+							}
+						}
+					}
+				} else if err == nil {
+					if item.Way == 1 {
+						outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
+						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.DrugWarehouseOutInfo{
-								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-								WarehouseOutId:          warehouseOut.ID,
+								WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+								WarehouseOutId:          out.ID,
 								Status:                  1,
 								Ctime:                   time.Now().Unix(),
 								Remark:                  "",
@@ -1641,151 +1740,113 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								Manufacturer:            0,
 								Dealer:                  0,
 								IsSys:                   1,
-								SysRecordTime:           adviceName.RecordDate,
-								DrugId:                  adviceName.DrugId,
+								SysRecordTime:           item.RecordDate,
 							}
-							prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+
+							stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+							warehouseOutInfo.Price = stockInInfo.Price
+							warehouseOutInfo.DrugId = item.DrugId
+							prescribingNumber := strconv.FormatFloat(math.Abs(item.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,
+									PatientId:               item.PatientId,
 									Ctime:                   time.Now().Unix(),
 									Mtime:                   time.Now().Unix(),
 									Status:                  1,
-									RecordTime:              adviceName.RecordDate,
+									RecordTime:              item.RecordDate,
 									OrgId:                   adminUserInfo.CurrentOrgId,
-									DrugId:                  adviceName.DrugId,
+									DrugId:                  item.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,
+						} else if err == nil { //记录存在，则将增加数量
+							if outInfo.ID > 0 {
+								prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, 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,
+							count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
+							if count == 0 {
+								prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								details := &models.DrugAutomaticReduceDetail{
+									WarehouseOutId:          outInfo.ID,
+									WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+									PatientId:               item.PatientId,
+									Ctime:                   time.Now().Unix(),
+									Mtime:                   time.Now().Unix(),
+									Status:                  1,
+									RecordTime:              item.RecordDate,
+									OrgId:                   adminUserInfo.CurrentOrgId,
+									DrugId:                  item.DrugId,
+									Count:                   count,
+								}
+								service.AddSigleDrugAutoReduceRecordInfo(details)
+							} else if count == 1 {
+								prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
 							}
-							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)
-						}
 
+						}
 					}
 				}
-
 			}
 		}
 	}
 
-	//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,
+	advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
+	for _, item := range advices {
+		fmt.Println("33333", item.ExecutionState)
+		fmt.Println("医嘱名称", item.AdviceName)
+		fmt.Println("item", item.Way)
+		if item.Way == 2 {
+			if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
+
+				//adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+
+				if item.ExecutionState == 1 {
+					prescribingNumber := strconv.FormatFloat(math.Abs(item.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:       item.AdviceName,
+						DrugNameId:     item.DrugId,
+						DrugSpec:       item.AdviceDesc,
+						OutstoreNumber: count,
+						AdminUserId:    adminUserInfo.AdminUser.Id,
+						StorckTime:     item.RecordDate,
+						UserOrgId:      adminUserInfo.CurrentOrgId,
+						CreatedTime:    time.Now().Unix(),
+						Status:         1,
+						PatientId:      item.PatientId,
+						ExitMode:       2,
+						MedicId:        item.DrugId,
+						StockOutNumber: warehousing_out_order,
+					}
+					service.CreateOutStock(&outStock)
 				}
-				service.CreateOutStock(&outStock)
 			}
 		}
+
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -1794,166 +1855,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	})
 	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() {
@@ -2770,6 +2671,21 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		advice.Remark = remark
 	}
 
+	if dataBody["drug_id"] != nil && reflect.TypeOf(dataBody["drug_id"]).String() == "float64" {
+		drug_id, _ := dataBody["drug_id"].(float64)
+		advice.DrugId = int64(drug_id)
+	}
+
+	if dataBody["drug_name_id"] != nil && reflect.TypeOf(dataBody["drug_name_id"]).String() == "float64" {
+		drug_name_id, _ := dataBody["drug_name_id"].(float64)
+		advice.DrugNameId = int64(drug_name_id)
+	}
+
+	if dataBody["way"] != nil && reflect.TypeOf(dataBody["way"]).String() == "float64" {
+		way, _ := dataBody["way"].(float64)
+		advice.Way = int64(way)
+	}
+
 	return
 }
 

controllers/self_drug_api_congtroller.go

@@ -49,6 +49,8 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getstandname", &SelfDrugApiController{}, "Get:GetStandName")
 	beego.Router("/api/drug/getrullerlist", &SelfDrugApiController{}, "Get:GetRullerList")
 	beego.Router("/api/drug/deleteDrugNamebyid", &SelfDrugApiController{}, "Get:DeleteDrugNameById")
+	beego.Router("/api/drug/getpatientdetail", &SelfDrugApiController{}, "Get:GetPatientDetail")
+	//beego.Router("/api/drug/getpatientdetail",&SelfDrugApiController{},"Get:ToPatientDetail")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -264,12 +266,15 @@ func (this *SelfDrugApiController) GetAllDrugNameList() {
 	orgId := adminUserInfo.CurrentOrgId
 	rullerName, err := service.GetAllDrugNameList(orgId)
 
+	list, err := service.GetMedicalDrugNameList(orgId)
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"rullerName": rullerName,
+		"list":       list,
 	})
 }
 
@@ -831,9 +836,7 @@ func (this *SelfDrugApiController) GetRullerList() {
 func (this *SelfDrugApiController) DeleteDrugNameById() {
 
 	id, _ := this.GetInt64("id")
-	fmt.Println("id------------------------------------", id)
 	drug_name := this.GetString("drug_name")
-	fmt.Println("drug_name2222222222222222222222222", drug_name)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 
@@ -849,3 +852,32 @@ func (this *SelfDrugApiController) DeleteDrugNameById() {
 		return
 	}
 }
+
+func (this *SelfDrugApiController) GetPatientDetail() {
+
+	id, _ := this.GetInt64("id")
+	adminUserInfo := this.GetAdminUserInfo()
+	patientDetail, err := service.GetPatientDetail(id, adminUserInfo.CurrentOrgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientDetail": patientDetail,
+	})
+}
+
+//func (this *SelfDrugApiController) ToPatientDetail()  {
+//
+//  keyword := this.GetString("keyword")
+//  adminUser := this.GetAdminUserInfo()
+//  orgId := adminUser.CurrentOrgId
+//  patient, err := service.ToSeachPatient(keyword, orgId)
+//  if err != nil {
+//    this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+//    return
+//  }
+//  this.ServeSuccessJSON(map[string]interface{}{
+//    "patient": patient,
+//  })
+//}

controllers/sign_weigh_api_controller.go

@@ -502,7 +502,7 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 	weight_before, _ := c.GetFloat("weight_before", 0)
 	dry_weight, _ := c.GetFloat("dry_weight", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
-	fmt.Println("温度========================", temperature)
+	fmt.Println("温度", temperature)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
@@ -521,14 +521,12 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 	predialysisevaluation.Status = 1
 
 	predialysis, errcode := service.GetDislysisBerfore(adminUserInfo.CurrentOrgId, dateTimeStam, patientID)
-	fmt.Println("sigh是什么东西", predialysis)
-	fmt.Println("错误装太:", errcode)
+	fmt.Println("sigh", predialysis)
+	fmt.Println("错误:", errcode)
 	if errcode == gorm.ErrRecordNotFound {
-		fmt.Println("aaaaa")
 		service.SaveDislysisiBefore(&predialysisevaluation)
 	} else if errcode == nil {
-		fmt.Println("bbbbbbbbb")
-		fmt.Println("predialysisevaluation", predialysisevaluation)
+
 		service.UpdataDislysisiBefore(&predialysisevaluation, patientID, adminUserInfo.CurrentOrgId, dateTimeStam)
 	} else {
 		service.UpdataDislysisiBefore(&predialysisevaluation, patientID, adminUserInfo.CurrentOrgId, dateTimeStam)
@@ -541,8 +539,6 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 	pulsefrequencyafter, _ := c.GetFloat("pulse_frequencyafter", 0)
 	systolicbloodpressureafter, _ := c.GetFloat("systolic_blood_pressureafter", 0)
 	diastolicbloodpressureafter, _ := c.GetFloat("diastolic_blood_pressureafter", 0)
-	fmt.Println("aaaa")
-	fmt.Println(weight_after, temperatureafter, pulsefrequencyafter, systolicbloodpressureafter, diastolicbloodpressureafter)
 
 	var assessmentafterdislysis models.AssessmentAfterDislysis
 	assessmentafterdislysis.PatientId = patientID
@@ -556,17 +552,15 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 	assessmentafterdislysis.CreatedTime = time.Now().Unix()
 	assessmentafterdislysis.Status = 1
 	dislysis, errcoder := service.GetAssessmentaafterdislysis(adminUserInfo.CurrentOrgId, dateTimeStam, patientID)
-	fmt.Println("sigh是什么东西", dislysis)
+	fmt.Println("sigh", dislysis)
 	fmt.Println("错误装太:", errcoder)
 
 	if errcoder == gorm.ErrRecordNotFound {
-		fmt.Println("oooooooo")
 		service.SaveAssessmentafter(&assessmentafterdislysis)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"signs": predialysisevaluation,
 		})
 	} else if errcoder == nil {
-		fmt.Println("ffffffffffffffff")
 		service.UpdataAssessment(&assessmentafterdislysis, patientID, adminUserInfo.CurrentOrgId, dateTimeStam)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"signs": predialysisevaluation,

models/dialysis.go

@@ -274,6 +274,7 @@ type PredialysisEvaluation struct {
 	CatheterSutureOther            string  `gorm:"column:catheter_suture_other" json:"catheter_suture_other" form:"catheter_suture_other"`
 	UrineVolume                    float64 `gorm:"column:urine_volume" json:"urine_volume" form:"urine_volume"`
 	Edema                          string  `gorm:"column:edema" json:"edema" form:"edema"`
+	SpecialTreatment               string  `gorm:"column:special_treatment" json:"special_treatment" form:"special_treatment"`
 }
 
 func (PredialysisEvaluation) TableName() string {

models/patient_models.go

@@ -231,12 +231,13 @@ func (DialysisPrescription) TableName() string {
 }
 
 type DialysisPrescriptionList struct {
-	ID         int64 `gorm:"column:id" json:"id"`
-	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId  int64 `gorm:"column:patient_id" json:"patient_id"`
-	RecordDate int64 `gorm:"column:record_date" json:"record_date"`
-	RecordId   int64 `gorm:"column:record_id" json:"record_id"`
-	Creater    int64 `gorm:"column:creater" json:"creater"`
+	ID                         int64  `gorm:"column:id" json:"id"`
+	UserOrgId                  int64  `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                  int64  `gorm:"column:patient_id" json:"patient_id"`
+	RecordDate                 int64  `gorm:"column:record_date" json:"record_date"`
+	RecordId                   int64  `gorm:"column:record_id" json:"record_id"`
+	Creater                    int64  `gorm:"column:creater" json:"creater"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
 }
 
 func (DialysisPrescriptionList) TableName() string {

models/self_drug_models.go

@@ -69,6 +69,21 @@ func (XtBaseDrug) TableName() string {
 	return "xt_base_drug"
 }
 
+type DrugName struct {
+	ID          int64         `gorm:"column:id" json:"id" form:"id"`
+	DrugName    string        `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	UserOrgId   int64         `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status      int64         `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64         `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64         `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	DrugId      int64         `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	XtStandName []XtStandName `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"XtStandName"`
+}
+
+func (DrugName) TableName() string {
+	return "xt_drug_name"
+}
+
 type XtDrugName struct {
 	ID          int64  `gorm:"column:id" json:"id" form:"id"`
 	DrugName    string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`

service/dialysis_parameter_service.go

@@ -383,13 +383,12 @@ func PCGetDialysisGoodsTwo(orgID int64, scheduleDate int64, schedule_type int64,
 	var total int64
 
 	db := readDb.
-		Model(&models.Schedule{}).
-		Select("patient_id,mode_id").
+		Model(&models.Schedule{}).Select("patient_id,mode_id").
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		Preload("DialysisBeforePrepare", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?   ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ? AND count > 0 ", orgID, scheduleDate)
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ? AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND record_time = ?  AND count > 0", orgID, scheduleDate)

service/dialysis_service.go

@@ -1103,3 +1103,9 @@ func FindDialysisBeforePrepare(patient_id int64, good_id int64, good_type_id int
 	return
 
 }
+
+func GetExecutionDoctors(orgid int64, patientid int64, id int64) (doctorAdvice []*models.DoctorAdvice, err error) {
+
+	err = readDb.Model(&doctorAdvice).Where("user_org_id = ? and patient_id = ? AND (id = ? Or parent_id=?) and status = 1", orgid, patientid, id, id).Find(&doctorAdvice).Error
+	return doctorAdvice, err
+}

service/mobile_dialysis_service.go

@@ -694,19 +694,20 @@ func GetMonitor(orgID int64, patientID int64, id int64) (*models.MonitoringRecor
 }
 
 type MScheduleDoctorAdviceVM struct {
-	ID              int64               `gorm:"column:id" json:"id"`
-	UserOrgId       int64               `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId     int64               `gorm:"column:partition_id" json:"partition_id"`
-	BedId           int64               `gorm:"column:bed_id" json:"bed_id"`
-	PatientId       int64               `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate    int64               `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType    int64               `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId          int64               `gorm:"column:mode_id" json:"mode_id"`
-	Status          int64               `gorm:"column:status" json:"status"`
-	DialysisOrder   *MDialysisOrderVM   `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
-	SchedualPatient *MSchedualPatientVM `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber    *MDeviceNumberVM    `gorm:"ForeignKey:BedId" json:"device_number"`
-	DoctorAdvices   []*MDoctorAdviceVM  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	ID              int64                            `gorm:"column:id" json:"id"`
+	UserOrgId       int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId     int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId           int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId       int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate    int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType    int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId          int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status          int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder   *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
+	SchedualPatient *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber    *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	DoctorAdvices   []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	Prescription    *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 }
 
 func (MScheduleDoctorAdviceVM) TableName() string {
@@ -835,6 +836,7 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 		}).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("DoctorAdvices", adviceCondition...).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {

service/self_drug_service.go

@@ -529,6 +529,7 @@ type Drugs struct {
 	PrescribingNumber  float64  `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
 	Status             int64    `gorm:"column:status" json:"status" form:"status"`
 	OrgId              int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	MinUnit            string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	Drugs              []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
 }
 
@@ -629,3 +630,20 @@ func UpdatedDoctorAdviceTemplate(id int64, orgid int64, template *models.DoctorA
 	err := XTWriteDB().Model(&template).Where("drug_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"advice_name": template.AdviceName, "advice_desc": template.AdviceDesc, "single_dose": template.SingleDose, "single_dose_unit": template.SingleDoseUnit, "delivery_way": template.DeliveryWay, "execution_frequency": template.ExecutionFrequency}).Error
 	return err
 }
+
+func ToSeachPatient(keyword string, orgid int64) (patients []*models.Patients, err error) {
+
+	likeKey := "%" + keyword + "%"
+	err = XTReadDB().Model(&patients).Where("name like ? and user_org_id = ? and status = 1", likeKey, orgid).Find(&patients).Error
+	return patients, err
+}
+
+func GetMedicalDrugNameList(orgid int64) (drugName []*models.DrugName, err error) {
+
+	db := XTReadDB().Model(&drugName).Where("user_org_id = ? and status = 1", orgid)
+
+	err = db.Preload("XtStandName", "status =1 and user_org_id = ?", orgid).Find(&drugName).Error
+
+	return drugName, err
+
+}