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

controllers/base_api_controller.go

@@ -71,9 +71,9 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 796
+		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 796 //4，809
+		userAdmin.Id = 16919 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10344 //机构id 10344
+		subscibe.OrgId = 10579 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,8 +91,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244  //4
+		adminUserInfo.CurrentOrgId = 10579 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 16919 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -316,9 +316,9 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 796
+		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 796 //4，809
+		userAdmin.Id = 16919 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10344 //机构id小英10344或4
+		subscibe.OrgId = 10579 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,8 +336,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244  //4
+		adminUserInfo.CurrentOrgId = 10579 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 16919 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -135,6 +135,12 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/getmonitorloglist", &DialysisApiController{}, "Get:GetMonitorLogList")
 
 	beego.Router("/api/patient/getafterloglist", &DialysisApiController{}, "Get:GetAfterLogList")
+
+	beego.Router("/api/patient/savegathersetting", &DialysisApiController{}, "Get:SaveGatherSetting")
+
+	beego.Router("/api/patient/getgathersetting", &DialysisApiController{}, "Get:GetGatherSetting")
+
+	beego.Router("/api/patient/getdialysisgatherlist", &DialysisApiController{}, "Get:GetDialysisGatherList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -363,6 +369,7 @@ func (c *DialysisApiController) PostPrescription() {
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
+	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -484,6 +491,7 @@ func (c *DialysisApiController) PostPrescription() {
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -1012,6 +1020,7 @@ func (c *DialysisApiController) PostSoulution() {
 	warsh_count := c.GetString("warsh_count")
 	washing_time := c.GetString("washing_time")
 	blood_access_part_id := c.GetString("blood_access_part_id")
+	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1183,6 +1192,7 @@ func (c *DialysisApiController) PostSoulution() {
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	if prescription.Anticoagulant == 0 {
@@ -1392,6 +1402,7 @@ func (c *DialysisApiController) PostSoulution() {
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	if solution.Anticoagulant == 0 {
@@ -2383,6 +2394,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 	washing_time := c.GetString("washing_time")
 
+	puncture_needle_direction := c.GetString("puncture_needle_direction")
+
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -2465,6 +2478,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		BeforSymptoms:                  befor_symptoms,
 		WarshCount:                     warsh_count,
 		WashingTime:                    washing_time,
+		PunctureNeedleDirection:        puncture_needle_direction,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -4392,12 +4406,12 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	}
 	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10345 {
 
-		if xttime <= 1672416000 {
+		if xttime <= 1703952000 {
 			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}
 
-		if xttime >= 1672502400 {
+		if xttime >= 1704038400 {
 			dialysis_count, _ := service.GetDialysisOrderCountTwo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}
@@ -5900,17 +5914,20 @@ func (this *DialysisApiController) GetDialysisAdviceTemplateList() {
 	//获取长期医嘱
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
 
+	longHisAdviceList, _ := service.GetHisLongAdviceList(orgId)
+
 	_, config := service.FindXTHisRecordByOrgId(orgId)
 
 	drugList, _ := service.GetAllBaseDrugListTwenty(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":       list,
-			"total":      total,
-			"adviceList": adviceList,
-			"config":     config,
-			"drugList":   drugList,
-			"tablelist":  tablelist,
+			"list":              list,
+			"total":             total,
+			"adviceList":        adviceList,
+			"config":            config,
+			"drugList":          drugList,
+			"tablelist":         tablelist,
+			"longHisAdviceList": longHisAdviceList,
 		})
 		return
 
@@ -7463,3 +7480,134 @@ func (this *DialysisApiController) GetAfterLogList() {
 		return
 	}
 }
+
+func (this *DialysisApiController) SaveGatherSetting() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	is_index_number, _ := this.GetInt64("is_index_number")
+	fmt.Println("this,23o2332232323232332", is_index_number)
+	is_zone, _ := this.GetInt64("is_zone")
+	is_number, _ := this.GetInt64("is_number")
+	is_birth, _ := this.GetInt64("is_birth")
+	is_age, _ := this.GetInt64("is_age")
+	is_name, _ := this.GetInt64("is_name")
+	is_mode_type, _ := this.GetInt64("is_mode_type")
+	is_prescription_status, _ := this.GetInt64("is_prescription_status")
+	is_admission_number, _ := this.GetInt64("is_admission_number")
+	is_dialysis_no, _ := this.GetInt64("is_dialysis_no")
+	is_dry_weight, _ := this.GetInt64("is_dry_weight")
+	is_dialysis_dialyszers, _ := this.GetInt64("is_dialysis_dialyszers")
+	is_dialysis_strainer, _ := this.GetInt64("is_dialysis_strainer")
+	is_dialysis_irrigation, _ := this.GetInt64("is_dialysis_irrigation")
+	is_calcium, _ := this.GetInt64("is_calcium")
+	is_kalium, _ := this.GetInt64("is_kalium")
+	is_change_nurse, _ := this.GetInt64("is_change_nurse")
+	is_puncture_needle, _ := this.GetInt64("is_puncture_needle")
+	is_anticoagulant, _ := this.GetInt64("is_anticoagulant")
+	is_tube, _ := this.GetInt64("is_tube")
+	is_cuhong, _ := this.GetInt64("is_cuhong")
+	is_zuoka, _ := this.GetInt64("is_zuoka")
+	is_zhetangtie, _ := this.GetInt64("is_zhetangtie")
+	is_paligu, _ := this.GetInt64("is_paligu")
+	is_guhuachun, _ := this.GetInt64("is_guhuachun")
+	is_niaojimei, _ := this.GetInt64("is_niaojimei")
+	is_putaosuangai, _ := this.GetInt64("is_putaosuangai")
+	is_jiaguan, _ := this.GetInt64("is_jiaguan")
+	is_xiongxiewutai, _ := this.GetInt64("is_xiongxiewutai")
+
+	gatherSetting := models.XtDialysisGatherSetting{
+		UserOrgId:          orgId,
+		IndexNumber:        is_index_number,
+		Zone:               is_zone,
+		Number:             is_number,
+		Birth:              is_birth,
+		Name:               is_name,
+		Age:                is_age,
+		ModeType:           is_mode_type,
+		PrescriptionStatus: is_prescription_status,
+		AdmissionNumber:    is_admission_number,
+		DialysisNo:         is_dialysis_no,
+		DryWeight:          is_dry_weight,
+		DialysisDialyszers: is_dialysis_dialyszers,
+		DialysisStrainer:   is_dialysis_strainer,
+		DialysisIrrigation: is_dialysis_irrigation,
+		Calcium:            is_calcium,
+		Kalium:             is_kalium,
+		ChangeNurse:        is_change_nurse,
+		PunctureNeedle:     is_puncture_needle,
+		Anticoagulant:      is_anticoagulant,
+		Tube:               is_tube,
+		Cuhong:             is_cuhong,
+		Zuoka:              is_zuoka,
+		Zhetangtie:         is_zhetangtie,
+		Paligu:             is_paligu,
+		Guhuachun:          is_guhuachun,
+		Niaojimei:          is_niaojimei,
+		Putaosuangai:       is_putaosuangai,
+		Jiaguan:            is_jiaguan,
+		Xiongxiewutai:      is_xiongxiewutai,
+		Ctime:              time.Now().Unix(),
+		Mtime:              time.Now().Unix(),
+		Status:             1,
+	}
+	//查询该机构有没有设置
+	gatherSettingOne, _ := service.GetGatherSettingByOrgId(orgId)
+	if gatherSettingOne.ID == 0 {
+		service.CreateGather(gatherSetting)
+	} else {
+		gatherSetting.ID = gatherSettingOne.ID
+		service.SaveGather(gatherSetting)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"gatherSetting": gatherSetting,
+	})
+	return
+}
+
+func (this *DialysisApiController) GetGatherSetting() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	gatherSetting, _ := service.GetGatherSetting(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"gatherSetting": gatherSetting,
+	})
+	return
+}
+
+func (this *DialysisApiController) GetDialysisGatherList() {
+
+	keyword := this.GetString("keywords")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	partion_type := this.GetString("partition_id")
+	idSplit := strings.Split(partion_type, ",")
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	start_time := this.GetString("schedule_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	scheduids := this.GetString("ids")
+	var ids []string
+	if scheduids != "" {
+		ids = strings.Split(scheduids, ",")
+	}
+
+	list, total, _ := service.GetDialysisGatherList(keyword, limit, page, idSplit, schedule_type, startTime.Unix(), orgId, ids)
+	gatherSetting, _ := service.GetGatherSetting(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":          list,
+		"total":         total,
+		"gatherSetting": gatherSetting,
+	})
+	return
+}

controllers/dialysis_record_api_controller.go

@@ -77,6 +77,7 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
+
 	patients, _ := service.GetAllPcPatientListByListEight(orgID)
 	scheduals_json_str, _ := redis.Get(key).Result()
 

controllers/doctors_api_controller.go

@@ -125,6 +125,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 			})
 		}
 	}
+
 	if config.IsOpen == 1 {
 		hisAdvices, err := service.GetHisDoctorAdvicesTwentyOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)

controllers/drug_stock_api_contorller.go

@@ -1270,6 +1270,8 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 				stock_count, _ := items["stock_count"].(string)
 
+				patient_id := int64(items["patient_id"].(float64))
+
 				id := int64(items["id"].(float64))
 
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -1302,6 +1304,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					StockCount:              stock_count,
 					IsCheck:                 2,
 					SysRecordTime:           warehousingOutDate.Unix(),
+					PatientId:               patient_id,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1521,6 +1524,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutInfoList() {
 	houstList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
 	appId := c.GetAdminUserInfo().CurrentAppId
 	doctorList, _ := service.GetAllDoctorListSix(adminInfo.CurrentOrgId, appId)
+	patients, _ := service.GetAllpatientTwenty(adminInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":       warehouseOutInfo,
 		"info":       warehouseOut,
@@ -1528,6 +1532,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutInfoList() {
 		"dealerList": dealerList,
 		"houstList":  houstList,
 		"doctorList": doctorList,
+		"patients":   patients,
 	})
 
 }
@@ -3323,6 +3328,7 @@ func (c *StockDrugApiController) GetAllConfig() {
 	configlist, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 	appId := c.GetAdminUserInfo().CurrentAppId
 	doctorList, _ := service.GetAllDoctorListSix(adminUserInfo.CurrentOrgId, appId)
+	patients, _ := service.GetAllpatientTwenty(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"manufacturer": manufacturer,
 		"dealer":       dealer,
@@ -3331,6 +3337,7 @@ func (c *StockDrugApiController) GetAllConfig() {
 		"list":         list,
 		"configlist":   configlist,
 		"doctorList":   doctorList,
+		"patients":     patients,
 	})
 }
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -283,23 +283,6 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	schedual, _ := service.MobileGetSchedualDetail(adminUserInfo.Org.Id, patient.ID, theStartTime.Unix())
 
-	//dialysisSolution,_ := service.MobileGetDialysisSolutionByModeId(adminUserInfo.Org.Id,patient.ID,schedual.ModeId)
-
-	//dialysisPrescribe, _ := service.MobileGetDialysisPrescribeByModeId(adminUserInfo.Org.Id, patient.ID, theStartTime.Unix(),schedual.ModeId)
-
-	//dialysisPrescribe, _ := service.MobileGetDialysisPrescribeByModeId(adminUserInfo.Org.Id, patient.ID, theStartTime.Unix(),schedual.ModeId)
-
-	//dialysisPrescribe, _ := service.MobileGetDialysisPrescribeByModeId(adminUserInfo.Org.Id, patient.ID, theStartTime.Unix(),schedual.ModeId)
-
-	// 查询当前用户今天有没有排班，没有排班，则不处理
-	// daySchedule, _ := service.GetPatientScheduleFormDay(adminUserInfo.Org.Id, theAssessmentDateTime, endTime, id)
-	// if(len(daySchedule) <= 0) {
-	// 	c.ServeSuccessJSON(map[string]interface{}{
-	// 		"msg":        "ok",
-	// 	})
-	// 	return
-	// }
-
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
 	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 {
@@ -403,6 +386,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
 			newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
 			newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
+			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
 			newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
 			newprescribe.TargetKtv = dialysisSolution.TargetKtv
 
@@ -444,8 +428,20 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Remark = lastDialysisPrescription.Remark
 			}
 
-			//插入透析处方
-			err := service.AddSigleRecord(&newprescribe)
+			//针对普宁和揭阳
+			if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10599 {
+				prescriptionTwenty, _ := service.GetLastDialysisPrescriptionTwenty(newprescribe.PatientId, newprescribe.RecordDate, newprescribe.UserOrgId)
+				if prescriptionTwenty.ID == 0 {
+					//插入透析处方
+					service.AddSigleRecord(&newprescribe)
+				} else {
+					//插入透析处方
+					service.UpdateAddSigleRecord(prescriptionTwenty.ID, newprescribe.TargetUltrafiltration)
+				}
+			} else {
+				//插入透析处方
+				service.AddSigleRecord(&newprescribe)
+			}
 
 			//记录日志
 			byterequest, _ := json.Marshal(newprescribe)
@@ -473,9 +469,6 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 			redis.Set(keyThree, "", time.Second)
 			defer redis.Close()
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
 		}
 
 		if dialysisPrescribe == nil && dialysisSolution == nil {
@@ -520,6 +513,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.DialyzerPerfusionApparatus = lastDialysisPrescribe.DialyzerPerfusionApparatus
 				newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
 				newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
+				newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
 				newprescribe.BodyFluidOther = lastDialysisPrescribe.BodyFluidOther
 				newprescribe.TargetKtv = lastDialysisPrescribe.TargetKtv
 				newprescribe.BloodAccessPartId = lastDialysisPrescribe.BloodAccessPartId

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1815,6 +1815,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
+	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
@@ -1979,6 +1980,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3352,10 +3354,14 @@ func (this *DialysisAPIController) StartDialysis() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
+			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375 || adminUserInfo.Org.Id == 10599) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
+			if adminUserInfo.Org.Id == 10597 { //adminUserInfo.Org.Id == 9538
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+			}
+
 			//针对医师汇
 			if adminUserInfo.Org.Id == 10121 {
 				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
@@ -3706,6 +3712,7 @@ func (c *DialysisAPIController) PostSolution() {
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
+	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	if mode_id > 0 {
 
 		var str string
@@ -3867,6 +3874,7 @@ func (c *DialysisAPIController) PostSolution() {
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3994,6 +4002,7 @@ func (c *DialysisAPIController) PostSolution() {
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	//针对河间咸的
@@ -4359,12 +4368,17 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375) && adminInfo.Org.Id != 9538 {
+			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10599) && adminInfo.Org.Id != 9538 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 
 			}
 
+			if adminInfo.Org.Id == 10597 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			if adminInfo.Org.Id == 10510 {
 				record.UltrafiltrationRate = 0
 			}
@@ -4435,6 +4449,9 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
+			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 {
+				record.UltrafiltrationRate = 0
+			}
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -4452,7 +4469,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 || adminInfo.Org.Id == 10599 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
@@ -4460,6 +4477,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
+	if adminInfo.Org.Id == 10597 {
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+		record.UltrafiltrationVolume = ultrafiltration_volume
+	}
+
 	//长沙南雅
 	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 {
 
@@ -4502,9 +4524,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	if adminInfo.Org.Id == 10510 {
 		record.UltrafiltrationVolume = 0
 	}
+	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"monitor": record,
+		"monitor":               record,
+		"lastMonitorRecordList": lastMonitorRecordList,
 	})
 
 }
@@ -5260,9 +5284,12 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 	for _, adviceNameMap := range adviceNames {
 		adviceNameM := adviceNameMap.(map[string]interface{})
 		var advice models.GroupAdvice
+
 		advice.Remark = Remark
 		advice.AdviceType = adviceType
+
 		advice.StartTime = StartTime
+
 		advice.AdviceDate = AdviceDate
 
 		advice.RecordDate = RecordDate
@@ -5372,6 +5399,11 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			advice.DrugNameId = drug_name_id
 		}
 
+		if adviceNameM["groupno"] != nil || reflect.TypeOf(adviceNameM["groupno"]).String() == "float64" {
+			groupno := int64(adviceNameM["groupno"].(float64))
+			advice.GroupNo = groupno
+		}
+
 		if adviceNameM["template_id"] != nil && reflect.TypeOf(adviceNameM["template_id"]).String() == "string" {
 			template_id, _ := adviceNameM["template_id"].(string)
 			advice.TemplateId = template_id
@@ -5448,6 +5480,11 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 						child.PrescribingNumberUnit = childPrescribingNumberUnit
 					}
 
+					if childMap["groupno"] != nil || reflect.TypeOf(childMap["groupno"]).String() == "float64" {
+						groupno := int64(childMap["groupno"].(float64))
+						advice.GroupNo = groupno
+					}
+
 					child.DeliveryWay = advice.DeliveryWay
 					child.ExecutionFrequency = advice.ExecutionFrequency
 					advice.Children = append(advice.Children, &child)
@@ -5475,51 +5512,92 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			PatientId:  patient,
 		}
 
-		dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.Org.Id, AdviceDate, 4, patient)
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.Org.Id, AdviceDate, 4, patient)
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
 
-		list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
+		if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 9671 {
+			list, err := service.CreateMGroupAdviceOne(adminUserInfo.Org.Id, advices, groupNo)
+			for _, item := range advices {
+				byterequest, _ := json.Marshal(item)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   adminUserInfo.Org.Id,
+					PatientId:   patient,
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					Module:      1,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端医嘱推送",
+					RecordDate:  item.AdviceDate,
+				}
 
-		for _, item := range advices {
-			byterequest, _ := json.Marshal(item)
-			adviceLog := models.XtDoctorAdviceLog{
-				UserOrgId:   adminUserInfo.Org.Id,
-				PatientId:   patient,
-				AdminUserId: adminUserInfo.AdminUser.Id,
-				Module:      1,
-				ErrLog:      string(byterequest),
-				Status:      1,
-				Ctime:       time.Now().Unix(),
-				Mtime:       0,
-				Source:      "手机端医嘱推送",
-				RecordDate:  item.AdviceDate,
+				service.CreateDoctorAdviceLog(adviceLog)
 			}
 
-			service.CreateDoctorAdviceLog(adviceLog)
-		}
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(RecordDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
 
-		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(RecordDate, 10) + ":doctor_advices"
-		redis := service.RedisClient()
-		//清空key 值
-		redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyOne, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
-		redis.Set(keyOne, "", time.Second)
+			keyThree := "scheduals_" + adviceDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			defer redis.Close()
+			redis.Set(keyThree, "", time.Second)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
+				return
+			}
 
-		keyThree := "scheduals_" + adviceDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
-		defer redis.Close()
-		redis.Set(keyThree, "", time.Second)
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
-			return
-		}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":     "ok",
+				"advices": list,
+			})
+		} else {
+			list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
+			for _, item := range advices {
+				byterequest, _ := json.Marshal(item)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   adminUserInfo.Org.Id,
+					PatientId:   patient,
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					Module:      1,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端医嘱推送",
+					RecordDate:  item.AdviceDate,
+				}
 
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":     "ok",
-			"advices": list,
-		})
+				service.CreateDoctorAdviceLog(adviceLog)
+			}
+
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(RecordDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyOne, "", time.Second)
+
+			keyThree := "scheduals_" + adviceDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			defer redis.Close()
+			redis.Set(keyThree, "", time.Second)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
+				return
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":     "ok",
+				"advices": list,
+			})
+		}
 
 	} else {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -8091,6 +8169,8 @@ func (c *DialysisAPIController) GetPrescriptionList() {
 
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
+	schedule_type, _ := c.GetInt64("schedule_type")
+	partion_id, _ := c.GetInt64("partion_id")
 	orgId := c.GetMobileAdminUserInfo().Org.Id
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -8113,7 +8193,7 @@ func (c *DialysisAPIController) GetPrescriptionList() {
 		}
 		endTime = theTime.Unix()
 	}
-	schedulelist, _ := service.GetMobileScheduleListOne(startTime, endTime, orgId)
+	schedulelist, _ := service.GetMobileScheduleListOne(startTime, endTime, orgId, schedule_type, partion_id)
 
 	fmt.Println("schedulelist22222222", schedulelist)
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -8157,12 +8237,9 @@ func (c *DialysisAPIController) GetPatientDialysisRecordList() {
 
 	end_time := c.GetString("end_time")
 
-	fmt.Println("start_timeo2o2o2o2o2o", start_time)
-	fmt.Println("end_Time2o2o2o2ooo22", end_time)
 	var startdateunix int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-		fmt.Println("theTim3333333333333333333333e", theTime)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
@@ -8190,20 +8267,34 @@ func (c *DialysisAPIController) GetPatientDialysisRecordList() {
 
 	org_id := c.GetMobileAdminUserInfo().Org.Id
 
-	if org_id == 10579 {
-		list, _ := service.GetPatientDialysisRecordListOne(id, startdateunix, enddateunix)
+	//if org_id == 10579 {
+	//	list, _ := service.GetPatientDialysisRecordListOne(id, startdateunix, enddateunix)
+	//	c.ServeSuccessJSON(map[string]interface{}{
+	//		"list": list,
+	//	})
+	//	return
+	//} else {
+	//	list, _ := service.GetPatientDialysisRecordList(id, startdateunix, enddateunix)
+	//	c.ServeSuccessJSON(map[string]interface{}{
+	//		"list": list,
+	//	})
+	//	return
+	//}
+	if org_id == 9538 || org_id == 10101 {
+		list, _ := service.GetPatientDialysisRecordList(id, startdateunix, enddateunix)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list": list,
 		})
 		return
 	} else {
-		list, _ := service.GetPatientDialysisRecordList(id, startdateunix, enddateunix)
+		list, _ := service.GetPatientDialysisRecordListOne(id, startdateunix, enddateunix)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list": list,
 		})
-		return
 	}
 
+	return
+
 }
 
 func (c *DialysisAPIController) BathDeleteAdviceList() {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -716,9 +716,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			return
 		}
 
-		if advice.StartTime > theTime.Unix() {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
-			return
+		//针对普宁
+		if adminUserInfo.Org.Id != 10599 {
+			if advice.StartTime > theTime.Unix() {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
+				return
+			}
 		}
 
 		advices := models.DoctorAdvice{
@@ -2701,6 +2704,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
 		newprescribe.Remark = lastDialysisPrescription.Remark
 		newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
+
 		_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 		newprescribe.ID = dialysisPrescription.ID
 
@@ -3818,7 +3822,6 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 	if dataBody["is_infect"] != nil && reflect.TypeOf(dataBody["is_infect"]).String() == "string" {
 		is_infect, _ := dataBody["is_infect"].(string)
-		fmt.Println("is_infect================", is_infect)
 		infect, _ := strconv.ParseInt(is_infect, 10, 64)
 		evaluation.IsInfect = infect
 	}
@@ -4040,6 +4043,16 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		warsh_count, _ := dataBody["warsh_count"].(string)
 		evaluation.WarshCount = warsh_count
 	}
+
+	if dataBody["puncture_needle_direction"] != nil && reflect.TypeOf(dataBody["puncture_needle_direction"]).String() == "string" {
+		puncture_needle_direction, _ := dataBody["puncture_needle_direction"].(string)
+		evaluation.PunctureNeedleDirection = puncture_needle_direction
+	}
+
+	if dataBody["symptom_before_dialysis_other"] != nil && reflect.TypeOf(dataBody["symptom_before_dialysis_other"]).String() == "string" {
+		symptom_before_dialysis_other, _ := dataBody["symptom_before_dialysis_other"].(string)
+		evaluation.SymptomBeforeDialysisOther = symptom_before_dialysis_other
+	}
 	return
 }
 
@@ -4404,6 +4417,21 @@ func (c *PatientApiController) GetPatientMonitor() {
 			//获取所有的患者
 			patients, _ := service.GetAllPatientListByListOne(orgID)
 
+			for _, it := range patients {
+				if orgID == 10445 {
+					if theStartTime <= 1703952000 {
+						listOne, _ := service.GetDialysisOrderCountTwentyEight(orgID, it.ID, theStartTime)
+						it.TotalDialysis = listOne.Count
+
+					}
+
+					if theStartTime >= 1704038400 {
+						listOrder, _ := service.GetDialysisOrderCountTenEight(it.ID, theStartTime)
+						it.TotalDialysis = listOrder.Count
+					}
+				}
+			}
+
 			//获取所有透析模式
 			treatments, _ := service.GetAllTreatModeByList(orgID)
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -843,20 +843,17 @@ func (this *NewDialysisApiController) GetlongDialysisrecord() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	id, _ := this.GetInt64("id")
-	fmt.Print("id", id)
 	patient, _ := service.GetPatientDetailTwo(id)
 	start := this.GetString("startime")
 	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", start+" 00:00:00", loc)
 	startime := startTimes.Unix()
-	fmt.Print("startime", startime)
 	end := this.GetString("endtime")
 	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 00:00:00", loc)
 	endtime := endTimes.Unix()
-	fmt.Print("endtime", endtime)
 	limit, _ := this.GetInt64("limit")
-	fmt.Print("limit", limit)
+
 	page, _ := this.GetInt64("page")
-	fmt.Print("page", page)
+
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
 	dialysisrecord, total, err := service.GetlongDialysisrecord(patient.BloodId, startime, endtime, limit, page, orgid)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -508,6 +508,14 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 			AdminUserId: this.GetMobileAdminUserInfo().AdminUser.Id,
 		}
 		service.CreateScheduleLog(xtScheduleLog)
+
+		//针对凤凰医院
+		if org_id == 10579 || org_id == 10344 {
+			advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, org_id)
+			if len(advice) > 0 {
+				service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, org_id)
+			}
+		}
 		redis := service.RedisClient()
 		//处方
 		keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"

controllers/patient_api_controller.go

@@ -3686,7 +3686,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 		}
 	}
 
-	err := service.DeleteGroupAdvice(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
+	err := service.DeleteGroupAdviceOne(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
 
 	byterequest, _ := json.Marshal(advice)
 	doctorAdviceLog := models.XtDoctorAdviceLog{
@@ -4607,6 +4607,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		chaptalization := dataBody["chaptalization"].(string)
 		solution.Chaptalization = chaptalization
 	}
+
+	if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "string" {
+		blood_access_part_id := dataBody["blood_access_part_id"].(string)
+		solution.BloodAccessPartId = blood_access_part_id
+	}
 	return
 }
 

controllers/pharmacy_controller.go

@@ -348,6 +348,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 
 // 发药按钮点击
 func (this *PharmacyController) DispensingMedicine() {
+
 	var err error
 	defer func() {
 		if rec := recover(); rec != nil {
@@ -379,37 +380,35 @@ func (this *PharmacyController) DispensingMedicine() {
 		for _, item := range advicelist {
 			//查询改药品信息
 			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			//针对阜阳经沃
-			if orgid != 10480 {
-				if medical.IsPharmacy == 1 {
-					houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
-					//查询该药品是否有库存
-					list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
-
-					//判断单位是否相等
-					if medical.MaxUnit == item.PrescribingNumberUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						//转化为最小单位
-						total = list.Count*medical.MinNumber + list.StockMinNumber
-						prescribing_number_total = count * medical.MinNumber
-					}
-					if medical.MinUnit == item.PrescribingNumberUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						total = list.Count*medical.MinNumber + list.StockMinNumber
-						prescribing_number_total = count
-					}
+			//如果是药房发药的方式
+			if medical.IsPharmacy == 1 {
+				houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
+				//查询该药品是否有库存
+				list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+				//判断单位是否相等
+				if medical.MaxUnit == item.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					//转化为最小单位
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					prescribing_number_total = count * medical.MinNumber
+				}
+				if medical.MinUnit == item.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					prescribing_number_total = count
+				}
 
-					if medical.IsUse != 1 {
-						//如果出库数量大于库存数量
-						if prescribing_number_total > total {
-							err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
-							if err != nil {
-								utils.ErrorLog(err.Error())
-								this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
-								return
-							}
+				if medical.IsUse != 1 {
+					//如果出库数量大于库存数量
+					if prescribing_number_total > total {
+						err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
+						if err != nil {
+							utils.ErrorLog(err.Error())
+							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+							return
 						}
 					}
 				}
@@ -418,34 +417,55 @@ func (this *PharmacyController) DispensingMedicine() {
 		}
 	}
 
-	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
+	if orgid != 10480 {
+		//发药
+		err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
 
-	if orgid == 10387 || orgid == 3877 {
-		advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
-		if len(advicelist) > 0 {
-			for _, item := range advicelist {
-				//查询改药品信息
-				medical, _ := service.GetBaseDrugMedical(item.DrugId)
-				if medical.IsPharmacy == 1 {
-					flow, _ := service.GetFlow(item.DrugId, item.AdviceDate, orgid, item.PatientId)
-					if len(flow) > 0 {
-						service.UpdateAdviceFlow(item.ID)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": "操作成功",
+		})
+		return
+	}
+
+	if orgid == 10480 {
+		//发药逻辑
+
+		service.DispensingMedicineOne(orgid, patient_id, stime, etime, creater)
+
+		//针对桑植盛康
+		if orgid == 10387 || orgid == 3877 {
+			advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+			if len(advicelist) > 0 {
+				for _, item := range advicelist {
+					//查询改药品信息
+					medical, _ := service.GetBaseDrugMedical(item.DrugId)
+					if medical.IsPharmacy == 1 {
+						flow, _ := service.GetFlow(item.DrugId, item.AdviceDate, orgid, item.PatientId)
+						if len(flow) > 0 {
+							service.UpdateAdviceFlow(item.ID)
+						}
 					}
 				}
-			}
 
+			}
 		}
-	}
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": "操作成功",
+		})
 		return
 	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": "操作成功",
-	})
-	return
 }
 
 // 退药按钮点击

controllers/print_data_api_controller.go

@@ -38,7 +38,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	adminUserInfo := this.GetAdminUserInfo()
 
 	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
-
+		fmt.Println("JINALADOOWOWOWOWOWOO")
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -99,14 +99,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
 
-				if item.ScheduleDate <= 1672416000 {
+				if item.ScheduleDate <= 1703952000 {
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
 					item.Count = listOne.Count
 				}
 
-				if item.ScheduleDate >= 1672502400 {
+				if item.ScheduleDate >= 1704038400 {
 
 					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
@@ -145,13 +145,26 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	}
 
 	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 && this.GetAdminUserInfo().CurrentOrgId != 10013 && this.GetAdminUserInfo().CurrentOrgId != 10014 {
+
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
+
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
 			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
 				if this.GetAdminUserInfo().CurrentOrgId == 10445 {
-					listOrder, _ := service.GetDialysisOrderCountTen(item.PatientID, item.ScheduleDate)
-					item.Count = listOrder.DialysisTotal
+					if item.ScheduleDate <= 1703952000 {
+						listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+						item.Patient.TotalDialysis = listOne.Count
+						item.Count = listOne.Count
+					}
+
+					if item.ScheduleDate >= 1704038400 {
+
+						listOrder, _ := service.GetDialysisOrderCountTen(item.PatientID, item.ScheduleDate)
+						item.Count = listOrder.DialysisTotal
+					}
+
 				}
 				if this.GetAdminUserInfo().CurrentOrgId != 10445 {
 					item.Count = list.Count
@@ -162,10 +175,6 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			item.Schedule = &lastSchedule
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
-				//listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
-
-				//item.Patient.TotalDialysis = listOne.Count
-				//item.Count = listOne.Count
 
 				if item.ScheduleDate <= 1640966400 {
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)

controllers/schedule_api_controller.go

@@ -1968,6 +1968,14 @@ func (c *ScheduleApiController) DeleteSchedule() {
 
 	service.CreateScheduleLog(scheduleLog)
 
+	//针对凤凰医院
+	if adminINfo.CurrentOrgId == 10579 || adminINfo.CurrentOrgId == 10344 {
+		advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		if len(advice) > 0 {
+			service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		}
+	}
+
 	redis := service.RedisClient()
 
 	//处方

controllers/sign_api_controller.go

@@ -91,6 +91,9 @@ func SignApiRegistRouters() {
 
 	beego.Router("/api/device/toautodiagnose", &SignApiController{}, "Get:ToAutoDiagnose")
 
+	//加油
+	beego.Router("/api/device/toautojiayou", &SignApiController{}, "Get:ToAutoJiaYou")
+
 }
 
 // 短信服务接口
@@ -662,7 +665,6 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
-	fmt.Println("WOOWOWOWOWOWOWOWOWOWOWWOOWOWWO")
 	list, _ := service.GetAllPatientNew(10587)
 	for _, item := range list {
 
@@ -1214,6 +1216,14 @@ func (this *SignApiController) ToAutoDrug() {
 func (this *SignApiController) ToAutoDiagnose() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	//order, _ := service.GetDialysisOrderTotalCount()
+	//
+	//for _, item := range order {
+	//
+	//	service.ModifyPatient(item.PatientId, item.Count)
+	//}
+
 	list, _ := service.GetNewAllpatient(orgId)
 
 	for _, item := range list {
@@ -1224,8 +1234,45 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//for _, item := range list {
 	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, 10579, item.BedId, item.ZoneId, item.SchedualType)
 	//}
-	//this.ServeSuccessJSON(map[string]interface{}{
-	//	"msg": "ok",
-	//})
 
+	//drugList, _ := service.GetAllBaseDrugList(10571)
+	//for _, item := range drugList {
+	//	//service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
+	//
+	//	service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
+	//}
+
+	//goodList, _ := service.GetAllGoodList(10571)
+	//for _, item := range goodList {
+	//	service.UpdasteGoodWarehouseInfoByGood(item.ID, item.PackingPrice, item.OrgId)
+	//}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}
+
+func (this *SignApiController) ToAutoJiaYou() {
+
+	list, _ := service.GetPrescriptionListOne(10579)
+
+	for _, item := range list {
+
+		schedule, _ := service.GetPatientScheduleById(item.PatientId, item.RecordDate)
+		var DialysisMachineName string
+		if len(item.DialysisDialyszers) > 0 {
+			DialysisMachineName = item.DialysisDialyszers
+		}
+
+		if len(item.DialysisIrrigation) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + item.DialysisIrrigation
+		}
+
+		if len(item.DialysisStrainer) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + item.DialysisStrainer
+		}
+		DialysisMachineName = DialysisMachineName
+
+		service.UpdateDialysisScheduleOne(schedule.ID, item.ModeId, DialysisMachineName)
+	}
 }

controllers/stock_in_api_controller.go

@@ -1329,6 +1329,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				}
 				license_number := items["license_number"].(string)
 
+				patient_id := int64(items["patient_id"].(float64))
+
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					ID:                      id,
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1357,13 +1359,13 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					IsCheck:                 2,
 					RegisterNumber:          register_number,
 					SysRecordTime:           warehouseOut.WarehouseOutTime,
+					PatientId:               patient_id,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
 			}
 		}
 	}
-	fmt.Println("warehouseOut_id", warehouseOut_id)
 	if warehouseOut_id == 0 {
 		//查询是否生成出库单
 		_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
@@ -1407,6 +1409,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			Count:                   it.Count,
 			IsCheck:                 2,
 			RegisterNumber:          it.RegisterNumber,
+			PatientId:               it.PatientId,
 		}
 		if it.ID == 0 {
 			service.AddSigleWarehouseOutInfo(warehouseOutInfo)
@@ -1712,6 +1715,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				register_number := items["register_number"].(string)
 
+				patient_id := int64(items["patient_id"].(float64))
+
 				var productDate int64
 				if len(product_date) > 0 {
 					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
@@ -1751,6 +1756,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
 						RegisterNumber:          register_number,
+						PatientId:               patient_id,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1798,6 +1804,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
 						RegisterNumber:          register_number,
+						PatientId:               patient_id,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -3094,6 +3101,8 @@ func (c *StockManagerApiController) GetAllConfig() {
 	configList, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 	appId := c.GetAdminUserInfo().CurrentAppId
 	doctorList, _ := service.GetAllDoctorListSix(adminUserInfo.CurrentOrgId, appId)
+
+	patients, _ := service.GetAllpatientTwenty(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"manufacturer": manufacturer,
 		"dealer":       dealer,
@@ -3102,6 +3111,7 @@ func (c *StockManagerApiController) GetAllConfig() {
 		"list":         list,
 		"configlist":   configList,
 		"doctorList":   doctorList,
+		"patients":     patients,
 	})
 }
 func (this *StockManagerApiController) GetAllSalesReturnConfig() {
@@ -4989,6 +4999,7 @@ func (this *StockManagerApiController) GetSingleOutOrderDetail() {
 	goodType, _ := service.GetAllGoodType(orgId)
 	appId := this.GetAdminUserInfo().CurrentAppId
 	doctorlist, _ := service.GetAllDoctorListSix(orgId, appId)
+	patients, _ := service.GetAllpatientTwenty(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             warehouseOutInfo,
 		"dealerList":       dealerList,
@@ -4997,6 +5008,7 @@ func (this *StockManagerApiController) GetSingleOutOrderDetail() {
 		"out":              out,
 		"storelist":        storelist,
 		"doctorlist":       doctorlist,
+		"patients":         patients,
 	})
 }
 

models/dialysis.go

@@ -329,6 +329,7 @@ type PredialysisEvaluation struct {
 	BeforSymptoms                  string  `gorm:"column:befor_symptoms" json:"befor_symptoms" form:"befor_symptoms"`
 	WashingTime                    string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 	WarshCount                     string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
+	PunctureNeedleDirection        string  `gorm:"column:puncture_needle_direction" json:"puncture_needle_direction" form:"puncture_needle_direction"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -1623,3 +1624,16 @@ type NoHisPrescriptionProject struct {
 func (NoHisPrescriptionProject) TableName() string {
 	return "his_prescription_project"
 }
+
+type XtDialysisOrderLost struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate int64 `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Count        int64
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDialysisOrderLost) TableName() string {
+	return "xt_dialysis_order"
+}

models/dialysis_parameter_models.go

@@ -136,6 +136,7 @@ type DialysisPrescriptionParameter struct {
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (DialysisPrescriptionParameter) TableName() string {

models/drug.go

@@ -115,6 +115,11 @@ type BaseDrugLibEleven struct {
 	DrugName         string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
 	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+	MaxUnit          string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber        int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit          string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose             string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit         string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 }
 
 func (BaseDrugLibEleven) TableName() string {

models/new_monitor.go

@@ -34,6 +34,7 @@ type VMMonitorPatients struct {
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
 	DialysisNo         string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	TotalDialysis      int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
 }
 
 func (VMMonitorPatients) TableName() string {

models/patient_models.go

@@ -380,6 +380,7 @@ type DialysisPrescription struct {
 	WarshCount                 string        `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
 	WashingTime                string        `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 	BloodAccessPartId          string        `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	AnticoagulantWeichiHour    string        `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -487,6 +488,7 @@ type DialysisPrescriptionList struct {
 	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 }
 
 func (DialysisPrescriptionList) TableName() string {
@@ -617,6 +619,7 @@ type DialysisSolution struct {
 	WarshCount                 string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
 	WashingTime                string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	AnticoagulantWeichiHour    string  `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
 }
 
 func (DialysisSolution) TableName() string {
@@ -1632,6 +1635,7 @@ type VmDialysisSolution struct {
 	ModeId                     int64                 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 	Anticoagulant              int64                 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
 	DialysisSolution           VmDialysisSolutionOne `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"solution"`
+	SolutionStatus             int64                 `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
 }
 
 func (VmDialysisSolution) TableName() string {
@@ -1670,17 +1674,18 @@ func (VmDialysisPrescription) TableName() string {
 }
 
 type XtScheduleList struct {
-	UserOrgId        int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PartitionId      int64              `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId            int64              `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId        int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate     int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType     int64              `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek     int64              `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId           int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	IsExport         int64              `gorm:"column:is_export" json:"is_export" form:"is_export"`
-	DialysisSolution VmDialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
-	Status           int64              `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId            int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId          int64                `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                int64                `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId            int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate         int64                `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType         int64                `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek         int64                `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId               int64                `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	IsExport             int64                `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	DialysisSolution     VmDialysisSolution   `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
+	DialysisPrescription DialysisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"prescription"`
+	Status               int64                `gorm:"column:status" json:"status" form:"status"`
 }
 
 func (XtScheduleList) TableName() string {
@@ -2358,3 +2363,14 @@ type XtDeviceValusalMapVrr struct {
 func (XtDeviceValusalMapVrr) TableName() string {
 	return "xt_device_valusal_map_vrr"
 }
+
+type PatientsTwenty struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (PatientsTwenty) TableName() string {
+	return "xt_patients"
+}

models/role_models.go

@@ -153,3 +153,44 @@ type Roles struct {
 func (Roles) TableName() string {
 	return "sgj_user_role"
 }
+
+type XtDialysisGatherSetting struct {
+	ID                 int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IndexNumber        int64 `gorm:"column:index_number" json:"index_number" form:"index_number"`
+	Zone               int64 `gorm:"column:zone" json:"zone" form:"zone"`
+	Number             int64 `gorm:"column:number" json:"number" form:"number"`
+	Birth              int64 `gorm:"column:birth" json:"birth" form:"birth"`
+	Name               int64 `gorm:"column:name" json:"name" form:"name"`
+	Age                int64 `gorm:"column:age" json:"age" form:"age"`
+	ModeType           int64 `gorm:"column:mode_type" json:"mode_type" form:"mode_type"`
+	PrescriptionStatus int64 `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	AdmissionNumber    int64 `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	DialysisNo         int64 `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	DryWeight          int64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	DialysisDialyszers int64 `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisStrainer   int64 `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	DialysisIrrigation int64 `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	Calcium            int64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	Kalium             int64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	ChangeNurse        int64 `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
+	PunctureNeedle     int64 `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	Anticoagulant      int64 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	Tube               int64 `gorm:"column:tube" json:"tube" form:"tube"`
+	Cuhong             int64 `gorm:"column:cuhong" json:"cuhong" form:"cuhong"`
+	Zuoka              int64 `gorm:"column:zuoka" json:"zuoka" form:"zuoka"`
+	Zhetangtie         int64 `gorm:"column:zhetangtie" json:"zhetangtie" form:"zhetangtie"`
+	Paligu             int64 `gorm:"column:paligu" json:"paligu" form:"paligu"`
+	Guhuachun          int64 `gorm:"column:guhuachun" json:"guhuachun" form:"guhuachun"`
+	Niaojimei          int64 `gorm:"column:niaojimei" json:"niaojimei" form:"niaojimei"`
+	Putaosuangai       int64 `gorm:"column:putaosuangai" json:"putaosuangai" form:"putaosuangai"`
+	Jiaguan            int64 `gorm:"column:jiaguan" json:"jiaguan" form:"jiaguan"`
+	Xiongxiewutai      int64 `gorm:"column:xiongxiewutai" json:"xiongxiewutai" form:"xiongxiewutai"`
+	Ctime              int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDialysisGatherSetting) TableName() string {
+	return "xt_dialysis_gather_setting"
+}

models/schedule_models.go

@@ -392,6 +392,7 @@ type VmBloodSchedule struct {
 	ReceiveTreatmentAsses      ReceiveTreatmentAsses      `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_receive_treatment_asses"`
 	XtAssessmentAfterDislysis  XtAssessmentAfterDislysis  `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_assesment_after_dislysis"`
 	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	DialysisMachineName        string                     `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
 }
 
 func (VmBloodSchedule) TableName() string {
@@ -423,6 +424,7 @@ type NewMSchedualPatientVMList struct {
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	AdmissionNumber    string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
 }
 
 func (NewMSchedualPatientVMList) TableName() string {

models/user_models.go

@@ -351,6 +351,9 @@ type XtDialysisSolution struct {
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	SolutionStatus             int64   `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (XtDialysisSolution) TableName() string {

service/dialysis_parameter_service.go

@@ -452,3 +452,10 @@ func PCGetDialysisGoodsThree(orgID int64, scheduleDate int64) ([]*MDialysisGoods
 
 	return vms, err
 }
+
+func GetLastDialysisPrescriptionTwenty(patientid int64, record_date int64, orgid int64) (models.XtDialysisPrescription, error) {
+
+	prescription := models.XtDialysisPrescription{}
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date =? and status = 1", record_date, patientid, orgid).Last(&prescription).Error
+	return prescription, err
+}

service/dialysis_service.go

@@ -222,6 +222,12 @@ func AddSigleRecord(prescription *models.DialysisPrescription) (err error) {
 	return errors
 }
 
+func UpdateAddSigleRecord(id int64, target_ultrafiltration float64) error {
+
+	err := XTWriteDB().Model(&models.DialysisPrescription{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"target_ultrafiltration": target_ultrafiltration}).Error
+	return err
+}
+
 func AddSigleSummaryRecord(summary *models.TreatmentSummary) (err error) {
 	tx := writeDb.Begin()
 	errors := tx.Model(&models.TreatmentSummary{}).Create(&summary).Error

service/dialysis_solution_service.go

@@ -120,6 +120,12 @@ func GetAllLongAdviceList(user_org_id int64) (advice []*models.DoctorAdvice, err
 	return advice, err
 }
 
+func GetHisLongAdviceList(user_org_id int64) (advice []*models.HisDoctorAdviceTemplate, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status=1", user_org_id).Find(&advice).Error
+	return advice, err
+}
+
 func GetAllHisAdviceTemplateList(user_org_id int64) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&advice).Error
@@ -586,3 +592,59 @@ func GetLongDialysisAdviceToday(orgID int64, schedule_type int64, partition_id [
 	return schedule, err
 
 }
+
+func GetDialysisGatherList(keywords string, limit int64, page int64, partition_id []string, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
+	offset := (page - 1) * limit
+	if scheduleDate > 0 {
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
+	}
+	//if partition_id > 0 {
+	//	db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	//}
+	if len(partition_id) > 0 {
+		db = db.Where("xt_schedule.partition_id in(?)", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
+	}
+	if len(ids) >= 1 {
+		db = db.Where("xt_schedule.id in(?)", ids)
+	}
+
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).
+			Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, scheduleDate)
+			}).
+			Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 1", orgID, scheduleDate).
+			Preload("XtDoctorAdviceOne", "status = 1 AND user_org_id = ? and advice_date = ? and (advice_type = 2 or advice_type =3)", orgID, scheduleDate).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+	} else {
+		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).
+			Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 1", orgID, scheduleDate).
+			Preload("XtDoctorAdviceOne", "status = 1 AND user_org_id = ? and advice_date = ? and (advice_type = 2 or advice_type =3)", orgID, scheduleDate).
+			Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, scheduleDate)
+			}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+	}
+
+	return schedule, total, err
+}

service/gobal_config_service.go

@@ -510,7 +510,7 @@ func FindPrintStockGoodInfoByType(types int, startTime int64, end_time int64, or
 	return
 }
 
-func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64) (schedulelist []*models.XtScheduleList, err error) {
+func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64, schedule_type int64, partion_id int64) (schedulelist []*models.XtScheduleList, err error) {
 
 	db := XTReadDB().Model(&schedulelist).Where("status =1 and user_org_id =?", org_id)
 	if start_time > 0 {
@@ -519,7 +519,13 @@ func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64) (s
 	if end_time > 0 {
 		db = db.Where("schedule_date<=?", end_time)
 	}
-	err = db.Preload("DialysisSolution", "status=1 and user_org_id =?", org_id).Find(&schedulelist).Error
+	if schedule_type > 0 {
+		db = db.Where("schedule_type =?", schedule_type)
+	}
+	if partion_id > 0 {
+		db = db.Where("partition_id = ?", partion_id)
+	}
+	err = db.Preload("DialysisSolution", "status=1 and user_org_id =? and solution_status =1", org_id).Preload("DialysisPrescription", "status=1 and user_org_id =?", org_id).Find(&schedulelist).Error
 
 	return schedulelist, err
 
@@ -629,7 +635,7 @@ func GetAllBaseDrugListTwo(orgid int64) (drug []*models.BaseDrugLibEleven, err e
 	if orgid > 0 {
 		db = db.Where("x.org_id =?", orgid)
 	}
-	err = db.Select("x.id,x.drug_name,p.manufacturer_name").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
+	err = db.Select("x.id,x.drug_name,p.manufacturer_name,x.dose,x.dose_unit,x.min_number,x.max_unit,x.min_unit").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
 	return drug, err
 }
 
@@ -1322,3 +1328,32 @@ func GetAfterLogList(patient_id int64, page int64, limit int64, record_date int6
 
 	return afterlist, total, err
 }
+
+func GetGatherSettingByOrgId(user_org_id int64) (models.XtDialysisGatherSetting, error) {
+
+	gatherSetting := models.XtDialysisGatherSetting{}
+	err := XTReadDB().Where("user_org_id =? and status =1", user_org_id).Find(&gatherSetting).Error
+	return gatherSetting, err
+}
+
+func CreateGather(setting models.XtDialysisGatherSetting) error {
+
+	err := XTWriteDB().Create(&setting).Error
+	return err
+}
+
+func SaveGather(setting models.XtDialysisGatherSetting) error {
+
+	err := XTWriteDB().Save(&setting).Error
+
+	return err
+}
+
+func GetGatherSetting(user_org_id int64) (models.XtDialysisGatherSetting, error) {
+
+	gatherSetting := models.XtDialysisGatherSetting{}
+
+	err := XTReadDB().Where("user_org_id = ? and status =1", user_org_id).Find(&gatherSetting).Error
+
+	return gatherSetting, err
+}

service/inspection_service.go

@@ -169,7 +169,7 @@ func DeletePatientInspection(orgId, patientId, projectId, date int64) (err error
 func GetPatientInspections(orgId, patientId, projectId, page int64) (inspections []*models.Inspection, total int64, date int64, err error) {
 
 	var projectCount models.UserInspectionProjectCount
-	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("count(distinct inspect_date) as count, project_id, patient_id").Order("created_time desc").Scan(&projectCount).Error
+	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("count(distinct inspect_date) as count, project_id, patient_id").Order("inspect_date desc").Scan(&projectCount).Error
 
 	if err != nil {
 		return
@@ -181,7 +181,7 @@ func GetPatientInspections(orgId, patientId, projectId, page int64) (inspections
 	}
 
 	var Id models.InspectionDate
-	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("inspect_date").Group("inspect_date").Order("created_time desc").Offset(page - 1).Limit(1).Scan(&Id).Error
+	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("inspect_date").Group("inspect_date").Order("inspect_date desc").Offset(page - 1).Limit(1).Scan(&Id).Error
 	if err != nil {
 		return
 	}

service/manage_service.go

@@ -915,6 +915,11 @@ func GetAllpatient(orgid int64) (patients []*models.Patients, err error) {
 	return patients, err
 }
 
+func GetAllpatientTwenty(orgid int64) (patients []*models.PatientsTwenty, err error) {
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&patients).Error
+	return patients, err
+}
+
 func GetAllpatientThirty(orgid int64) (patients []*models.PatientsThirty, err error) {
 	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&patients).Error
 	return patients, err

service/mobile_dialysis_service.go

@@ -2340,6 +2340,7 @@ func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+
 	dialysis_solution_str, _ := redis.Get(key).Result()
 
 	if len(dialysis_solution_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -2809,7 +2810,7 @@ func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (
 }
 
 func GetDialysisOrderCountTwo(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1672502400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1704038400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
 	return
 }
 
@@ -8112,7 +8113,7 @@ func GetDialysisTotalCountOne(org_id int64, patient_id int64) (models.BloodDialy
 	order := models.BloodDialysisOrderCount{}
 	db := XTReadDB().Table("xt_dialysis_order as o")
 
-	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1672502400 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1704038400 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
 
 	return order, err
 }
@@ -8167,6 +8168,7 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 			db = db.Where("partition_id = ?", partitionType)
 		}
 		if patient_id > 0 {
+
 			if execution_state > 0 {
 				if cost_type > 0 {
 					if len(execution_frequency) > 0 {
@@ -8444,6 +8446,7 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 		}
 		if patient_id > 0 {
 			if execution_state > 0 {
+				fmt.Println("execution_state---------------------", execution_state)
 				if cost_type > 0 {
 					db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id = ?", orgID, patient_id).
 						Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).

service/patient_service.go

@@ -79,11 +79,11 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	}
 	if lapseto != 2 && lapseto != 3 {
-		if orgID != 10579 {
+		if orgID != 10579 && orgID != 10600 {
 			err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 		}
 
-		if orgID == 10579 {
+		if orgID == 10579 || orgID == 10600 {
 			err = db.Order("p.dialysis_no asc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 		}
 
@@ -1114,6 +1114,43 @@ func CreateMGroupAdvice(orgId int64, advices []*models.GroupAdvice, groupNo int6
 	return
 }
 
+func CreateMGroupAdviceOne(orgId int64, advices []*models.GroupAdvice, groupNo int64) (list []*models.GroupAdvice, err error) {
+	if groupNo <= 0 {
+		group := GetMaxAdviceGroupID(orgId)
+		groupNo = group + 1
+	}
+	tx := writeDb.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+	for _, advice := range advices {
+		advice.GroupNo = advice.GroupNo
+		if err = tx.Create(advice).Error; err != nil {
+			tx.Rollback()
+			return
+		}
+		list = append(list, advice)
+		if len(advice.Children) > 0 {
+			for _, child := range advice.Children {
+
+				child.GroupNo = advice.GroupNo
+				child.ParentId = advice.ID
+				fmt.Println(child)
+				if err = tx.Create(&child).Error; err != nil {
+					tx.Rollback()
+					return
+				}
+				list = append(list, child)
+			}
+		}
+
+	}
+	tx.Commit()
+	return
+}
+
 func UpdateDoctorAdvice(m *models.DoctorAdvice) (err error) {
 	return writeDb.Save(m).Error
 }
@@ -1194,6 +1231,14 @@ func DeleteGroupAdvice(orgId int64, groupNo int64, admin_user_id int64) (err err
 	return
 }
 
+func DeleteGroupAdviceOne(orgId int64, groupNo int64, admin_user_id int64) (err error) {
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? and groupno = ? and status =1 and advice_type=1", orgId, groupNo).Update(map[string]interface{}{"UpdatedTime": time.Now().Unix(), "Status": 0, "Modifier": admin_user_id}).Error
+	if err != nil {
+		return
+	}
+	return
+}
+
 func FindDoctorAdvice(orgID, id int64) (advice models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("id = ? and user_org_id=? and status = 1", id, orgID).First(&advice).Error
 	return
@@ -3340,3 +3385,15 @@ func GetPatientScheudleListTwenty(org_id int64, scheduel_type int64, startime in
 	fmt.Println("err2330230320202023", err)
 	return schedule, err
 }
+
+func GetDialysisOrderCountTwentyEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	return order, err
+}
+
+func GetDialysisOrderCountTenEight(patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := XTReadDB().Where("patient_id = ? and dialysis_date = ? and status = 1", patient_id, recordDate).Last(&order).Error
+	return order, err
+}

service/patientmanage_service.go

@@ -640,7 +640,7 @@ func GetDryWeightDetail(id int64) (models.SgjPatientDryweights, error) {
 }
 
 func GetlongDialysisrecord(patientid int64, startime int64, endtime int64, limit int64, page int64, orgid int64) (prescription []*models.XtDialysisSolution, total int64, err error) {
-	db := XTReadDB().Table("xt_dialysis_solution as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_dialysis_solution as x").Where("x.status = 1 and x.solution_status=1")
 	if patientid > 0 {
 		db = db.Where("x.patient_id = ?", patientid)
 	}

service/pharmacy_service.go

@@ -678,6 +678,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 
 	if orgid != 10480 {
 		for _, v := range advice_info {
+
 			tmp_bool := IsPharmacyConfig(orgid)
 			if tmp_bool {
 				if PettyCash(v.DrugId) {
@@ -779,6 +780,143 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	return
 }
 
+func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err error) {
+
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
+	//查询当前患者未发药的列表
+	adviceList, err := GetHisPatientNoMedical(orgid, patient_id, stime, etime)
+	//发药
+	if len(adviceList) > 0 {
+		for _, item := range adviceList {
+			//扣减库存
+			err = HisDrugsDelivery(orgid, creater, item)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			//修改发药状态
+			err = UpdateIsMedicalHisAdvice(item.ID)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			err = UpdateHisPrescription(item.PrescriptionId)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+
+			//查询默认仓库
+			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
+			//查询默认仓库剩余多少库存
+			var sum_count int64
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, item.DrugId)
+			for _, its := range stockInfo {
+				baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			UpdateBaseDrugSumTwo(item.DrugId, sum_count, orgid)
+			//扣减库存
+			UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
+			over, _ := FindOverCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut)
+			UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+		}
+	}
+
+	advice, err := GetDocAdviceList(orgid, patient_id, stime, etime)
+
+	if len(advice) > 0 {
+		for _, item := range advice {
+			err = DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+			//查询默认仓库
+			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
+			//查询默认仓库剩余多少库存
+			var sum_count int64
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, item.DrugId)
+			for _, its := range stockInfo {
+				baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			UpdateBaseDrugSumTwo(item.DrugId, sum_count, orgid)
+			//扣减库存
+			UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
+			over, _ := FindOverCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut)
+			UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			err = UpdateIsAdvice(item.ID)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+		}
+	}
+
+	//生成明细记录
+	tmp_ph := models.Pharmary{
+		UserOrgId:  orgid,
+		PatientId:  patient_id,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		Status:     1,
+		RecordDate: time.Now().Unix(),
+	}
+	err = tx.Create(&tmp_ph).Error
+
+	return
+}
+
+func GetHisPatientNoMedical(user_org_id int64, patient_id int64, startime int64, end_time int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and patient_id = ? and advice_date>=? and advice_date<=? and is_medicine =0", user_org_id, patient_id, startime, end_time).Find(&advice).Error
+	return advice, err
+}
+
+func UpdateIsMedicalHisAdvice(id int64) (err error) {
+	adviceInfo := models.HisDoctorAdviceInfo{}
+	err = XTWriteDB().Model(&adviceInfo).Where("id =? and status =1", id).Update(map[string]interface{}{"is_medicine": 1, "dispensing_time": time.Now().Unix()}).Error
+	return err
+}
+func UpdateHisPrescription(id int64) (err error) {
+
+	prescriptionInfo := models.HisPrescription{}
+	err = XTWriteDB().Model(&prescriptionInfo).Where("id = ? and status=1", id).Update(map[string]interface{}{"is_medicine": 1, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetDocAdviceList(user_org_id int64, patient_id int64, startime int64, end_time int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and patient_id = ? and advice_date>=? and advice_date<=? and is_medicine =0", user_org_id, patient_id, startime, end_time).Find(&advice).Error
+	return advice, err
+
+}
+
+func UpdateIsAdvice(id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"is_medicine": 1, "dispensing_time": time.Now().Unix()}).Error
+	return err
+}
+
 // 患者退药按钮点击
 func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error) {
 	//开事务

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -308,6 +308,7 @@ type AssessmentBeforeDislysisVM struct {
 	WhetherUnobstructed            int64   `gorm:"column:whether_unobstructed" json:"whether_unobstructed" form:"whether_unobstructed"`
 	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
 	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
+	PunctureNeedleDirection        string  `gorm:"column:puncture_needle_direction" json:"puncture_needle_direction" form:"puncture_needle_direction"`
 }
 
 func (AssessmentBeforeDislysisVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -229,13 +229,13 @@ func GetDialysisOrderCountTen(patient_id int64, recordDate int64) (models.VmDial
 
 func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
 	return order, err
 }
 
 func GetDialysisOrderCountNight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1704038400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
 	return order, err
 }
 

service/schedule_service.go

@@ -243,7 +243,7 @@ func GetNextSchedule(orgID, end, patientID int64) (schedules []*models.PatientSc
 func GetNextScheduleByList(patient_id int64, schedule_date int64, user_org_id int64) (models.SchedulePatientsOne, error) {
 
 	patientsOne := models.SchedulePatientsOne{}
-	err := XTReadDB().Where("patient_id = ? and schedule_date >? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).First(&patientsOne).Error
+	err := XTReadDB().Where("patient_id = ? and schedule_date >? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Order("schedule_date asc").First(&patientsOne).Error
 	return patientsOne, err
 }
 
@@ -1763,6 +1763,18 @@ func CreateScheduleLog(log models.XtScheduleLog) error {
 	return err
 }
 
+func GetDoctorAdviceListTwenty(patient_id int64, schedule_date int64, user_org_id int64) (advice []*models.XtDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&advice).Error
+	return advice, err
+}
+
+func UpdateAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	return err
+}
+
 func GetLastSchedule(patient_id int64, user_org_id int64) (models.XtSchedule, error) {
 
 	schedule := models.XtSchedule{}

service/sign_service.go

@@ -2099,7 +2099,7 @@ func UpdateSchPatient(patient_id int64, schedule_date int64, user_org_id int64,
 
 func GetNewAllpatient(org_id int64) (list []*models.XtPatientsNew, err error) {
 
-	err = XTReadDB().Where("status =1 and user_org_id =9990").Find(&list).Error
+	err = XTReadDB().Where("status =1 and user_org_id =10567").Find(&list).Error
 
 	return list, err
 }
@@ -2141,3 +2141,62 @@ func UpdateDialysisSchedule(id int64, dialysis_machine_name string) error {
 	err := XTWriteDB().Model(models.XtSchedule{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"dialysis_machine_name": dialysis_machine_name}).Error
 	return err
 }
+
+func GetPrescriptionListOne(user_org_id int64) (prescription []*models.DialysisPrescription, err error) {
+
+	err = XTReadDB().Model(&prescription).Where("user_org_id = ? and status= 1 and record_date =? and status=1", 10579, 1701360000).Find(&prescription).Error
+	return prescription, err
+}
+
+func GetPatientScheduleById(patient_id int64, schedule_date int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+
+	err := XTReadDB().Where("patient_id= ? and schedule_date = ? and status =1 and user_org_id =10579", patient_id, schedule_date).First(&schedule).Error
+
+	return schedule, err
+}
+
+func UpdateDialysisScheduleOne(id int64, mode_id int64, dialysis_machine_name string) error {
+
+	err := XTWriteDB().Model(models.XtSchedule{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"dialysis_machine_name": dialysis_machine_name, "mode_id": mode_id}).Error
+	return err
+}
+
+func GetDialysisOrderTotalCount() (order []*models.XtDialysisOrderLost, err error) {
+
+	err = XTReadDB().Select("patient_id,Count(id) as count").Where("user_org_id = ? and status =1", 10265).Group("patient_id").Find(&order).Error
+
+	return order, err
+}
+
+func ModifyPatient(patient_id int64, count int64) (models.XtPatients, error) {
+
+	patients := models.XtPatients{}
+	err := XTReadDB().Model(&models.XtPatients{}).Where("id = ? and status =1", patient_id).Updates(map[string]interface{}{"total_dialysis": count}).Error
+	return patients, err
+}
+
+func UpdateDrugWarehouseInfoByDrug(drug_id int64, reatial_price float64, user_org_id int64) (models.DrugWarehouseInfo, error) {
+
+	drugWarehouseInfo := models.DrugWarehouseInfo{}
+
+	err := XTWriteDB().Model(&drugWarehouseInfo).Where("drug_id = ? and org_id =?", drug_id, user_org_id).Updates(map[string]interface{}{"retail_price": reatial_price}).Error
+
+	return drugWarehouseInfo, err
+}
+
+func UpdasteGoodWarehouseInfoByGood(good_id int64, packing_price float64, org_id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("good_id=? and org_id = ? and status =1", good_id, org_id).Updates(map[string]interface{}{"packing_price": packing_price}).Error
+	return info, err
+}
+
+func UpdateHisDoctorAdviceOne(drug_id int64, retail_price float64, user_org_id int64) (models.HisDoctorAdvice, error) {
+
+	advice := models.HisDoctorAdvice{}
+
+	err := XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("drug_id = ? and user_org_id = ?  and status=1", drug_id, user_org_id).Updates(map[string]interface{}{"price": retail_price}).Error
+	return advice, err
+}

service/stock_service.go

@@ -1770,6 +1770,7 @@ type DrugWarehouseOutInfo struct {
 	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {

service/warhouse_service.go

@@ -6011,6 +6011,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			RetailPrice:             drug_price, //手动出库出库价格
 			WarehousingId:           warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
 		}
 		if warehouse.RetailPrice == 0 {
 			drugflow.Price = advice.Price
@@ -6080,6 +6081,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			WarehousingId:           warehouse.ID,
 			WarehousingDetailId:     warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
 		}
 
 		CreateDrugFlowOne(drugflow)