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

 		var userAdmin models.AdminUser
 		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 10344 //4，809
+		userAdmin.Id = 10579 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10206 //机构id 10344
+		subscibe.OrgId = 10344 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17282 //4
+		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14655 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10206 //机构id小英10344或4
+		subscibe.OrgId = 10344 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17282 //4
+		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14655 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/data_api_controller.go

 	ef.UpdatedTime = timeNow
 	ef.Name = efdata.Name
 	ef.Code = efdata.Code
-
+	ef.Count = efdata.Count
 	err = service.UpdateExecutionFrequency(ef)
 	if err != nil {
 		utils.ErrorLog("%v", err)

controllers/dialysis_api_controller.go

 	beego.Router("/api/patient/getgathersetting", &DialysisApiController{}, "Get:GetGatherSetting")
 
 	beego.Router("/api/patient/getdialysisgatherlist", &DialysisApiController{}, "Get:GetDialysisGatherList")
+
+	beego.Router("/api/getpatientdialysisrecordlist", &DialysisApiController{}, "Get:GetPatientDialysisRecordList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
 				//lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribe(adminUserInfo.Org.Id, id,schedual.ModeId)
 				// 获取透析模版
 				dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
-				dialysisSolution, _ = service.MobileGetDialysisSolution(adminUserInfo.CurrentOrgId, patient)
+				// 获取透析模版
+				dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
 
 				if dialysisPrescribe == nil && dialysisSolution != nil {
 					mode_id = dialysisSolution.ModeId
 				newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
 				newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
 				newprescribe.TargetKtv = dialysisSolution.TargetKtv
-
+				newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
+				newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+				newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 				newprescribe.CreatedTime = time.Now().Unix()
 				newprescribe.UpdatedTime = time.Now().Unix()
 				newprescribe.RecordDate = recordDate.Unix()
 					newprescribe.DialyzerPerfusionApparatus = lastDialysisPrescribe.DialyzerPerfusionApparatus
 					newprescribe.BodyFluidOther = lastDialysisPrescribe.BodyFluidOther
 					newprescribe.TargetKtv = lastDialysisPrescribe.TargetKtv
+					newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
+					newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
+					newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
 					newprescribe.CreatedTime = time.Now().Unix()
 					newprescribe.UpdatedTime = time.Now().Unix()
 					newprescribe.RecordDate = recordDate.Unix()
 			newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
 			newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
 			newprescribe.TargetKtv = dialysisSolution.TargetKtv
-
+			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
+			newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+			newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 			newprescribe.CreatedTime = time.Now().Unix()
 			newprescribe.UpdatedTime = time.Now().Unix()
 			newprescribe.RecordDate = recordDate.Unix()
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
+				newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
+				newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
+				newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
 	})
 	return
 }
+
+func (this *DialysisApiController) GetPatientDialysisRecordList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	var startdateunix int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startdateunix = theTime.Unix()
+	}
+	var enddateunix int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		enddateunix = theTime.Unix()
+	}
+
+	org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	if org_id == 9538 || org_id == 10101 || org_id == 10353 {
+		list, _ := service.GetPatientDialysisRecordList(patient_id, startdateunix, enddateunix)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	} else {
+		list, _ := service.GetPatientDialysisRecordListOne(patient_id, startdateunix, enddateunix)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	}
+
+	return
+}

controllers/his_config_api_controller.go

 	var list []*models.DialysisPatient
 	finlist := make([]*models.DialysisPatient, 0) //筛选后的列表
 	list, err = service.GetDialysisModePatient(orgid, mode)
+	fmt.Println("list-----------------", list)
 	if err != nil {
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return

controllers/his_project_api_controller.go

 
 	eles, _ := service.GetNewAdminUserES(adminUserInfo.CurrentOrgId)
 
+	roles, _ := service.GetAllDoctor(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 		"info":              prescriptionInfo,
 		"eles":              eles,
 		"psn_info":          psn_info,
+		"roles":             roles,
 	})
 }
 

controllers/mobile_api_controllers/check_weight_api_controller.go

 				newprescribe.Remark = lastDialysisPrescription.Remark
 			}
 
+			//恒泰
+			if adminUserInfo.Org.Id == 10490 {
+				newprescribe.Remark = ""
+			}
+
+			if adminUserInfo.Org.Id == 10599 {
+				// 获取透析模版
+				solutionone, _ := service.MobileGetDialysisSolutionByModeIdSevenTwety(adminUserInfo.Org.Id, id, 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.Org.Id == 10597 || adminUserInfo.Org.Id == 10599 {
 				prescriptionTwenty, _ := service.GetLastDialysisPrescriptionTwenty(newprescribe.PatientId, newprescribe.RecordDate, newprescribe.UserOrgId)
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Status = 1
-				if adminUserInfo.Org.Id != 10490 {
-					newprescribe.Remark = lastDialysisPrescribe.Remark
-				} else {
+				//if adminUserInfo.Org.Id != 10490 {
+				//	newprescribe.Remark = lastDialysisPrescribe.Remark
+				//} else {
+				//	newprescribe.Remark = ""
+				//}
+				if adminUserInfo.Org.Id == 10490 {
 					newprescribe.Remark = ""
 				}
 
 			if daySchedule[0].Schedule.ID > 0 {
 				sc["code"] = 0
 				sc["msg"] = ""
-				sc["mode"] = daySchedule[0].Schedule.ModeId
+				var mode = "HD"
+				if daySchedule[0].Schedule.ModeId == 1 {
+					mode = "HD"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 2 {
+					mode = "HDF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 3 {
+					mode = "HD+HP"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 4 {
+					mode = "HP"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 5 {
+					mode = "HF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 6 {
+					mode = "SCUF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 7 {
+					mode = "IUF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 8 {
+					mode = "HFHD"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 9 {
+					mode = "HFHD+HP"
+				}
+				if daySchedule[0].Schedule.ModeId == 10 {
+					mode = "PHF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 11 {
+					mode = "HFR"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 12 {
+					mode = "HDF+HP"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 13 {
+					mode = "CRRT"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 14 {
+					mode = "腹水回输"
+				}
+				if daySchedule[0].Schedule.ModeId == 19 {
+					mode = "IUF+HD"
+				}
+				if daySchedule[0].Schedule.ModeId == 20 {
+					mode = "UF"
+				}
+				if daySchedule[0].Schedule.ModeId == 21 {
+					mode = "HD+"
+				}
+				if daySchedule[0].Schedule.ModeId == 22 {
+					mode = "血浆胆红素吸附+HDF"
+				}
+				if daySchedule[0].Schedule.ModeId == 23 {
+					mode = "血浆胆红素吸附"
+				}
+				if daySchedule[0].Schedule.ModeId == 24 {
+					mode = "I-HDF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 25 {
+					mode = "HD高通"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 26 {
+					mode = "CVVH"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 27 {
+					mode = "CVVHD"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 28 {
+					mode = "CVVHDF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 29 {
+					mode = "PE"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 30 {
+					mode = "血浆胆红素吸附+HP"
+				}
+				if daySchedule[0].Schedule.ModeId == 31 {
+					mode = "HPD"
+				}
+				if daySchedule[0].Schedule.ModeId == 32 {
+					mode = "HDP"
+				}
+				if daySchedule[0].Schedule.ModeId == 33 {
+					mode = "HFD"
+				}
+				if daySchedule[0].Schedule.ModeId == 34 {
+					mode = "HDF100"
+				}
+				if daySchedule[0].Schedule.ModeId == 35 {
+					mode = "HDF600"
+				}
+				if daySchedule[0].Schedule.ModeId == 36 {
+					mode = "HDF800"
+				}
+				if daySchedule[0].Schedule.ModeId == 37 {
+					mode = "HDF1000"
+				}
+
+				sc["mode"] = mode
 				sc["data"] = daySchedule
 			} else {
 				sc["code"] = 1
 			if nextSchedule[0].Schedule.ID > 0 {
 				sc["code"] = 0
 				sc["msg"] = ""
-				sc["mode"] = nextSchedule[0].Schedule.ModeId
+				var mode = "HD"
+				if nextSchedule[0].Schedule.ModeId == 1 {
+					mode = "HD"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 2 {
+					mode = "HDF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 3 {
+					mode = "HD+HP"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 4 {
+					mode = "HP"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 5 {
+					mode = "HF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 6 {
+					mode = "SCUF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 7 {
+					mode = "IUF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 8 {
+					mode = "HFHD"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 9 {
+					mode = "HFHD+HP"
+				}
+				if nextSchedule[0].Schedule.ModeId == 10 {
+					mode = "PHF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 11 {
+					mode = "HFR"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 12 {
+					mode = "HDF+HP"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 13 {
+					mode = "CRRT"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 14 {
+					mode = "腹水回输"
+				}
+				if nextSchedule[0].Schedule.ModeId == 19 {
+					mode = "IUF+HD"
+				}
+				if nextSchedule[0].Schedule.ModeId == 20 {
+					mode = "UF"
+				}
+				if nextSchedule[0].Schedule.ModeId == 21 {
+					mode = "HD+"
+				}
+				if nextSchedule[0].Schedule.ModeId == 22 {
+					mode = "血浆胆红素吸附+HDF"
+				}
+				if nextSchedule[0].Schedule.ModeId == 23 {
+					mode = "血浆胆红素吸附"
+				}
+				if nextSchedule[0].Schedule.ModeId == 24 {
+					mode = "I-HDF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 25 {
+					mode = "HD高通"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 26 {
+					mode = "CVVH"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 27 {
+					mode = "CVVHD"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 28 {
+					mode = "CVVHDF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 29 {
+					mode = "PE"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 30 {
+					mode = "血浆胆红素吸附+HP"
+				}
+				if nextSchedule[0].Schedule.ModeId == 31 {
+					mode = "HPD"
+				}
+				if nextSchedule[0].Schedule.ModeId == 32 {
+					mode = "HDP"
+				}
+				if nextSchedule[0].Schedule.ModeId == 33 {
+					mode = "HFD"
+				}
+				if nextSchedule[0].Schedule.ModeId == 34 {
+					mode = "HDF100"
+				}
+				if nextSchedule[0].Schedule.ModeId == 35 {
+					mode = "HDF600"
+				}
+				if nextSchedule[0].Schedule.ModeId == 36 {
+					mode = "HDF800"
+				}
+				if nextSchedule[0].Schedule.ModeId == 37 {
+					mode = "HDF1000"
+				}
+				sc["mode"] = mode
 				sc["data"] = nextSchedule
 			} else {
 				sc["code"] = 1
 		}
 	}
 
-	switch sc["mode"] {
-	case 1:
-		sc["mode"] = "HD"
-		break
-	case 2:
-		sc["mode"] = "HDF"
-		break
-	case 3:
-		sc["mode"] = "HD+HP"
-		break
-	case 4:
-		sc["mode"] = "HP"
-		break
-	case 5:
-		sc["mode"] = "HF"
-		break
-	case 6:
-		sc["mode"] = "SCUF"
-		break
-	case 7:
-		sc["mode"] = "IUF"
-		break
-	case 8:
-		sc["mode"] = "HFHD"
-		break
-	case 9:
-		sc["mode"] = "HFHD+HP"
-		break
-	case 10:
-		sc["mode"] = "PHF"
-		break
-	case 11:
-		sc["mode"] = "HFR"
-		break
-	case 12:
-		sc["mode"] = "HDF+HP"
-		break
-	case 13:
-		sc["mode"] = "CRRT"
-		break
-	case 14:
-		sc["mode"] = "腹水回输"
-		break
-	case 15:
-		sc["mode"] = "HD前置换"
-		break
-	case 16:
-		sc["mode"] = "HD后置换"
-		break
-	case 17:
-		sc["mode"] = "HDF前置换"
-		break
-	case 18:
-		sc["mode"] = "HDF后置换"
-		break
-	default:
-		sc["mode"] = "HD"
-		break
-	}
+	//switch sc["mode"] {
+	//case 1:
+	//	sc["mode"] = "HD"
+	//	break
+	//case 2:
+	//	sc["mode"] = "HDF"
+	//	break
+	//case 3:
+	//	sc["mode"] = "HD+HP"
+	//	break
+	//case 4:
+	//	sc["mode"] = "HP"
+	//	break
+	//case 5:
+	//	sc["mode"] = "HF"
+	//	break
+	//case 6:
+	//	sc["mode"] = "SCUF"
+	//	break
+	//case 7:
+	//	sc["mode"] = "IUF"
+	//	break
+	//case 8:
+	//	sc["mode"] = "HFHD"
+	//	break
+	//case 9:
+	//	sc["mode"] = "HFHD+HP"
+	//	break
+	//case 10:
+	//	sc["mode"] = "PHF"
+	//	break
+	//case 11:
+	//	sc["mode"] = "HFR"
+	//	break
+	//case 12:
+	//	sc["mode"] = "HDF+HP"
+	//	break
+	//case 13:
+	//	sc["mode"] = "CRRT"
+	//	break
+	//case 14:
+	//	sc["mode"] = "腹水回输"
+	//	break
+	//case 15:
+	//	sc["mode"] = "HD前置换"
+	//	break
+	//case 16:
+	//	sc["mode"] = "HD后置换"
+	//	break
+	//case 17:
+	//	sc["mode"] = "HDF前置换"
+	//	break
+	//case 18:
+	//	sc["mode"] = "HDF后置换"
+	//	break
+	//default:
+	//	sc["mode"] = "HD"
+	//	break
+	//}
 
 	// 获取患者透前干体重或者获取患者透前体重
 	var dry_weight map[string]interface{}

controllers/mobile_api_controllers/patient_api_controller.go

 				//
 				fmt.Println("config.IsOpen", config.IsOpen)
 				fmt.Println("config.IsOpen", item.UserOrgId)
-				//if config.IsOpen == 0 && item.UserOrgId == 10402 {
-				//
-				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-				//	//更新字典里面的库存
-				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-				//	var sum_count int64
-				//	for _, its := range stockInfo {
-				//		if its.MaxUnit == medical.MaxUnit {
-				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-				//		}
-				//		sum_count += its.StockMaxNumber + its.StockMinNumber
-				//	}
-				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-				//	//剩余库存
-				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				//}
+				if config.IsOpen == 1 && item.UserOrgId == 10375 {
+
+					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//更新字典里面的库存
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					var sum_count int64
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					//剩余库存
+					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
 
 			}
 		}
 		newprescribe.Status = 1
 		newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 		newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+		newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
 		newprescribe.Remark = lastDialysisPrescription.Remark
 		newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 
 			newprescribe.Status = 1
 			newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 			newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
+			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
 			newprescribe.Remark = lastDialysisPrescription.Remark
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 			newprescribe.Status = 1
 			newprescribe.DialysisDialyszers = system_dialysisPrescribe.DialysisDialyszers
 			newprescribe.DialysisIrrigation = system_dialysisPrescribe.DialysisIrrigation
+			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
 			newprescribe.Remark = lastDialysisPrescription.Remark
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"github.com/mozillazg/go-pinyin"
 	"strconv"
 	"strings"
 	"time"
 			return
 		}
 
+		hans := name // 要转换的汉字字符串
+		// 创建一个拼音转换器
+		p := pinyin.NewArgs()
+
+		// 将汉字转为拼音
+		pinyinSlice := pinyin.Pinyin(hans, p)
+
+		// 输出拼音
+		fmt.Println("Pinyin:", pinyinSlice)
+
+		// 获取首字母
+		firstLetter := ""
+		for _, py := range pinyinSlice {
+			if len(py) > 0 {
+				firstLetter += string(py[0][0])
+			}
+		}
+
 		patients := models.Patients{
 			Name:              name,
 			Gender:            sex,
 			SchRemark:         remark,
 			TreatmentPlan:     treatment_plan,
 		}
+		patients.FirstLetter = firstLetter
 		err = service.CreateOldPatient(&patients)
 		fmt.Print("报错", err)
 		patient, err := service.GetLastOldPatient(orgid)
 			SchRemark:         remark,
 			TreatmentPlan:     treatment_plan,
 		}
+		patientsNew.FirstLetter = firstLetter
 		err = service.CreateNewPatient(&patientsNew)
 		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.ID, 10) + ":patient_info"
 		redis := service.RedisClient()
 		}
 
 		//查询号透析号是否相同
-		thisPatientother, _ := service.FindPatientByDialysisNoOne(orgid, dialysis, id)
-		if thisPatientother.ID > 0 && thisPatientother.ID != patient.BloodId {
-			returnData := make(map[string]interface{}, 0)
-			returnData["msg"] = "透析号码已存在"
-			this.ServeSuccessJSON(returnData)
-			return
-		}
+		//thisPatientother, _ := service.FindPatientByDialysisNoOne(orgid, dialysis, id)
+		//if thisPatientother.ID > 0 && thisPatientother.ID != patient.BloodId {
+		//	returnData := make(map[string]interface{}, 0)
+		//	returnData["msg"] = "透析号码已存在"
+		//	this.ServeSuccessJSON(returnData)
+		//	return
+		//}
 
 		patients := models.Patients{
 			Name:              name,

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

 		}
 	}
 
+	if orgid == 10585 {
+		//获取今日的排班数据
+		list, _ := service.GetMobileScheduleListByScheduleDate(orgid, startTime)
+		for _, item := range list {
+			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+			var str = solution.DialyzerPerfusionApparatus
+			service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, str, item.ScheduleType)
+		}
+	}
+
+	//查询排班里面的空透析器
+	if orgid == 10375 {
+
+		schedulesFive, _ := service.GetMobileScheduleListByScheduleDateOne(orgid, startTime)
+
+		for _, item := range schedulesFive {
+			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+			var DialysisMachineName string
+			if len(solution.DialysisDialyszers) > 0 {
+				DialysisMachineName = solution.DialysisDialyszers
+			}
+			if len(solution.DialyzerPerfusionApparatus) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
+			}
+
+			if len(solution.DialysisIrrigation) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+			}
+			item.DialysisMachineName = DialysisMachineName
+			service.UpdateSchOne(item.ID, item.DialysisMachineName)
+		}
+
+	}
+
 	// stockType, _ := service.GetStockType(orgid)
 	//zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
 	// if err != nil {
 			if len(advice) > 0 {
 				service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, org_id)
 			}
+			project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, org_id)
+			if len(project) > 0 {
+				service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, org_id)
+			}
 		}
 		redis := service.RedisClient()
 		//处方

controllers/patient_api_controller.go

 	"XT_New/utils"
 	"encoding/json"
 	"github.com/jinzhu/gorm"
+	"github.com/mozillazg/go-pinyin"
 
 	//"github.com/jinzhu/gorm"
 	"math"
 
 	beego.Router("api/patient/gettherapyinformed", &PatientApiController{}, "Get:GetTherapyInformed")
 
+	beego.Router("/api/patient/savemedicalhistory", &PatientApiController{}, "Post:SaveMedicalHistory")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
 	patient.BindingState = 2
 	// patient.Lapseto = 1
 
+	hans := patient.Name // 要转换的汉字字符串
+	// 创建一个拼音转换器
+	p := pinyin.NewArgs()
+
+	// 将汉字转为拼音
+	pinyinSlice := pinyin.Pinyin(hans, p)
+
+	// 输出拼音
+	fmt.Println("Pinyin:", pinyinSlice)
+
+	// 获取首字母
+	firstLetter := ""
+	for _, py := range pinyinSlice {
+		if len(py) > 0 {
+			firstLetter += string(py[0][0])
+		}
+	}
+
+	patient.FirstLetter = firstLetter
+
 	err := service.CreatePatient(&patient, contagions, diseases)
 	fmt.Println("创建病人失败err")
 	if err != nil {
 		AllergicHistory:              patient.AllergicHistory,
 		PatientAddress:               patient.PatientAddress,
 	}
+	patientsNew.FirstLetter = firstLetter
 
 	err = service.CreatePatientsNew(&patientsNew)
 	fmt.Print("创建失败", err)
 		"list": theapyInformed,
 	})
 }
+
+func (c *PatientApiController) SaveMedicalHistory() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	content := dataBody["content"].(string)
+	patient_id := int64(dataBody["patient_id"].(float64))
+	medicalHistory := models.XtMedicalHistory{
+		UserOrgId: orgId,
+		PatientId: patient_id,
+		Ctime:     time.Now().Unix(),
+		Mtime:     0,
+		Status:    1,
+		Content:   content,
+	}
+
+	//
+	history, _ := service.GetPatientMedicalHistory(patient_id, orgId)
+
+	if history.ID > 0 {
+		service.UpdatePatientMedicalHistory(history.ID, content)
+	}
+	if history.ID == 0 {
+		service.CreatePatientMedicalHistory(medicalHistory)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"medicalHistory": medicalHistory,
+	})
+
+}

controllers/patient_dataconfig_api_controller.go

 
 	beego.Router("/api/patient/getpatientdetailinformedconsent", &PatientDataConfigAPIController{}, "Get:GetPatientDetailInformedConsent")
 
+	beego.Router("/api/patient/getpatientmedicallist", &PatientDataConfigAPIController{}, "Get:GetPatientMedicalList")
+
 }
 
 type PatientDataConfigAPIController struct {
 		"patients": patients,
 	})
 }
+
+func (this *PatientDataConfigAPIController) GetPatientMedicalList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetPatientMedicalList(patient_id, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/pharmacy_controller.go

 		etime = stime + 86399
 	}
 	err = service.DrugWithdrawal(orgid, patient_id, stime, etime, creater)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())

controllers/schedule_api_controller.go

 		}
 	}
 
-	if adminINfo.CurrentOrgId == 10206 {
+	if adminINfo.CurrentOrgId == 10206 || adminINfo.CurrentOrgId == 10344 {
 		hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 		if len(hisAdvice) > 0 {
 			service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 		}
+		if len(project) > 0 {
+			service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		}
 	}
 
 	redis := service.RedisClient()
 	}
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 
-	if adminInfo.CurrentOrgId == 10346 {
+	if adminInfo.CurrentOrgId == 10346 || adminInfo.CurrentOrgId == 10585 {
 
 		if len(schdules) > 0 {
 			//获取长期医嘱里面的透析器灌流器
 
 		}
 	}
+
+	//查询排班里面的空透析器
+	if adminInfo.CurrentOrgId == 10375 {
+
+		schedulesFive, _ := service.GetWeekScheduleFive(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
+
+		for _, item := range schedulesFive {
+			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+			var DialysisMachineName string
+			if len(solution.DialysisDialyszers) > 0 {
+				DialysisMachineName = solution.DialysisDialyszers
+			}
+			if len(solution.DialyzerPerfusionApparatus) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
+			}
+
+			if len(solution.DialysisIrrigation) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+			}
+			item.DialysisMachineName = DialysisMachineName
+			service.UpdateSchOne(item.ID, item.DialysisMachineName)
+		}
+
+	}
 	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"days":           days,

controllers/sign_api_controller.go

 
 func (this *SignApiController) UploadPrintOrder() {
 
-	//list, _ := service.GetAllPatientNew(10622)
-	//for _, item := range list {
-	//
-	//	hans := item.Name // 要转换的汉字字符串
-	//	// 创建一个拼音转换器
-	//	p := pinyin.NewArgs()
-	//
-	//	// 将汉字转为拼音
-	//	pinyinSlice := pinyin.Pinyin(hans, p)
-	//
-	//	// 输出拼音
-	//	fmt.Println("Pinyin:", pinyinSlice)
-	//
-	//	// 获取首字母
-	//	firstLetter := ""
-	//	for _, py := range pinyinSlice {
-	//		if len(py) > 0 {
-	//			firstLetter += string(py[0][0])
-	//		}
-	//	}
-	//
-	//	item.FirstLetter = firstLetter
-	//	service.UpdatePatientNew(item.ID, item.FirstLetter)
-	//	// 输出首字母
-	//	//fmt.Println("First Letter:", firstLetter)
-	//}
+	list, _ := service.GetAllPatientNew(10375)
+	for _, item := range list {
 
-	baseList, _ := service.GeteAllBaseList(10622)
-	for _, item := range baseList {
-		hans := item.DrugName // 要转换的汉字字符串
+		hans := item.Name // 要转换的汉字字符串
 		// 创建一个拼音转换器
 		p := pinyin.NewArgs()
+
 		// 将汉字转为拼音
 		pinyinSlice := pinyin.Pinyin(hans, p)
+
+		// 输出拼音
+		fmt.Println("Pinyin:", pinyinSlice)
+
 		// 获取首字母
 		firstLetter := ""
 		for _, py := range pinyinSlice {
 				firstLetter += string(py[0][0])
 			}
 		}
+
 		item.FirstLetter = firstLetter
-		service.UpdateBaseList(item.ID, item.FirstLetter)
+		service.UpdatePatientNew(item.ID, item.FirstLetter)
+		// 输出首字母
+		//fmt.Println("First Letter:", firstLetter)
 	}
+
+	//baseList, _ := service.GeteAllBaseList(10375)
+	//for _, item := range baseList {
+	//	hans := item.DrugName // 要转换的汉字字符串
+	//	// 创建一个拼音转换器
+	//	p := pinyin.NewArgs()
+	//	// 将汉字转为拼音
+	//	pinyinSlice := pinyin.Pinyin(hans, p)
+	//	// 获取首字母
+	//	firstLetter := ""
+	//	for _, py := range pinyinSlice {
+	//		if len(py) > 0 {
+	//			firstLetter += string(py[0][0])
+	//		}
+	//	}
+	//	item.FirstLetter = firstLetter
+	//	service.UpdateBaseList(item.ID, item.FirstLetter)
+	//}
 	//pdf := gofpdf.New("P", "mm", "A4", "")
 	//pdf.AddPage()
 	//pdf.Text(5, 10, "血液净化治疗记录单")

models/dialysis.go

 	ExecutionFrequencyId  int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	IsMobile              int64              `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
 	IsSelfDrug            int64              `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	IsMedicine            int64              `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 }
 
 func (HisDoctorAdvice) TableName() string {

models/patient_models.go

 func (XtTheapyinformedPrint) TableName() string {
 	return "xt_theapyinformed_print"
 }
+
+type XtMedicalHistory struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime     int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+	Content   string `gorm:"column:content" json:"content" form:"content"`
+}
+
+func (XtMedicalHistory) TableName() string {
+	return "xt_medical_history"
+}

models/schedule_models.go

 }
 
 type Search_Schedule struct {
-	ID           int64 `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
-
-	Patient string `gorm:"-" json:"patient" form:"patient"`
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId         int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId               int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId           int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate        int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType        int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek        int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId              int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime         int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime         int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport            int64  `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	DialysisMachineName string `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	Patient             string `gorm:"-" json:"patient" form:"patient"`
 }
 
 func (Search_Schedule) TableName() string {

service/dialysis_solution_service.go

 
 import (
 	"XT_New/models"
-	"fmt"
 	"github.com/jinzhu/gorm"
 )
 
 }
 
 func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
-	fmt.Println("ids23322332323232wode", len(ids))
+
 	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
 		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID)
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).Preload("DialysisPrescription", "status=1 and user_org_id =? and record_date =?", orgID, scheduleDate)
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&schedule).Error
 	} else {
 		err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisPrescription", "status=1 and user_org_id =? and record_date =?", orgID, scheduleDate).
 			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).Count(&total).Offset(offset).Limit(limit).Find(&schedule).Error
 	}
 

service/doctor_schedule_service.go

 	return schedule, err
 }
 
+func GetMobileScheduleListByScheduleDateOne(org_id int64, schedule_date int64) (schedule []*models.Search_Schedule, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status= 1 and dialysis_machine_name=''")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if schedule_date > 0 {
+		db = db.Where("schedule_date=?", schedule_date)
+	}
+
+	err = db.Find(&schedule).Error
+
+	return schedule, err
+}
+
 func DeleteStaffScheduleById(id int64, user_org_id int64) (err error) {
 
 	schedule := models.StaffSchedule{}

service/mobile_dialysis_service.go

 // 透析方案
 func MobileGetDialysisSolutionByModeIdSix(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
 	var record models.DialysisSolution
-	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ? and solution_status =1", patientID, orgID, mode_id).Last(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 	return &record, nil
 }
 
+// 透析方案
+func MobileGetDialysisSolutionByModeIdSevenTwety(orgID int64, patientID int64, mode_id int64) (models.DialysisSolution, error) {
+	var record models.DialysisSolution
+	err = readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ? and solution_status =1", patientID, orgID, mode_id).Last(&record).Error
+
+	return record, nil
+}
+
 // 透析方案
 func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
 	var record models.DialysisSolution
 		db = db.Where("x.dialysis_date <= ?", endtime)
 	}
 
-	err = db.Select("x.id,x.dialysis_date,x.schedual_type,s.mode_id").Joins("left join xt_schedule as s on  x.patient_id = s.patient_id and x.dialysis_date = s.schedule_date ").Scan(&order).Error
+	err = db.Select("x.id,x.dialysis_date,x.schedual_type,s.mode_id").Where("s.status=1").Joins("left join xt_schedule as s on  x.patient_id = s.patient_id and x.dialysis_date = s.schedule_date ").Group("x.id").Scan(&order).Error
 	return order, err
 }
 

service/patient_service.go

 	err := XTWriteDB().Model(&models.XtTheapyinformedPrint{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"content": content}).Error
 	return err
 }
+
+func GetPatientMedicalHistory(patient_id int64, user_org_id int64) (models.XtMedicalHistory, error) {
+
+	history := models.XtMedicalHistory{}
+
+	err := XTReadDB().Model(&history).Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Find(&history).Error
+
+	return history, err
+}
+
+func UpdatePatientMedicalHistory(id int64, content string) error {
+
+	history := models.XtMedicalHistory{}
+
+	err := XTWriteDB().Model(&history).Where("id = ? and status=1", id).Updates(map[string]interface{}{"content": content}).Error
+	return err
+}
+
+func CreatePatientMedicalHistory(history models.XtMedicalHistory) error {
+
+	err := XTWriteDB().Create(&history).Error
+
+	return err
+}
+
+func GetPatientMedicalList(patient_id int64, user_org_id int64) (models.XtMedicalHistory, error) {
+
+	history := models.XtMedicalHistory{}
+	err := XTReadDB().Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Find(&history).Error
+	return history, err
+}

service/pharmacy_service.go

 func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (pp []*models.PharmacyContent, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
-	if is_medicine == 0 {
+	if orgid == 10375 {
 		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and drug_id in (select id from xt_base_drug where org_id = ?)", stime, etime, orgid, patient_id, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
 		}
-	} else {
-		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
-		if err != nil {
-			return pp, err
+
+		for _, v := range tmp {
+			pp = append(pp, &models.PharmacyContent{
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         config.ToString(v.Day) + "天",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
+				DataSources:  "his处方",
+				Remarks:      v.Remark, //备注
+				DrugId:       v.DrugId,
+			})
 		}
-	}
 
-	for _, v := range tmp {
-		pp = append(pp, &models.PharmacyContent{
-			Name:         v.AdviceName,
-			SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
-			Usage:        v.DeliveryWay,
-			Frequency:    v.ExecutionFrequency,
-			Days:         config.ToString(v.Day) + "天",
-			Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
-			Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
-			DataSources:  "his处方",
-			Remarks:      v.Remark, //备注
-			DrugId:       v.DrugId,
-		})
+		var tmp_advice []*models.XtDoctorAdviceL
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		}
+
+		for _, v := range tmp_advice {
+			pp = append(pp, &models.PharmacyContent{
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         "-",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
+				DataSources:  "临时医嘱",
+				Remarks:      v.Remark,
+				DrugId:       v.DrugId,
+			})
+		}
+		return
 	}
 
-	var tmp_advice []*models.XtDoctorAdviceL
-	if is_medicine == 0 {
-		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
-		if err != nil {
-			return pp, err
+	if orgid != 10375 {
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			if err != nil {
+				return pp, err
+			}
 		}
-	} else {
-		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
-		if err != nil {
-			return pp, err
+
+		for _, v := range tmp {
+			pp = append(pp, &models.PharmacyContent{
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         config.ToString(v.Day) + "天",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
+				DataSources:  "his处方",
+				Remarks:      v.Remark, //备注
+				DrugId:       v.DrugId,
+			})
 		}
-	}
 
-	for _, v := range tmp_advice {
-		pp = append(pp, &models.PharmacyContent{
-			Name:         v.AdviceName,
-			SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
-			Usage:        v.DeliveryWay,
-			Frequency:    v.ExecutionFrequency,
-			Days:         "-",
-			Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
-			Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
-			DataSources:  "临时医嘱",
-			Remarks:      v.Remark,
-			DrugId:       v.DrugId,
-		})
+		var tmp_advice []*models.XtDoctorAdviceL
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		}
+
+		for _, v := range tmp_advice {
+			pp = append(pp, &models.PharmacyContent{
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         "-",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
+				DataSources:  "临时医嘱",
+				Remarks:      v.Remark,
+				DrugId:       v.DrugId,
+			})
+		}
+		return
 	}
 	return
 }
 			//扣减库存
 			UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 
+			//退药
+			UpdateHisPrescriptionInfo(v.PatientId, v.AdviceDate, v.UserOrgId)
+
 		}
 	}
 
 				err = fmt.Errorf("!:%v", err)
 				return
 			}
-			//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
 			//查询默认仓库
 			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
 			//查询默认仓库剩余多少库存
 			UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
 			//扣减库存
 			UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
 		}
 	}
 
 	err := XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and status = 1 and is_medicine =0", id).Update(map[string]interface{}{"is_medicine": 1}).Error
 	return err
 }
+
+func UpdateHisPrescriptionInfo(patient_id int64, advice_date int64, user_org_id int64) error {
+
+	err = XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and advice_date = ? and user_org_id= ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"is_medicine": 0}).Error
+
+	err = XTWriteDB().Model(&models.HisPrintPrescription{}).Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"is_medicine": 0}).Error
+	return err
+}
+
+func GetHisPatientAdviceList(user_org_id int64, patient_id int64, start_time int64, end_time int64) (list []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Model(&models.HisDoctorAdvice{}).Where("patient_id=? and advice_date=? and advice_date>=? and advice_date<=? and status=1 and user_org_id = ? and is_medicine =1", patient_id, start_time, end_time, user_org_id).Find(&list).Error
+	return list, err
+}

service/schedule_service.go

 	return
 }
 
+func GetWeekScheduleFive(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.ScheduleTwo, err error) {
+
+	db := readDb.Table("xt_schedule as s").Where("s.status=1 and s.dialysis_machine_name='")
+	if len(schIds) > 0 {
+		db = db.Where("s.partition_id in (?)", schIds)
+	}
+	if scheduletype > 0 {
+		db = db.Where("s.schedule_type = ?", scheduletype)
+	}
+	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time,s.dialysis_machine_name, p.name as patient").
+		Order("updated_time asc").
+		Find(&schedules).Error
+	return
+}
+
+func UpdateSchOne(id int64, dialysis_machine_name string) (err error) {
+	err = writeDb.Model(&models.ScheduleTwo{}).Where("status=1 AND id = ?", id).Updates(map[string]interface{}{"dialysis_machine_name": dialysis_machine_name}).Error
+	return
+}
+
 func GetScheduleTotalCount(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.MySchedule, err error) {
 
 	db := readDb.Table("xt_schedule as s").Where("status= 1 and (mode_id = 2 or mode_id= 3)")
 	return advice, err
 }
 
+func GetHisPrescriptionProjectList(patient_id int64, record_date int64, user_org_id int64) (project []*models.HisPrescriptionProject, err error) {
+	err = XTReadDB().Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, record_date, user_org_id).Find(&project).Error
+	return project, err
+}
+
+func UpdateProjectObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("patient_id = ? and record_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+
+	err = XTWriteDB().Model(&models.HisPrescription{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id =?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+
+	err = XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	return err
+}
+
 func UpdateAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
 	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error