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

@@ -72,10 +72,10 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 4608
+		userAdmin.Id = 5386
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 4608 //4，809
+		userAdmin.Id = 5386 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -94,7 +94,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 7421  //4
+		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -318,10 +318,10 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 4608
+		userAdmin.Id = 5386
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 4608 //4，809
+		userAdmin.Id = 5386 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -340,7 +340,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 7421  //4
+		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -151,6 +151,8 @@ func DialysisApiRegistRouters() {
 
 	beego.Router("/api/schedule/getdialysisproject", &DialysisApiController{}, "Get:GetDialysisProject")
 
+	beego.Router("/api/schedule/getpatientbefor", &DialysisApiController{}, "Get:GetPatientBefor")
+
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -3178,7 +3180,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
@@ -5614,7 +5616,7 @@ func (c *DialysisApiController) UploadDryWeight() {
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
 
 		//康桥
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10164 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10721 {
 			timeNowStr := time.Now().Format("2006-01-02")
 			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
 
@@ -6177,6 +6179,7 @@ func (this *DialysisApiController) SaveDialysisSetting() {
 	gansuna_set, _ := this.GetInt64("gansuna_set")
 	zhetangtie_set, _ := this.GetInt64("zhetangtie_set")
 	niaojimei_set, _ := this.GetInt64("niaojimei_set")
+	dialysis_strainer_set, _ := this.GetInt64("dialysis_strainer_set")
 	dialysisSetting := models.XtDialysisSetting{
 		Sodium:                     sodium_set,
 		Calcium:                    calcium_set,
@@ -6215,6 +6218,7 @@ func (this *DialysisApiController) SaveDialysisSetting() {
 		GansunaSet:                 gansuna_set,
 		ZhetangtieSet:              zhetangtie_set,
 		NiaojimeiSet:               niaojimei_set,
+		DialysisStrainerSet:        dialysis_strainer_set,
 	}
 	err := service.SaveDialysisSetting(dialysisSetting)
 	if err == nil {
@@ -7959,3 +7963,31 @@ func (this *DialysisApiController) GetDialysisTotalCount() {
 		"order": order,
 	})
 }
+
+func (this *DialysisApiController) GetPatientBefor() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	record_date := this.GetString("record_date")
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	user_org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	var startdateunix int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startdateunix = theTime.Unix()
+	}
+
+	patientBefor, _ := service.GetPatientBefor(patient_id, startdateunix, user_org_id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientBefor": patientBefor,
+	})
+}

controllers/doctors_api_controller.go

@@ -109,6 +109,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
+	drugs, _ := service.GetAllBaseDrugLibListTwo(orgID)
+
 	if config.IsOpen == 0 || config.IsOpen == 2 {
 		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency, keyword)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
@@ -127,6 +129,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 				"adminUser":      adminUser,
 				"config":         config,
 				"project_config": project_config,
+				"drugs":          drugs,
 			})
 		}
 	}
@@ -167,6 +170,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 				"project_config": project_config,
 				"project":        project,
 				"drug":           drug,
+				"drugs":          drugs,
 			})
 		}
 	}
@@ -349,7 +353,7 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 	}
 
 	//康桥
-	if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10164 {
+	if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10721 {
 		timeNowStr := time.Now().Format("2006-01-02")
 		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
 

controllers/his_api_controller.go

@@ -3385,7 +3385,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3967,6 +3967,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 									if p.Type == 3 {
 										lastWarehouse, _ := service.FindFirstWarehousingInfoByStockThree(p.ProjectId, storeConfig.DrugStorehouseOut)
+
 										if p.Price != lastWarehouse.PackingPrice {
 											p.Price = lastWarehouse.PackingPrice
 										}
@@ -4012,7 +4013,445 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								//查询保存耗材出库开关是否打开
 								if p.PatientId != 30038 {
-									if goodOutConfig.IsOpen == 1 {
+
+									//用机构ID区分
+									if adminInfo.CurrentOrgId != 10721 && adminInfo.CurrentOrgId != 10164 {
+										if goodOutConfig.IsOpen == 1 {
+											//耗材出库
+											if p.Type == 3 {
+
+												//对比当前数据和历史出库数据
+
+												historyProject, _ := service.GetHistoryProject(p.PatientId, p.UserOrgId, p.RecordDate, p.ID, p.ProjectId, tx)
+
+												historyCount, _ := strconv.ParseInt(historyProject.Count, 10, 64)
+
+												nowCount, _ := strconv.ParseInt(p.Count, 10, 64)
+
+												//如果当前处方数量大于历史数据,则需要出库
+												if nowCount > historyCount {
+
+													var cha_count int64
+													cha_count = nowCount - historyCount
+
+													timeStr := time.Now().Format("2006-01-02")
+													timeArr := strings.Split(timeStr, "-")
+													total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
+
+													total = total + 1
+													warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+													number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+													number = number + total
+													warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+
+													operation_time := time.Now().Unix()
+													creater := c.GetAdminUserInfo().AdminUser.Id
+
+													recordDateStr := time.Now().Format("2006-01-02")
+													recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+													nowtime := recordDate.Unix()
+													warehouseOut := models.WarehouseOut{
+														WarehouseOutOrderNumber: warehousing_out_order,
+														OperationTime:           operation_time,
+														OrgId:                   adminInfo.CurrentOrgId,
+														Creater:                 creater,
+														Ctime:                   time.Now().Unix(),
+														Status:                  1,
+														WarehouseOutTime:        nowtime,
+														Type:                    1,
+														StorehouseId:            storeConfig.StorehouseOutInfo,
+														IsCheck:                 1,
+														IsSys:                   1,
+													}
+													//查询是否生成出库单
+													out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+													if out.ID == 0 {
+														service.AddNewSigleWarehouseOut(&warehouseOut, tx)
+													}
+
+													lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+
+													goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+													houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+
+													dialyPrepareOne := models.DialysisBeforePrepare{
+														GoodTypeId:   goodObj.GoodTypeId,
+														GoodId:       p.ProjectId,
+														PatientId:    p.PatientId,
+														RecordDate:   p.RecordDate,
+														UserOrgId:    adminInfo.CurrentOrgId,
+														Count:        cha_count,
+														Ctime:        time.Now().Unix(),
+														Creater:      creater,
+														Status:       1,
+														StorehouseId: houseConfig.StorehouseOutInfo,
+														ProjectId:    p.ID,
+													}
+													//出库
+													service.ConsumableNewHisPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, tx)
+
+												}
+
+												//如果当前处方数量小于历史数据，怎需要退库
+												if nowCount < historyCount {
+
+													var cha_count int64
+													cha_count = historyCount - nowCount
+													goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+													creater := c.GetAdminUserInfo().AdminUser.Id
+
+													newPrescriptionProject := &models.HisPrescriptionProject{
+														ID:                   p.ID,
+														ProjectId:            p.ProjectId,
+														Price:                p.Price,
+														UserOrgId:            p.UserOrgId,
+														Status:               1,
+														Ctime:                time.Now().Unix(),
+														Mtime:                time.Now().Unix(),
+														PatientId:            p.PatientId,
+														HisPatientId:         p.HisPatientId,
+														RecordDate:           p.RecordDate,
+														PrescriptionId:       p.PrescriptionId,
+														Count:                p.Count,
+														FeedetlSn:            p.FeedetlSn,
+														MedListCodg:          p.MedListCodg,
+														SingleDose:           p.SingleDose,
+														DeliveryWay:          p.DeliveryWay,
+														ExecutionFrequency:   p.ExecutionFrequency,
+														Day:                  p.Day,
+														HisProject:           models.HisProject{},
+														GoodInfo:             models.GoodInfo{},
+														Remark:               p.Remark,
+														Unit:                 p.Unit,
+														Type:                 p.Type,
+														Doctor:               p.Doctor,
+														ExecutionTime:        p.ExecutionTime,
+														ExecutionStaff:       p.ExecutionStaff,
+														ExecutionState:       p.ExecutionState,
+														CheckTime:            p.CheckTime,
+														CheckState:           p.CheckState,
+														Checker:              p.Checker,
+														StartTime:            p.StartTime,
+														TeamId:               p.TeamId,
+														XtHisProjectTeam:     models.XtHisProjectTeam{},
+														FrequencyType:        p.FrequencyType,
+														DayCount:             p.DayCount,
+														WeekDay:              p.WeekDay,
+														IsCheckTeam:          p.IsCheckTeam,
+														HisOrderInfo:         models.HisOrderInfo{},
+														ExecutionFrequencyId: p.ExecutionFrequencyId,
+														IsOut:                p.IsOut,
+														YbSyncStatus:         p.YbSyncStatus,
+													}
+
+													service.NewHisGoodCancelInfo(adminInfo.CurrentOrgId, creater, newPrescriptionProject, cha_count, goodObj, tx)
+
+													service.NewHisGoodAutoCancelInfo(adminInfo.CurrentOrgId, creater, newPrescriptionProject, cha_count, goodObj, tx)
+
+												}
+
+												if nowCount == historyCount {
+													if historyCount == 0 {
+														recordDateStr := time.Now().Format("2006-01-02")
+														recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+														nowtime := recordDate.Unix()
+														lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+														goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+														houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+														creater := c.GetAdminUserInfo().AdminUser.Id
+														dialyPrepareOne := models.DialysisBeforePrepare{
+															GoodTypeId:   goodObj.GoodTypeId,
+															GoodId:       p.ProjectId,
+															PatientId:    p.PatientId,
+															RecordDate:   p.RecordDate,
+															UserOrgId:    adminInfo.CurrentOrgId,
+															Count:        nowCount,
+															Ctime:        time.Now().Unix(),
+															Creater:      creater,
+															Status:       1,
+															StorehouseId: houseConfig.StorehouseOutInfo,
+															ProjectId:    p.ID,
+														}
+														//出库
+														service.ConsumableNewHisPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, tx)
+													}
+												}
+
+												lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
+												//查询历史出库数据
+												flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+
+												var out_count_five int64
+												for _, item := range flowGood {
+													out_count_five += item.Count
+												}
+												parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
+
+												//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
+												if out_count_five != parseIntCount {
+													service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+													detail := models.AutomaticReduceDetail{
+														WarehouseOutId:          0,
+														WarehouseOutOrderNumber: "",
+														PatientId:               p.PatientId,
+														Ctime:                   time.Now().Unix(),
+														Mtime:                   0,
+														Status:                  1,
+														RecordTime:              p.RecordDate,
+														OrgId:                   p.UserOrgId,
+														GoodId:                  p.ProjectId,
+														GoodTypeId:              0,
+														Count:                   parseIntCount,
+														Type:                    0,
+														ProjectId:               lastHisProject.ID,
+														StorehouseId:            0,
+													}
+
+													service.CreateNewAutoDetail(detail, tx)
+												}
+												//	//查询耗材最后一次出库记录
+												//	wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(p.ProjectId, patient_id, recordDateTime, lastHisProject.ID)
+												//	//查询默认出库仓库库存
+												//	storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+												//	if len(wareOut) > 0 {
+												//
+												//		for _, it := range wareOut {
+												//			//回退库存
+												//			service.ModifyGoodWarehouseInfo(it.GoodId, it.WarehouseInfotId, it.OrgId, it.Count)
+												//
+												//			//删除出库记录
+												//			service.DeleteGoodWarehouseOutInfo(it.GoodId, it.SysRecordTime, it.OrgId, it.ProjectId)
+												//
+												//		}
+												//	}
+												//
+												//	timeStr := time.Now().Format("2006-01-02")
+												//	timeArr := strings.Split(timeStr, "-")
+												//	total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
+												//
+												//	total = total + 1
+												//	warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+												//	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+												//	number = number + total
+												//	warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+												//
+												//	operation_time := time.Now().Unix()
+												//	creater := c.GetAdminUserInfo().AdminUser.Id
+												//
+												//	recordDateStr := time.Now().Format("2006-01-02")
+												//	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+												//	nowtime := recordDate.Unix()
+												//	warehouseOut := models.WarehouseOut{
+												//		WarehouseOutOrderNumber: warehousing_out_order,
+												//		OperationTime:           operation_time,
+												//		OrgId:                   adminInfo.CurrentOrgId,
+												//		Creater:                 creater,
+												//		Ctime:                   time.Now().Unix(),
+												//		Status:                  1,
+												//		WarehouseOutTime:        nowtime,
+												//		Type:                    1,
+												//		StorehouseId:            storeConfig.StorehouseOutInfo,
+												//		IsCheck:                 1,
+												//		IsSys:                   1,
+												//	}
+												//	//查询是否生成出库单
+												//	out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+												//	if out.ID == 0 {
+												//		service.AddNewSigleWarehouseOut(&warehouseOut, tx)
+												//	}
+												//
+												//	lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+												//
+												//	goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+												//	houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+												//
+												//	dialyPrepareOne := models.DialysisBeforePrepare{
+												//		GoodTypeId:   goodObj.GoodTypeId,
+												//		GoodId:       p.ProjectId,
+												//		PatientId:    p.PatientId,
+												//		RecordDate:   p.RecordDate,
+												//		UserOrgId:    adminInfo.CurrentOrgId,
+												//		Count:        parseIntCount,
+												//		Ctime:        time.Now().Unix(),
+												//		Creater:      creater,
+												//		Status:       1,
+												//		StorehouseId: houseConfig.StorehouseOutInfo,
+												//		ProjectId:    lastHisProject.ID,
+												//	}
+												//	//判断是否是零用耗材(非零用)
+												//	if goodObj.IsUse == 2 || goodObj.IsUse == 0 {
+												//
+												//		//查询历史出库数据
+												//		flowGood, _ := service.GetNewStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+												//		var out_count int64
+												//		for _, item := range flowGood {
+												//			out_count += item.Count
+												//		}
+												//		//如果历史数和当前数据不想等才进行退库出库
+												//		if out_count != parseIntCount {
+												//			service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
+												//
+												//			service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+												//			detail := models.AutomaticReduceDetail{
+												//				WarehouseOutId:          0,
+												//				WarehouseOutOrderNumber: "",
+												//				PatientId:               p.PatientId,
+												//				Ctime:                   time.Now().Unix(),
+												//				Mtime:                   0,
+												//				Status:                  1,
+												//				RecordTime:              p.RecordDate,
+												//				OrgId:                   p.UserOrgId,
+												//				GoodId:                  p.ProjectId,
+												//				GoodTypeId:              0,
+												//				Count:                   parseIntCount,
+												//				Type:                    0,
+												//				ProjectId:               lastHisProject.ID,
+												//				StorehouseId:            0,
+												//			}
+												//
+												//			service.CreateNewAutoDetail(detail, tx)
+												//
+												//			//查询剩余库存
+												//			goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
+												//			var sum_count int64
+												//			for _, item := range goodList {
+												//				sum_count += item.StockCount
+												//			}
+												//
+												//			//更新剩余库存
+												//			service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+												//
+												//			//耗材
+												//			service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+												//
+												//		}
+												//		//判断是否是零用耗材(零用但是是出库耗材)
+												//		if goodObj.IsUse == 1 && goodObj.IsWarehouse == 1 {
+												//
+												//			//查询历史出库数据
+												//			flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+												//			var out_count int64
+												//			for _, item := range flowGood {
+												//				out_count += item.Count
+												//			}
+												//			//如果历史数和当前数据不想等才进行退库出库
+												//			if out_count != parseIntCount {
+												//				service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
+												//
+												//				service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+												//				detail := models.AutomaticReduceDetail{
+												//					WarehouseOutId:          0,
+												//					WarehouseOutOrderNumber: "",
+												//					PatientId:               p.PatientId,
+												//					Ctime:                   time.Now().Unix(),
+												//					Mtime:                   0,
+												//					Status:                  1,
+												//					RecordTime:              p.RecordDate,
+												//					OrgId:                   p.UserOrgId,
+												//					GoodId:                  p.ProjectId,
+												//					GoodTypeId:              0,
+												//					Count:                   parseIntCount,
+												//					Type:                    0,
+												//					ProjectId:               p.ID,
+												//					StorehouseId:            0,
+												//				}
+												//
+												//				service.CreateNewAutoDetail(detail, tx)
+												//
+												//				//查询剩余库存
+												//				goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
+												//				var sum_count int64
+												//				for _, item := range goodList {
+												//					sum_count += item.StockCount
+												//				}
+												//
+												//				//更新剩余库存
+												//				service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+												//
+												//				//耗材
+												//				service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+												//			}
+												//
+												//		}
+												//
+												//	}
+												//
+												//}
+
+												//记录日志
+												byterequest, _ := json.Marshal(p)
+												adviceLog := models.XtDoctorAdviceLog{
+													UserOrgId:   p.UserOrgId,
+													PatientId:   p.PatientId,
+													AdminUserId: adminInfo.AdminUser.Id,
+													Module:      1,
+													ErrLog:      string(byterequest),
+													Status:      1,
+													Ctime:       time.Now().Unix(),
+													Mtime:       0,
+													Source:      "电脑端新建his项目",
+													RecordDate:  p.RecordDate,
+												}
+												service.CreateDoctorAdviceLog(adviceLog)
+
+												projectList = append(projectList, p)
+
+												if p.Type == 2 { //因为项目和耗材的基础库存在id相同的情况，所以需要根据该字段来判断，type为2的话为从项目开出来的
+													//新增或者编辑项目，修改对应的标签数据
+													labelOrigin, _ := service.GetProjectById(p.UserOrgId, p.ID, patient_id, recordDateTime)
+													if labelOrigin.ID == 0 { //当天某个人的处方中的项目不存在
+														var label models.HisLabelPrintInfo
+														project, _ := service.GetProjectDetail(p.ProjectId)
+														if project.CostClassify == 3 { //类别为检验检查
+															if p.TeamId > 0 { //检验检查组套
+																tempLabel, _ := service.GetProjectByTeamId(p.UserOrgId, p.TeamId, patient_id, recordDateTime)
+																if tempLabel.ID == 0 {
+																	team, _ := service.GetProjectTeamDetail(p.TeamId)
+																	label.Number = tempPrescription.PrescriptionNumber
+																	label.ProjectId = project.ID
+																	label.Status = 1
+																	label.IsPrint = 2
+																	label.DoctorId = info.DoctorId
+																	label.UserOrgId = p.UserOrgId
+																	label.PatientId = patient_id
+																	label.RecordDate = recordDateTime
+																	label.Ctime = time.Now().Unix()
+																	label.Mtime = time.Now().Unix()
+																	label.ItemId = p.TeamId
+																	label.FeedetlSn = p.FeedetlSn
+																	label.PProjectId = p.ID
+																	label.ProjectName = team.ProjectTeam
+																	label.PatientName = patient.Name
+																	service.CreateNewHisLabelRecord(&label, tx)
+																}
+															} else { //单条检验检查项目
+																label.Number = tempPrescription.PrescriptionNumber
+																label.ProjectId = project.ID
+																label.Status = 1
+																label.DoctorId = info.DoctorId
+																label.UserOrgId = p.UserOrgId
+																label.PatientId = patient_id
+																label.RecordDate = recordDateTime
+																label.IsPrint = 2
+																label.Ctime = time.Now().Unix()
+																label.Mtime = time.Now().Unix()
+																label.FeedetlSn = p.FeedetlSn
+																label.PProjectId = p.ID
+																label.ItemId = p.TeamId
+																label.ProjectName = project.ProjectName
+																label.PatientName = patient.Name
+																service.CreateNewHisLabelRecord(&label, tx)
+															}
+														}
+													}
+												}
+
+											}
+										}
+									}
+
+									if adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10164 {
+
 										//耗材出库
 										if p.Type == 3 {
 
@@ -4024,9 +4463,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											nowCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
-											//fmt.Println("p----------------------------------------------------", p.ProjectId)
-											//fmt.Println("p----------------------------------------------------", nowCount)
-											//fmt.Println("p----------------------------------------------------", historyCount)
 											//如果当前处方数量大于历史数据,则需要出库
 											if nowCount > historyCount {
 
@@ -4186,9 +4622,6 @@ func (c *HisApiController) CreateHisPrescription() {
 											}
 											parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
-											//fmt.Println("p.ProjectId-----------------", p.ProjectId)
-											//fmt.Println("out_count_five===============", out_count_five)
-											//fmt.Println("parseIntCount===============", parseIntCount)
 											//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
 											if out_count_five != parseIntCount {
 												service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
@@ -4450,6 +4883,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										}
 									}
+
 								}
 
 								//插入检验数据

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -960,7 +960,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对患者称重两次没有数据的问题
-		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 {
 
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -118,6 +118,7 @@ func (this *DialysisAPIController) Scheduals() {
 				dobulecheck, _ := service.GetAllDobuleCheckList(orgID, date.Unix())
 
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
+
 				inforMation, _ := service.GetTodayInforMation(orgID, date.Unix())
 
 				//monitor, _ := service.GetMonitorByListSix(orgID, date.Unix())
@@ -561,8 +562,6 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	projects, _ = service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
 
-	fmt.Print("projectOne------------------------", projectsOne)
-
 	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
 
 	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminInfo.Org.Id)
@@ -2803,6 +2802,11 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.ActualUltrafiltration = UltrafiltrationVolumeOne
 		}
 
+		if adminUserInfo.Org.Id == 10721 {
+			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+			tempassessmentAfterDislysis.SystolicBloodPressure = 0
+		}
+
 		if adminUserInfo.Org.Id == 10697 {
 			lastWeightAfter, _ := service.GetLastWeightAfter(tempassessmentAfterDislysis.PatientId, tempassessmentAfterDislysis.AssessmentDate, adminUserInfo.Org.Id)
 			floatAfeter := strconv.FormatFloat(lastWeightAfter.WeightAfter, 'f', -1, 64)
@@ -3080,6 +3084,11 @@ func (c *DialysisAPIController) Finish() {
 		lastWeightAfter.LastAfterWeight = floatAfeter
 	}
 
+	if adminUserInfo.Org.Id == 10721 {
+		tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+		tempassessmentAfterDislysis.SystolicBloodPressure = 0
+	}
+
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
@@ -3630,6 +3639,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	var ultrafiltration_rate float64
 	var ultrafiltration_rate_one string
+	var replacement_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
 	//后期预增脱水量
 	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
@@ -3769,6 +3779,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		CreatedTime:            time.Now().Unix(),
 		UpdatedTime:            time.Now().Unix(),
 		UltrafiltrationRateOne: ultrafiltration_rate_one,
+		ReplacementRate:        replacement_rate,
 	}
 
 	//只针对广慈医院
@@ -4921,6 +4932,22 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 
 	}
+
+	if adminInfo.Org.Id == 10721 {
+		var replacement_rate float64
+		var displacement_quantity float64
+		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+		replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*60) / 1000
+		fmt.Println("replacement_rate-----------------", replacement_rate)
+		record.ReplacementRate = replacement_rate
+
+		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
+		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
+		fmt.Println("displacement_quantity-----------------", displacement_quantity)
+		record.DisplacementQuantity = displacement_quantity
+
+	}
+
 	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -6164,7 +6191,7 @@ func (c *DialysisAPIController) UploadDryWeight() {
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
 
 		//康桥
-		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10164 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10721 {
 			timeNowStr := time.Now().Format("2006-01-02")
 			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
 
@@ -6469,6 +6496,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
+		fmt.Println("active-----------------------", active)
+		fmt.Println("len(goods)-----------------------", len(goods))
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1418,7 +1418,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 											//查询今日是否出库
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 											if drugOutInfo.ID == 0 {
-												if item.UserOrgId != 10644 {
+												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 												}
 
@@ -1428,7 +1428,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										if pharmacyConfig.IsOpen != 1 {
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 											if drugOutInfo.ID == 0 {
-												if item.UserOrgId != 10644 {
+												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 												}
 
@@ -1455,7 +1455,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 										if drugOutInfo.ID == 0 {
-											if item.UserOrgId != 10644 {
+											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 											}
 
@@ -1479,7 +1479,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										service.CreateDrugError(drugError)
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 										if drugOutInfo.ID == 0 {
-											if item.UserOrgId != 10644 {
+											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 											}
 
@@ -1591,7 +1591,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询今日是否出库
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										if item.UserOrgId != 10644 {
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 
@@ -1601,7 +1601,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询今日是否出库
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										if item.UserOrgId != 10644 {
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 
@@ -4207,7 +4207,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//针对孝昌康桥超滤率计算问题
-	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 {
+	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -46,9 +46,13 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
 		var vlist []interface{}
 		var elist []interface{}
+
 		for _, item := range patient {
 			prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgid, theTime.Unix())
+			solution, _ := service.GetDialysisSolution(orgid, item.PatientId, item.ModeId)
+			item.DialysisSolution = solution
 			vlist = append(vlist, prescription)
+
 			dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, orgid, theTime.Unix())
 
 			elist = append(elist, dialysis)
@@ -68,14 +72,19 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 		dialysisSchedule, err, total := service.GetDialysisParameter(orgid, theTime.Unix(), scheduleType, partitionType, page, limit)
 		//查询今日排班的病人
 		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
+
 		var vlist []interface{}
 		var elist []interface{}
+
 		for _, item := range patient {
 			prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgid, theTime.Unix())
 			vlist = append(vlist, prescription)
 			dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, orgid, theTime.Unix())
-			fmt.Println("dialysis-------------------------------------------", dialysis)
 			elist = append(elist, dialysis)
+
+			solution, _ := service.GetDialysisSolution(orgid, item.PatientId, item.ModeId)
+			item.DialysisSolution = solution
+
 		}
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{

controllers/patient_api_controller.go

@@ -231,6 +231,7 @@ func (c *PatientApiController) GetPatientsList() {
 	isscheduling, _ := c.GetInt64("isscheduling", 0)
 	isprescription, _ := c.GetInt64("isprescription", 0)
 	patientSoureType, _ := c.GetInt64("patientSoureType")
+	patient_type, _ := c.GetInt64("patient_type")
 	nurse, _ := c.GetInt64("nurse")
 	if page <= 0 {
 		page = 1
@@ -270,7 +271,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 	var patients []*models.Patients
 	var total int64
-	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse)
+	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse, patient_type)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
@@ -2613,7 +2614,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										if item.UserOrgId != 10644 {
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 										}
 
@@ -2625,7 +2626,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										if item.UserOrgId != 10644 {
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 										}
 
@@ -2681,7 +2682,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 								drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 								if drugOutInfo.ID == 0 {
-									if item.UserOrgId != 10644 {
+									if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 									}
 
@@ -2692,7 +2693,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 								drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 								if drugOutInfo.ID == 0 {
-									if item.UserOrgId != 10644 {
+									if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 									}
 
@@ -4689,14 +4690,17 @@ func (c *PatientApiController) GetPatientDialysisRecords() {
 
 	adminInfo := c.GetAdminUserInfo()
 	records, total, _ := service.GetPatientDialysisRecord(adminInfo.CurrentOrgId, patientID, page, limit, theStartTIme, theEndtTIme, mode_id)
-
+	fmt.Println("长度", len(records))
 	if len(records) == 0 {
-		list, _ := service.GetAllDialysisOrder(patientID)
+		list, _ := service.GetAllDialysisOrder(patientID, theStartTIme, theEndtTIme)
 		for _, item := range list {
 			schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, adminInfo.CurrentOrgId, item.BedId, item.ZoneId, item.SchedualType)
-			service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, adminInfo.CurrentOrgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
+			prescribeOne, _ := service.GetDialysisPrescribeOne(adminInfo.CurrentOrgId, item.PatientId, item.DialysisDate)
+
+			service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, adminInfo.CurrentOrgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID, prescribeOne.ModeId)
 		}
 	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"total":   total,
 		"records": records,

controllers/patient_dataconfig_api_controller.go

@@ -262,15 +262,15 @@ func (this *PatientDataConfigAPIController) DeleteSickHistory() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	recordIDStrs := strings.Split(idsStr, ",")
 	recordIDs := make([]int64, 0, len(recordIDStrs))
@@ -312,17 +312,16 @@ func (this *PatientDataConfigAPIController) ModifySickHistory() {
 	//loc, _ := time.LoadLocation("Local")
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
-	fmt.Println("checkDate--------------", checkDate)
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	now := time.Now().Unix()
 

controllers/sign_api_controller.go

@@ -1227,7 +1227,7 @@ func (this *SignApiController) ToAutoDrug() {
 
 func (this *SignApiController) ToAutoDiagnose() {
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//order, _ := service.GetDialysisOrderTotalCount()
 	//
@@ -1242,12 +1242,12 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	list, _ := service.GetAllDialysisOrderTwo(10892)
-	fmt.Println("list=============", list)
-	for _, item := range list {
-		schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
-		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
-	}
+	//list, _ := service.GetAllDialysisOrderTwo(10340)
+	//
+	//for _, item := range list {
+	//	schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
+	//}
 
 	//drugList, _ := service.GetAllBaseDrugList(10318)
 	//for _, item := range drugList {
@@ -1261,6 +1261,12 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdasteGoodWarehouseInfoByGood(item.ID, item.PackingPrice, item.OrgId)
 	//}
 
+	list, _ := service.GetAllDialysisPrescription(29190)
+
+	for _, item := range list {
+		service.UpdateSchedulePrescrition(item.PatientId, item.RecordDate, item.UserOrgId, item.ModeId)
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})

controllers/sign_weigh_api_controller.go

@@ -1,16 +1,17 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 )
 
 func SignWeighAPIControllerRegistRouters() {
@@ -490,7 +491,6 @@ func (c *SignWeighAPIController) Sighdata() {
 func (c *SignWeighAPIController) UpdateSignweight() {
 	patientID, _ := c.GetInt64("patient_id", 0)
 	dateTime := c.GetString("date_time")
-	fmt.Println("病人ID", patientID, dateTime)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", dateTime+" 00:00:00", loc)
@@ -506,11 +506,9 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 	weight_before, _ := c.GetFloat("weight_before", 0)
 	dry_weight, _ := c.GetFloat("dry_weight", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
-	fmt.Println("温度", temperature)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
-	fmt.Println("dry_weight", dry_weight)
 	var predialysisevaluation models.PredialysisEvaluation
 	predialysisevaluation.PatientId = patientID
 	predialysisevaluation.UserOrgId = adminUserInfo.CurrentOrgId
@@ -527,7 +525,30 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 	predialysis, errcode := service.GetDislysisBerfore(adminUserInfo.CurrentOrgId, dateTimeStam, patientID)
 	fmt.Println("sigh", predialysis)
 	fmt.Println("错误:", errcode)
+
+	lastPredialysisEvaluation, _ := service.MobileGetLastTimePredialysisEvaluationOne(adminUserInfo.CurrentOrgId, patientID, dateTimeStam)
+
+	if lastPredialysisEvaluation != nil {
+		predialysisevaluation.DryWeight = lastPredialysisEvaluation.DryWeight
+		predialysisevaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula
+		predialysisevaluation.InternalFistulaSkin = lastPredialysisEvaluation.InternalFistulaSkin
+		predialysisevaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
+		predialysisevaluation.Catheter = lastPredialysisEvaluation.Catheter
+		predialysisevaluation.CatheterBend = lastPredialysisEvaluation.CatheterBend
+		predialysisevaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle
+		predialysisevaluation.PunctureNeedleDirection = lastPredialysisEvaluation.PunctureNeedleDirection
+		predialysisevaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay
+		predialysisevaluation.PointPuncture = lastPredialysisEvaluation.PointPuncture
+		predialysisevaluation.IsHemorrhage = lastPredialysisEvaluation.IsHemorrhage
+		predialysisevaluation.ThromubusType = lastPredialysisEvaluation.ThromubusType
+		predialysisevaluation.Skin = lastPredialysisEvaluation.Skin
+		predialysisevaluation.Complication = lastPredialysisEvaluation.Complication
+		predialysisevaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis
+		predialysisevaluation.LastPostDialysisOther = lastPredialysisEvaluation.LastPostDialysisOther
+	}
+
 	if errcode == gorm.ErrRecordNotFound {
+
 		service.SaveDislysisiBefore(&predialysisevaluation)
 	} else if errcode == nil {
 
@@ -537,6 +558,493 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 	}
 
+	// 计算透析处方的相关超滤量
+	schedual, _ := service.MobileGetSchedualDetailSix(adminUserInfo.CurrentOrgId, patientID, dateTimeStam)
+
+	var lastDialysisPrescribe *models.DialysisPrescription
+	var dialysisSolution *models.DialysisSolution
+	var dialysisPrescribe *models.DialysisPrescription
+	var system_dialysisPrescribe *models.SystemPrescription
+
+	dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.CurrentOrgId, patientID, dateTimeStam)
+
+	var dewater_amount float64
+
+	dewater_amount = predialysisevaluation.WeightBefore - predialysisevaluation.DryWeight - predialysisevaluation.AdditionalWeight
+
+	dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.CurrentOrgId, patientID, schedual.ModeId)
+
+	// 插入透析处方
+	if dialysisPrescribe == nil && dialysisSolution != nil {
+		var newprescribe models.DialysisPrescription
+		newprescribe.UserOrgId = dialysisSolution.UserOrgId
+		newprescribe.PatientId = dialysisSolution.PatientId
+		newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
+		newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
+		newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
+		newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
+		newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
+		newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
+		newprescribe.ModeId = dialysisSolution.ModeId
+		newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
+		newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
+		newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
+		newprescribe.BloodFilter = dialysisSolution.BloodFilter
+		newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
+		newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
+		newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
+		newprescribe.Glucose = dialysisSolution.Glucose
+		newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
+		newprescribe.Kalium = dialysisSolution.Kalium
+		newprescribe.Sodium = dialysisSolution.Sodium
+		newprescribe.Calcium = dialysisSolution.Calcium
+		newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
+		newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
+		newprescribe.Conductivity = dialysisSolution.Conductivity
+		newprescribe.BodyFluid = dialysisSolution.BodyFluid
+		newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
+		newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
+		newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
+		newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
+		newprescribe.BloodAccess = dialysisSolution.BloodAccess
+		newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
+		newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
+		newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
+		newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
+		newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
+		newprescribe.Dialyzer = dialysisSolution.Dialyzer
+		newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
+		newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
+		newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+		newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
+		newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
+		newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
+		newprescribe.TargetKtv = dialysisSolution.TargetKtv
+
+		newprescribe.CreatedTime = time.Now().Unix()
+		newprescribe.UpdatedTime = time.Now().Unix()
+		newprescribe.RecordDate = dateTimeStam
+		newprescribe.DewaterAmount = dewater_amount
+		newprescribe.TargetUltrafiltration = dewater_amount
+		newprescribe.PrescriptionWater = dewater_amount
+		newprescribe.Chaptalization = dialysisSolution.Chaptalization
+		newprescribe.PrescribingNumber = 1
+		newprescribe.BloodAccessPartId = dialysisSolution.BloodAccessPartId
+		newprescribe.Status = 1
+		if adminUserInfo.CurrentOrgId != 10013 && adminUserInfo.CurrentOrgId != 10014 && adminUserInfo.CurrentOrgId != 10016 {
+			newprescribe.Remark = dialysisSolution.Remark
+		}
+
+		if adminUserInfo.CurrentOrgId == 10340 {
+			newprescribe.TargetUltrafiltration = 0
+			newprescribe.Sodium = 138
+			newprescribe.Bicarbonate = 31.1
+			newprescribe.DialysateFlow = 500
+			newprescribe.TargetUltrafiltration = 0
+		}
+		// 针对新化博翔
+		if adminUserInfo.CurrentOrgId == 10447 {
+			newprescribe.DisplaceLiquiPart = 1
+			newprescribe.DisplaceLiquiValue = 32
+			newprescribe.DialysateFlow = 500
+		}
+
+		if adminUserInfo.CurrentOrgId == 10121 {
+			newprescribe.DialysisDurationHour = 4
+			newprescribe.DialysisDurationMinute = 0
+			newprescribe.BloodAccess = dialysisSolution.BloodAccess
+		}
+
+		if adminUserInfo.CurrentOrgId == 10445 {
+			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(patientID, adminUserInfo.CurrentOrgId)
+			newprescribe.Remark = lastDialysisPrescription.Remark
+		}
+
+		//恒泰
+		if adminUserInfo.CurrentOrgId == 10490 || adminUserInfo.CurrentOrgId == 10016 {
+			newprescribe.Remark = ""
+		}
+
+		if adminUserInfo.CurrentOrgId == 10599 {
+			// 获取透析模版
+			solutionone, _ := service.MobileGetDialysisSolutionByModeIdSevenTwety(adminUserInfo.CurrentOrgId, patientID, schedual.ModeId)
+			if solutionone.Anticoagulant > 0 {
+				newprescribe.Anticoagulant = solutionone.Anticoagulant
+				newprescribe.AnticoagulantShouji = solutionone.AnticoagulantShouji
+				newprescribe.AnticoagulantWeichi = solutionone.AnticoagulantWeichi
+				newprescribe.AnticoagulantZongliang = solutionone.AnticoagulantZongliang
+				newprescribe.BloodAccess = solutionone.BloodAccess
+				newprescribe.DialysisDurationHour = solutionone.DialysisDurationHour
+				newprescribe.DialysisDurationMinute = solutionone.DialysisDurationMinute
+				newprescribe.DialysisIrrigation = solutionone.DialysisIrrigation
+				newprescribe.DialysisDialyszers = solutionone.DialysisDialyszers
+				newprescribe.DialysisStrainer = solutionone.DialysisStrainer
+
+			}
+
+		}
+
+		//针对普宁和揭阳
+		if adminUserInfo.CurrentOrgId == 10597 || adminUserInfo.CurrentOrgId == 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)
+		prescriptionLog := models.XtDialysisPrescriptionLog{
+			UserOrgId:   newprescribe.UserOrgId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			RecordDate:  newprescribe.RecordDate,
+			PatientId:   newprescribe.PatientId,
+			Source:      "物联网上传",
+			Status:      1,
+		}
+
+		service.CreatePrescriptionLog(prescriptionLog)
+
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":" + strconv.FormatInt(schedual.ModeId, 10) + ":dialysis_prescribe"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":prescriptions_list_all"
+		redis.Set(keyTwo, "", time.Second)
+		thisTime := time.Now()
+		scheduleDateStartOne := thisTime.Format("2006-01-02")
+		keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyThree, "", time.Second)
+		defer redis.Close()
+	}
+
+	if dialysisPrescribe == nil && dialysisSolution == nil {
+		if lastDialysisPrescribe != nil {
+			var newprescribe models.DialysisPrescription
+			newprescribe.UserOrgId = lastDialysisPrescribe.UserOrgId
+			newprescribe.PatientId = lastDialysisPrescribe.PatientId
+			newprescribe.Anticoagulant = lastDialysisPrescribe.Anticoagulant
+			newprescribe.AnticoagulantShouji = lastDialysisPrescribe.AnticoagulantShouji
+			newprescribe.AnticoagulantWeichi = lastDialysisPrescribe.AnticoagulantWeichi
+			newprescribe.AnticoagulantZongliang = lastDialysisPrescribe.AnticoagulantZongliang
+			newprescribe.AnticoagulantGaimingcheng = lastDialysisPrescribe.AnticoagulantGaimingcheng
+			newprescribe.AnticoagulantGaijiliang = lastDialysisPrescribe.AnticoagulantGaijiliang
+			newprescribe.ModeId = lastDialysisPrescribe.ModeId
+			newprescribe.DialysisDuration = lastDialysisPrescribe.DialysisDuration
+			newprescribe.ReplacementWay = lastDialysisPrescribe.ReplacementWay
+			newprescribe.HemodialysisMachine = lastDialysisPrescribe.HemodialysisMachine
+			newprescribe.BloodFilter = lastDialysisPrescribe.BloodFilter
+			newprescribe.PerfusionApparatus = lastDialysisPrescribe.PerfusionApparatus
+			newprescribe.BloodFlowVolume = lastDialysisPrescribe.BloodFlowVolume
+			newprescribe.DisplaceLiqui = lastDialysisPrescribe.DisplaceLiqui
+			newprescribe.Glucose = lastDialysisPrescribe.Glucose
+			newprescribe.DialysateFlow = lastDialysisPrescribe.DialysateFlow
+			newprescribe.Kalium = lastDialysisPrescribe.Kalium
+			newprescribe.Sodium = lastDialysisPrescribe.Sodium
+			newprescribe.Calcium = lastDialysisPrescribe.Calcium
+			newprescribe.Bicarbonate = lastDialysisPrescribe.Bicarbonate
+			newprescribe.DialysateTemperature = lastDialysisPrescribe.DialysateTemperature
+			newprescribe.Conductivity = lastDialysisPrescribe.Conductivity
+			newprescribe.BodyFluid = lastDialysisPrescribe.BodyFluid
+			newprescribe.SpecialMedicine = lastDialysisPrescribe.SpecialMedicine
+			newprescribe.SpecialMedicineOther = lastDialysisPrescribe.SpecialMedicineOther
+			newprescribe.DisplaceLiquiPart = lastDialysisPrescribe.DisplaceLiquiPart
+			newprescribe.DisplaceLiquiValue = lastDialysisPrescribe.DisplaceLiquiValue
+			newprescribe.BloodAccess = lastDialysisPrescribe.BloodAccess
+			newprescribe.Ultrafiltration = lastDialysisPrescribe.Ultrafiltration
+			newprescribe.DialysisDurationHour = lastDialysisPrescribe.DialysisDurationHour
+			newprescribe.DialysisDurationMinute = lastDialysisPrescribe.DialysisDurationMinute
+			newprescribe.DialysateFormulation = lastDialysisPrescribe.DialysateFormulation
+			newprescribe.Dialyzer = lastDialysisPrescribe.Dialyzer
+			newprescribe.ReplacementTotal = lastDialysisPrescribe.ReplacementTotal
+			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
+			newprescribe.CreatedTime = time.Now().Unix()
+			newprescribe.UpdatedTime = time.Now().Unix()
+			newprescribe.RecordDate = dateTimeStam
+			newprescribe.DewaterAmount = dewater_amount
+			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.PrescriptionWater = dewater_amount
+			newprescribe.Status = 1
+
+			if adminUserInfo.CurrentOrgId == 10490 || adminUserInfo.CurrentOrgId == 10016 {
+				newprescribe.Remark = ""
+			}
+
+			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
+			newprescribe.PrescribingNumber = 1
+			if adminUserInfo.CurrentOrgId == 10340 {
+				newprescribe.TargetUltrafiltration = 0
+			}
+			if adminUserInfo.CurrentOrgId == 10121 {
+				newprescribe.DialysisDurationHour = 4
+				newprescribe.DialysisDurationMinute = 0
+				newprescribe.BloodAccess = dialysisSolution.BloodAccess
+			}
+
+			if adminUserInfo.CurrentOrgId == 10445 {
+				lastDialysisPrescription, _ := service.GetLastDialysisPrescription(patientID, adminUserInfo.CurrentOrgId)
+				newprescribe.Remark = lastDialysisPrescription.Remark
+			}
+			//err := service.AddSigleRecord(&newprescribe)
+			var err error
+			if adminUserInfo.CurrentOrgId == 10597 || adminUserInfo.CurrentOrgId == 10599 || adminUserInfo.CurrentOrgId == 3877 {
+				prescriptionTwenty, _ := service.GetLastDialysisPrescriptionTwenty(newprescribe.PatientId, newprescribe.RecordDate, newprescribe.UserOrgId)
+				if prescriptionTwenty.ID == 0 {
+					//插入透析处方
+					service.AddSigleRecord(&newprescribe)
+				} else {
+					//插入透析处方
+					service.UpdateAddSigleRecord(prescriptionTwenty.ID, newprescribe.TargetUltrafiltration)
+				}
+			} else {
+				//插入透析处方
+				err = service.AddSigleRecord(&newprescribe)
+			}
+			//记录日志
+			byterequest, _ := json.Marshal(newprescribe)
+			prescriptionLog := models.XtDialysisPrescriptionLog{
+				UserOrgId:   adminUserInfo.CurrentOrgId,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				RecordDate:  newprescribe.RecordDate,
+				PatientId:   patientID,
+				Source:      "物联网上传",
+				Status:      1,
+			}
+
+			service.CreatePrescriptionLog(prescriptionLog)
+
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":" + strconv.FormatInt(schedual.ModeId, 10) + ":dialysis_prescribe"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":prescriptions_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			thisTime := time.Now()
+			scheduleDateStartOne := thisTime.Format("2006-01-02")
+			keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+			redis.Set(keyThree, "", time.Second)
+			defer redis.Close()
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+			}
+		} else if system_dialysisPrescribe != nil {
+			var newprescribe models.DialysisPrescription
+			newprescribe.UserOrgId = system_dialysisPrescribe.UserOrgId
+			newprescribe.PatientId = patientID
+			newprescribe.Anticoagulant = system_dialysisPrescribe.Anticoagulant
+			newprescribe.AnticoagulantShouji = system_dialysisPrescribe.AnticoagulantShouji
+			newprescribe.AnticoagulantWeichi = system_dialysisPrescribe.AnticoagulantWeichi
+			newprescribe.AnticoagulantZongliang = system_dialysisPrescribe.AnticoagulantZongliang
+			newprescribe.AnticoagulantGaimingcheng = system_dialysisPrescribe.AnticoagulantGaimingcheng
+			newprescribe.AnticoagulantGaijiliang = system_dialysisPrescribe.AnticoagulantGaijiliang
+			newprescribe.ModeId = system_dialysisPrescribe.ModeId
+			newprescribe.DialysisDuration = system_dialysisPrescribe.DialysisDuration
+			newprescribe.ReplacementWay = system_dialysisPrescribe.ReplacementWay
+			newprescribe.HemodialysisMachine = system_dialysisPrescribe.HemodialysisMachine
+			newprescribe.BloodFilter = system_dialysisPrescribe.BloodFilter
+			newprescribe.PerfusionApparatus = system_dialysisPrescribe.PerfusionApparatus
+			newprescribe.BloodFlowVolume = system_dialysisPrescribe.BloodFlowVolume
+			newprescribe.DisplaceLiqui = system_dialysisPrescribe.DisplaceLiqui
+			newprescribe.Glucose = system_dialysisPrescribe.Glucose
+			newprescribe.DialysateFlow = system_dialysisPrescribe.DialysateFlow
+			newprescribe.Kalium = system_dialysisPrescribe.Kalium
+			newprescribe.Sodium = system_dialysisPrescribe.Sodium
+			newprescribe.Calcium = system_dialysisPrescribe.Calcium
+			newprescribe.Bicarbonate = system_dialysisPrescribe.Bicarbonate
+			newprescribe.DialysateTemperature = system_dialysisPrescribe.DialysateTemperature
+			newprescribe.Conductivity = system_dialysisPrescribe.Conductivity
+			newprescribe.BodyFluid = system_dialysisPrescribe.BodyFluid
+			newprescribe.SpecialMedicine = system_dialysisPrescribe.SpecialMedicine
+			newprescribe.SpecialMedicineOther = system_dialysisPrescribe.SpecialMedicineOther
+			newprescribe.DisplaceLiquiPart = system_dialysisPrescribe.DisplaceLiquiPart
+			newprescribe.DisplaceLiquiValue = system_dialysisPrescribe.DisplaceLiquiValue
+			newprescribe.BloodAccess = system_dialysisPrescribe.BloodAccess
+			newprescribe.Ultrafiltration = system_dialysisPrescribe.Ultrafiltration
+			newprescribe.DialysisDurationHour = system_dialysisPrescribe.DialysisDurationHour
+			newprescribe.DialysisDurationMinute = system_dialysisPrescribe.DialysisDurationMinute
+			newprescribe.DialysateFormulation = system_dialysisPrescribe.DialysateFormulation
+			newprescribe.Dialyzer = system_dialysisPrescribe.Dialyzer
+			newprescribe.ReplacementTotal = system_dialysisPrescribe.ReplacementTotal
+			newprescribe.DialyzerPerfusionApparatus = system_dialysisPrescribe.DialyzerPerfusionApparatus
+			newprescribe.DialysisIrrigation = system_dialysisPrescribe.DialysisIrrigation
+			newprescribe.DialysisDialyszers = system_dialysisPrescribe.DialysisDialyszers
+			newprescribe.BodyFluidOther = system_dialysisPrescribe.BodyFluidOther
+			newprescribe.TargetKtv = system_dialysisPrescribe.TargetKtv
+			newprescribe.CreatedTime = time.Now().Unix()
+			newprescribe.UpdatedTime = time.Now().Unix()
+			newprescribe.RecordDate = dateTimeStam
+			newprescribe.DewaterAmount = dewater_amount
+			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
+			newprescribe.BloodAccessPartId = lastDialysisPrescribe.BloodAccessPartId
+			newprescribe.Status = 1
+			newprescribe.PrescribingNumber = 1
+
+			if adminUserInfo.CurrentOrgId == 10340 {
+				newprescribe.TargetUltrafiltration = 0
+			}
+			if adminUserInfo.CurrentOrgId == 10121 {
+				newprescribe.DialysisDurationHour = 4
+				newprescribe.DialysisDurationMinute = 0
+				newprescribe.BloodAccess = dialysisSolution.BloodAccess
+			}
+			if adminUserInfo.CurrentOrgId == 10445 {
+				lastDialysisPrescription, _ := service.GetLastDialysisPrescription(patientID, adminUserInfo.CurrentOrgId)
+				newprescribe.Remark = lastDialysisPrescription.Remark
+			}
+
+			if adminUserInfo.CurrentOrgId == 10597 || adminUserInfo.CurrentOrgId == 10599 || adminUserInfo.CurrentOrgId == 3877 {
+				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)
+			prescriptionLog := models.XtDialysisPrescriptionLog{
+				UserOrgId:   adminUserInfo.CurrentOrgId,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				RecordDate:  newprescribe.RecordDate,
+				PatientId:   patientID,
+				Source:      "物联网上传",
+				Status:      1,
+			}
+
+			service.CreatePrescriptionLog(prescriptionLog)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":" + strconv.FormatInt(schedual.ModeId, 10) + ":dialysis_prescribe"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":prescriptions_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			thisTime := time.Now()
+			scheduleDateStartOne := thisTime.Format("2006-01-02")
+			keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+			redis.Set(keyThree, "", time.Second)
+			defer redis.Close()
+
+		} else {
+			var newprescribe models.DialysisPrescription
+			newprescribe.UserOrgId = adminUserInfo.CurrentOrgId
+			newprescribe.PatientId = patientID
+			newprescribe.ModeId = schedual.ModeId
+			newprescribe.CreatedTime = time.Now().Unix()
+			newprescribe.UpdatedTime = time.Now().Unix()
+			newprescribe.RecordDate = dateTimeStam
+			newprescribe.DewaterAmount = dewater_amount
+			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.Status = 1
+			if adminUserInfo.CurrentOrgId == 10445 {
+				lastDialysisPrescription, _ := service.GetLastDialysisPrescription(patientID, adminUserInfo.CurrentOrgId)
+				newprescribe.Remark = lastDialysisPrescription.Remark
+			}
+			err := service.AddSigleRecord(&newprescribe)
+			//记录日志
+			byterequest, _ := json.Marshal(newprescribe)
+			prescriptionLog := models.XtDialysisPrescriptionLog{
+				UserOrgId:   adminUserInfo.CurrentOrgId,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				RecordDate:  newprescribe.RecordDate,
+				PatientId:   patientID,
+				Source:      "物联网上传",
+				Status:      1,
+			}
+
+			service.CreatePrescriptionLog(prescriptionLog)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":" + strconv.FormatInt(schedual.ModeId, 10) + ":dialysis_prescribe"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":prescriptions_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			thisTime := time.Now()
+			scheduleDateStartOne := thisTime.Format("2006-01-02")
+			keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+			redis.Set(keyThree, "", time.Second)
+			defer redis.Close()
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+			}
+		}
+	}
+
+	if dialysisPrescribe != nil && dialysisPrescribe.TargetUltrafiltration == 0 {
+		dialysisPrescribe.UpdatedTime = time.Now().Unix()
+		dialysisPrescribe.RecordDate = dateTimeStam
+		dialysisPrescribe.DewaterAmount = dewater_amount
+		dialysisPrescribe.TargetUltrafiltration = dewater_amount
+		dialysisPrescribe.Status = 1
+		if adminUserInfo.CurrentOrgId == 10340 {
+			dialysisPrescribe.TargetUltrafiltration = 0
+		}
+		if adminUserInfo.CurrentOrgId == 10445 {
+			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(patientID, adminUserInfo.CurrentOrgId)
+			dialysisPrescribe.Remark = lastDialysisPrescription.Remark
+		}
+		updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+		//记录日志
+		byterequest, _ := json.Marshal(dialysisPrescribe)
+		prescriptionLog := models.XtDialysisPrescriptionLog{
+			UserOrgId:   adminUserInfo.CurrentOrgId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			RecordDate:  dialysisPrescribe.RecordDate,
+			PatientId:   patientID,
+			Source:      "物联网上传",
+			Status:      1,
+		}
+
+		service.CreatePrescriptionLog(prescriptionLog)
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":" + strconv.FormatInt(schedual.ModeId, 10) + ":dialysis_prescribe"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(dateTimeStam, 10) + ":prescriptions_list_all"
+		redis.Set(keyTwo, "", time.Second)
+		thisTime := time.Now()
+		scheduleDateStartOne := thisTime.Format("2006-01-02")
+		keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyThree, "", time.Second)
+		defer redis.Close()
+		if updateErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		}
+	}
+
 	//透后
 	weight_after, _ := c.GetFloat("weight_after", 0)
 	temperatureafter, _ := c.GetFloat("temperatureafter", 0)

models/device_models.go

@@ -518,6 +518,7 @@ type XtSchedule struct {
 	LastAfterWeight     AssessmentAfterDislysis `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 	DialysisMachineName string                  `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
 	MaxId               int64                   `gorm:"column:max_id" json:"max_id" form:"max_id"`
+	Remark              string                  `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (XtSchedule) TableName() string {

models/dialysis_parameter_models.go

@@ -104,10 +104,11 @@ func (BloodAutomaticReduceDetail) TableName() string {
 }
 
 type XtScheduleTwo struct {
-	ID        int64  `gorm:"column:id" json:"id" form:"id"`
-	ModeId    int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	PatientId int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Name      string `gorm:"column:name" json:"name" form:"name"`
+	ID               int64            `gorm:"column:id" json:"id" form:"id"`
+	ModeId           int64            `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	PatientId        int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Name             string           `gorm:"column:name" json:"name" form:"name"`
+	DialysisSolution DialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 }
 
 func (XtScheduleTwo) TableName() string {

models/new_stock_models.go

@@ -220,6 +220,7 @@ type XtDialysisSetting struct {
 	GansunaSet                 int64 `gorm:"column:gansuna_set" json:"gansuna_set" form:"gansuna_set"`
 	ZhetangtieSet              int64 `gorm:"column:zhetangtie_set" json:"zhetangtie_set" form:"zhetangtie_set"`
 	NiaojimeiSet               int64 `gorm:"column:niaojimei_set" json:"niaojimei_set" form:"niaojimei_set"`
+	DialysisStrainerSet        int64 `gorm:"column:dialysis_strainer_set" json:"dialysis_strainer_set" form:"dialysis_strainer_set"`
 }
 
 func (XtDialysisSetting) TableName() string {

models/stock_models.go

@@ -344,17 +344,29 @@ func (WarehouseOutInfoNight) TableName() string {
 }
 
 type WarehouseOutInfoSeven struct {
-	ID            int64 `gorm:"column:id" json:"id"`
-	Count         int64 `gorm:"column:count" json:"count"`
-	SysRecordTime int64 `gorm:"column:sys_record_time" json:"sys_record_time"`
-	PatientId     int64 `gorm:"column:patient_id" json:"patient_id"`
-	GoodId        int64 `gorm:"column:good_id" json:"good_id"`
+	ID            int64                  `gorm:"column:id" json:"id"`
+	Count         int64                  `gorm:"column:count" json:"count"`
+	SysRecordTime int64                  `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId     int64                  `gorm:"column:patient_id" json:"patient_id"`
+	GoodId        int64                  `gorm:"column:good_id" json:"good_id"`
+	GoodInfo      XtGoodInformationTenty `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 
 func (WarehouseOutInfoSeven) TableName() string {
 	return "xt_warehouse_out_info"
 }
 
+type XtGoodInformationTenty struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	GoodTypeId int64 `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (XtGoodInformationTenty) TableName() string {
+	return "xt_good_information"
+}
+
 type SalesReturn struct {
 	ID           int64  `gorm:"column:id" json:"id"`
 	OrderNumber  string `gorm:"column:order_number" json:"order_number"`

service/dialysis_parameter_service.go

@@ -1,8 +1,9 @@
 package service
 
 import (
-	"XT_New/models"
 	"fmt"
+
+	"XT_New/models"
 	"github.com/jinzhu/gorm"
 )
 
@@ -63,6 +64,7 @@ type MonitorDialysisSchedule struct {
 	AssessmentBeforeDislysis models.PredialysisEvaluation   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
 	AssessmentAfterDislysis  models.AssessmentAfterDislysis `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
 	MonitoringRecord         []models.MonitoringRecord      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	DialysisSolution         models.DialysisSolution        `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 }
 
 func (MonitorDialysisSchedule) TableName() string {
@@ -70,7 +72,7 @@ func (MonitorDialysisSchedule) TableName() string {
 }
 
 func GetDialysisParametersByKeyword(orgID int64, keyword string, schedulType int64, partitionType int64, page int64, limit int64, schedulDate int64) ([]*VMDialysisSchedule, error, int64) {
-	fmt.Println("scheduletye ======================", schedulType)
+
 	var patients []*models.Patients
 	getPatientErr := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND (name like ? OR dialysis_no like ?)", orgID, "%"+keyword+"%", "%"+keyword+"%").Find(&patients).Error
 	if getPatientErr != nil {
@@ -118,7 +120,8 @@ func GetDialysisParameter(orgID int64, schedulDate int64, schedulType int64, par
 		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ?", orgID, schedulDate).
 		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ? AND monitoring_date = ?", orgID, schedulDate).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, schedulDate).
-		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisSolution", "status=1 and user_org_id = ? and solution_status = 1", orgID)
 	db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)
 	if schedulDate > 0 {
 		db = db.Where("schedule_date = ?", schedulDate)

service/mobile_dialysis_service.go

@@ -2754,6 +2754,13 @@ func GetDialysisPrescribe(orgID int64, patientID int64, recordDate int64) (*mode
 	return &record, nil
 }
 
+func GetDialysisPrescribeOne(orgID int64, patientID int64, recordDate int64) (models.DialysisPrescription, error) {
+	var record models.DialysisPrescription
+	err = readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
+
+	return record, err
+}
+
 // 透析方案
 func GetDialysisSolution(orgID int64, patientID int64, mode_id int64) (models.DialysisSolution, error) {
 	var record models.DialysisSolution
@@ -3127,7 +3134,7 @@ func GetPatientAutoMatic(patient_id int64, orgID int64, record_time int64, good_
 
 func GetAllWarehouseOutSumList(patient_id int64, orgID int64, record_time int64) (info []*models.WarehouseOutInfoSeven, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and org_id = ? and sys_record_time = ? and status = 1", patient_id, orgID, record_time).Find(&info).Error
+	err = XTReadDB().Where("patient_id = ? and org_id = ? and sys_record_time = ? and status = 1", patient_id, orgID, record_time).Preload("GoodInfo", "status=1 and org_id = ?", orgID).Find(&info).Error
 	return info, err
 }
 
@@ -3279,33 +3286,67 @@ func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his
 	key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":" + strconv.FormatInt(recorddate, 10) + ":his_doctor_advice"
 	his_doctor_advice_str, _ := redis.Get(key).Result()
 	redis.Set(key, "", time.Second)
-	if len(his_doctor_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Order("created_time asc").Find(&his).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if len(his) <= 0 {
+	if orgid != 10721 {
+		if len(his_doctor_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+			err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Order("created_time asc").Find(&his).Error
+			if err != nil {
+				if err == gorm.ErrRecordNotFound {
+					if len(his) <= 0 {
+						redis.Set(key, "null", time.Second*60*60*18)
+					}
+					return his, nil
+				} else {
+					return his, err
+				}
+			} else {
+				if len(his) > 0 {
+					//缓存数据
+					his_doctor_advice_str, err := json.Marshal(his)
+					if err == nil {
+						redis.Set(key, his_doctor_advice_str, time.Second*60*60*18)
+					}
+				} else {
 					redis.Set(key, "null", time.Second*60*60*18)
 				}
 				return his, nil
-			} else {
-				return his, err
 			}
-		} else {
-			if len(his) > 0 {
-				//缓存数据
-				his_doctor_advice_str, err := json.Marshal(his)
-				if err == nil {
-					redis.Set(key, his_doctor_advice_str, time.Second*60*60*18)
+		} else { //缓存数据了数据，将redis缓存的json字符串转为map
+			json.Unmarshal([]byte(his_doctor_advice_str), &his)
+			return his, nil
+		}
+	}
+
+	if orgid == 10721 {
+		if len(his_doctor_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+			err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ? and execution_frequency!='上机前' and delivery_way!='口服' ", patientid, orgid, recorddate).Order("created_time asc").Find(&his).Error
+			if err != nil {
+				if err == gorm.ErrRecordNotFound {
+					if len(his) <= 0 {
+						redis.Set(key, "null", time.Second*60*60*18)
+					}
+					return his, nil
+				} else {
+					return his, err
 				}
 			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
+				if len(his) > 0 {
+					//缓存数据
+					his_doctor_advice_str, err := json.Marshal(his)
+					if err == nil {
+						redis.Set(key, his_doctor_advice_str, time.Second*60*60*18)
+					}
+				} else {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
+				return his, nil
 			}
+		} else { //缓存数据了数据，将redis缓存的json字符串转为map
+			json.Unmarshal([]byte(his_doctor_advice_str), &his)
 			return his, nil
 		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(his_doctor_advice_str), &his)
-		return his, nil
 	}
+
+	return his, nil
 }
 
 func GetLastDialysisPrescriptionByPatientId(orgid int64, patientid int64, recorddate int64) (*models.DialysisPrescription, error) {

service/patient_service.go

@@ -14,7 +14,7 @@ import (
 )
 
 // GetPatientList 返回患者的列表
-func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64) (patients []*models.Patients, total int64, err error) {
+func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64, patient_type int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
 	if orgID > 0 {
@@ -73,6 +73,9 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 	if nurse > 0 {
 		db = db.Where("p.head_nurse_id = ?", nurse)
 	}
+	if patient_type > 0 {
+		db = db.Where("p.patient_type = ?", patient_type)
+	}
 
 	offset := (page - 1) * limit
 	if lapseto == 2 || lapseto == 3 {
@@ -472,39 +475,79 @@ func GetAllHisAdvicesByList(orgID int64, scheduleDate int64) (hisAdvices []VMHis
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":his_advices_list_all"
 	his_advices_all, _ := redis.Get(key).Result()
-
-	if len(his_advices_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).Find(&hisAdvices).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if len(hisAdvices) <= 0 {
+	redis.Set(key, "", time.Second)
+	if orgID != 10721 {
+		if len(his_advices_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+			err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).Find(&hisAdvices).Error
+			if err != nil {
+				if err == gorm.ErrRecordNotFound {
+					if len(hisAdvices) <= 0 {
+						redis.Set(key, "null", time.Second*60*60*18)
+					}
+					return nil, nil
+				} else {
+					return nil, err
+				}
+			} else {
+				if len(hisAdvices) > 0 {
+					//缓存数据
+					his_advices_all, err := json.Marshal(&hisAdvices)
+					if err == nil {
+						redis.Set(key, his_advices_all, time.Second*60*60*18)
+					}
+				} else {
 					redis.Set(key, "null", time.Second*60*60*18)
 				}
+				return hisAdvices, nil
+			}
+		} else { //缓存数据了数据，将redis缓存的json字符串转为map
+			if his_advices_all == "null" {
 				return nil, nil
 			} else {
-				return nil, err
+				json.Unmarshal([]byte(his_advices_all), &hisAdvices)
+				return hisAdvices, nil
 			}
-		} else {
-			if len(hisAdvices) > 0 {
-				//缓存数据
-				his_advices_all, err := json.Marshal(&hisAdvices)
-				if err == nil {
-					redis.Set(key, his_advices_all, time.Second*60*60*18)
+
+		}
+	}
+
+	if orgID == 10721 {
+
+		if len(his_advices_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+			err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ? and execution_frequency !='上机前' and delivery_way!='口服' ", orgID, scheduleDate).Find(&hisAdvices).Error
+			if err != nil {
+				if err == gorm.ErrRecordNotFound {
+					if len(hisAdvices) <= 0 {
+						redis.Set(key, "null", time.Second*60*60*18)
+					}
+					return nil, nil
+				} else {
+					return nil, err
 				}
 			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
+				if len(hisAdvices) > 0 {
+					//缓存数据
+					his_advices_all, err := json.Marshal(&hisAdvices)
+					if err == nil {
+						redis.Set(key, his_advices_all, time.Second*60*60*18)
+					}
+				} else {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
+				return hisAdvices, nil
+			}
+		} else { //缓存数据了数据，将redis缓存的json字符串转为map
+			if his_advices_all == "null" {
+				return nil, nil
+			} else {
+				json.Unmarshal([]byte(his_advices_all), &hisAdvices)
+				return hisAdvices, nil
 			}
-			return hisAdvices, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if his_advices_all == "null" {
-			return nil, nil
-		} else {
-			json.Unmarshal([]byte(his_advices_all), &hisAdvices)
-			return hisAdvices, nil
-		}
 
+		}
 	}
+
+	return hisAdvices, nil
 }
 
 func GetPatientListByUpdateTime(orgID int64, syncTime int64) (patients []*models.PatientListForFaceList, total int64, err error) {
@@ -2174,8 +2217,13 @@ func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string,
 }
 
 func UpdateScheduleByDeathTime(patientid int64, shcheduledate int64) error {
-	err := XTWriteDB().Model(models.XtSchedule{}).Where("patient_id = ? and schedule_date > ? and status=1", patientid, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
+	var err error
+	if shcheduledate > 0 {
+		err = XTWriteDB().Model(models.XtSchedule{}).Where("patient_id = ? and schedule_date > ? and status=1", patientid, shcheduledate).Updates(map[string]interface{}{"status": 0, "remark": "转出删除排班"}).Error
+	}
+
 	return err
+
 }
 
 func UpdatePatientLapsetoByPatientId(patient_id int64, record_date int64, lapse_reason string) error {
@@ -4283,3 +4331,12 @@ func GetPatientLapsorecordListOne() (lapseto []*models.PatientLapseto, err error
 
 	return lapseto, err
 }
+
+func GetPatientBefor(patient_id int64, record_date int64, user_org_id int64) (models.XtAssessmentBeforeDislysis, error) {
+
+	beforeDislysis := models.XtAssessmentBeforeDislysis{}
+
+	err := XTReadDB().Where("patient_id = ? and assessment_date= ? and user_org_id = ? and status=1", patient_id, record_date, user_org_id).Find(&beforeDislysis).Error
+
+	return beforeDislysis, err
+}

service/self_drug_service.go

@@ -600,6 +600,13 @@ func GetAllBaseDrugLibList(org_id int64) (drugs []*Drugs, err error) {
 	return
 }
 
+func GetAllBaseDrugLibListTwo(org_id int64) (drugs []*Drugs, err error) {
+
+	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id).Find(&drugs).Error
+
+	return drugs, err
+}
+
 type PrivateDrug struct {
 	DrugName           string         `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
 	ID                 int64          `gorm:"column:id" json:"id" form:"id"`

service/sign_service.go

@@ -2110,16 +2110,31 @@ func UpdateAllPatient(id int64, diagose string, orgid int64) error {
 	return err
 }
 
-func GetAllDialysisOrderTwo(patient_id int64) (list []*models.XtDialysisOrder, err error) {
+func GetAllDialysisOrderTwo(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1 and dialysis_date>=1696089600", patient_id).Find(&list).Error
+	err = XTReadDB().Where("user_org_id = ? and status =1 and dialysis_date=1730736000", user_org_id).Find(&list).Error
 
 	return list, err
 }
 
-func GetAllDialysisOrder(patient_id int64) (list []*models.XtDialysisOrder, err error) {
+func GetAllDialysisPrescription(patient_id int64) (list []*models.XtDialysisPrescription, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", patient_id).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status=1", patient_id).Find(&list).Error
+
+	return list, err
+}
+func UpdateSchedulePrescrition(patient_id int64, record_date int64, user_org_id int64, mode_id int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+
+	err := XTWriteDB().Model(&schedule).Where("patient_id = ? and schedule_date = ? and status=1 and user_org_id =?", patient_id, record_date, user_org_id).Updates(map[string]interface{}{"mode_id": mode_id}).Error
+
+	return schedule, err
+}
+
+func GetAllDialysisOrder(patient_id int64, start_time int64, end_time int64) (list []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and status =1 and dialysis_date>=1541001600 and dialysis_date<=?", patient_id, end_time).Find(&list).Error
 
 	return list, err
 }
@@ -2127,14 +2142,14 @@ func GetAllDialysisOrder(patient_id int64) (list []*models.XtDialysisOrder, err
 func GetLastScheduleByUserOrg(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64) (models.Schedule, error) {
 
 	schedule := models.Schedule{}
-	err := XTReadDB().Where("patient_id = ? and schedule_date = ? and status=0", patient_id, schedule_date).First(&schedule).Error
+	err := XTReadDB().Where("patient_id = ? and schedule_date = ?", patient_id, schedule_date).First(&schedule).Error
 
 	return schedule, err
 }
 
-func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64, id int64) error {
+func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64, id int64, mode_id int64) error {
 
-	err := XTWriteDB().Model(&models.XtSchedule{}).Where("id = ?", id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1}).Error
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("id = ?", id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1, "mode_id": mode_id}).Error
 	return err
 }
 

service/statistis_qc_service.go

@@ -126,7 +126,7 @@ func GetDialysisStats(start int64, end int64, mode int64, org_id int64, time_way
         JOIN
             xt_treatment_mode t ON p.mode_id = t.mode_id
         WHERE
-            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? and p.mode_id = ?
+            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? and p.mode_id = ? and p.status=1
         GROUP BY
            日期
     `, strings.Join(selectClauses, ", "))
@@ -141,7 +141,7 @@ func GetDialysisStats(start int64, end int64, mode int64, org_id int64, time_way
         JOIN
             xt_treatment_mode t ON p.mode_id = t.mode_id
         WHERE
-            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? 
+            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? and p.status=1
         GROUP BY
            日期
     `, strings.Join(selectClauses, ", "))

service/stock_service.go

@@ -9796,7 +9796,7 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 		db = db.Where("is_upload = 2 or is_upload =0")
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
-
+	fmt.Println("totla====================", total)
 	return list, total, err
 }