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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #
@@ -146,7 +146,8 @@ aliquid = 83
 
 [dev]
 mobile_token_expiration_second = 604800
-httpdomain = http://new_mobile.xt.api.sgjyun.com
+# httpdomain = http://new_mobile.xt.api.sgjyun.com
+httpdomain = https://api.xt.test.sgjyun.com
 sso_domain = https://testsso.sgjyun.com
 call_domain = http://hf.szjkhd.com
 front_end_domain = "http://xt.test.sgjyun.com/#"

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id
+		subscibe.OrgId = 10440 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244 //4
+		adminUserInfo.CurrentOrgId = 10440 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15388 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -328,7 +328,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id小英9675或4
+		subscibe.OrgId = 10440 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,8 +338,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244 //4
+		adminUserInfo.CurrentOrgId = 10440 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15388 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -1894,6 +1894,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	age := c.GetString("age")
 	his_department := c.GetString("his_department")
 	his_bed := c.GetString("his_bed")
+	point_puncture := c.GetString("point_puncture")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1967,6 +1968,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		Age:                            age,
 		HisDepartment:                  his_department,
 		HisBed:                         his_bed,
+		PointPuncture:                  point_puncture,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -1984,9 +1986,6 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
 
 		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 {
-			fmt.Println("进来--------------------------------------")
-			fmt.Println("evaluation.WeightBefore", weight_before)
-			fmt.Println(" evaluation.DryWeight", dry_weight)
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
@@ -3442,6 +3441,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	//透析单
 	dialysisOrder, _ := service.MobileGetSchedualDialysisRecordTen(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	fmt.Println("dialysisOrder----------------", dialysisOrder)
 	if dialysisOrder != nil {
 		if dialysisOrder.FinishNurse > 0 {
 			operatorIDs = append(operatorIDs, dialysisOrder.FinishNurse)
@@ -5141,7 +5141,7 @@ func (this *DialysisApiController) GetDialysisGoodTotalCount() {
 	var ids []string
 
 	ids = strings.Split(partion_type, ",")
-	fmt.Println("ids------------------------", ids)
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)

controllers/doctors_api_controller.go

@@ -1262,9 +1262,12 @@ func (this *DoctorsApiController) GetHospitalSummaryDetail() {
 
 	id, _ := this.GetInt64("id")
 	detail, err := service.GetHospitalSummaryDetail(id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	operators, err := service.GetAdminUserEsOne(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"detail": detail,
+			"detail":    detail,
+			"operators": operators,
 		})
 		return
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -843,6 +843,19 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 			order, _ := service.GetDialysisOrder(recordDate.Unix(), id, adminUserInfo.Org.Id)
 			doubleCheck.Creater = order.StartNurse
 		}
+
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			//查询未核对的医嘱
+			doctorList, err := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			for _, advice := range doctorList {
+				if advice.ExecutionStaff == modifier {
+
+					c.ErrorLog("医嘱核对人不能和执行人为同一人!", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.AdviceCodeParamWrong)
+					return
+				}
+			}
+		}
 		err := service.AddSigleDoubleCheck(&doubleCheck)
 
 		//针对长沙南雅
@@ -851,6 +864,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 			doctorList, _ := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
 			if len(doctorList) > 0 && modifier > 0 {
 				for _, advice := range doctorList {
+
 					service.UpdateDoctorAdviceList(advice.ID, modifier)
 					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 					redis := service.RedisClient()
@@ -890,7 +904,21 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.EmployeeNumber = employee_number
 		doubleCheck.NeedleBatchNumber = needle_batch_number
 		doubleCheck.DialyzerBatchNumber = dialyzer_batch_number
+
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			//查询未核对的医嘱
+			doctorList, err := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			for _, advice := range doctorList {
+				if advice.ExecutionStaff == modifier {
+
+					c.ErrorLog("医嘱核对人不能和执行人为同一人!", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.AdviceCodeParamWrong)
+					return
+				}
+			}
+		}
 		err := service.UpdateDoubleCheck(&doubleCheck)
+
 		//针对长沙南雅
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
 			//查询未核对的医嘱
@@ -1701,6 +1729,13 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			if prescribing_number == 0 {
 				prescribing_number = 1
 			}
+			if prescribing_number == 0 && id == 14682 {
+				prescribing_number = 2
+			}
+
+			if prescribing_number == 0 && id == 18560 {
+				prescribing_number = 2
+			}
 			advice := models.DoctorAdvice{
 				UserOrgId:             adminUserInfo.Org.Id,
 				PatientId:             id,
@@ -3294,6 +3329,32 @@ func (c *DialysisAPIController) PostSolution() {
 		}
 	}
 
+	if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 {
+
+		if solution.PrescribingNumber == 0 {
+			solution.PrescribingNumber = 1
+		}
+		if prescription.PrescribingNumber == 0 {
+			prescription.PrescribingNumber = 1
+		}
+
+		if solution.PrescribingNumber == 0 && id == 14682 {
+			solution.PrescribingNumber = 2
+		}
+
+		if solution.PrescribingNumber == 0 && id == 18560 {
+			solution.PrescribingNumber = 2
+		}
+
+		if prescription.PrescribingNumber == 0 && id == 14682 {
+			prescription.PrescribingNumber = 2
+		}
+
+		if prescription.PrescribingNumber == 0 && id == 18560 {
+			prescription.PrescribingNumber = 2
+		}
+	}
+
 	service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 	//获取最新1条
 	dialysisSolution, _ := service.GetLastPatientDialysisSolution(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2849,6 +2849,12 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		evaluation.HisBed = his_bed
 	}
+
+	if dataBody["point_puncture"] != nil && reflect.TypeOf(dataBody["point_puncture"]).String() == "string" {
+		point_puncture := dataBody["point_puncture"].(string)
+
+		evaluation.PointPuncture = point_puncture
+	}
 	return
 }
 

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -1269,3 +1269,15 @@ func (c *MobileHisApiController) GetPatientPlan() {
 	})
 	return
 }
+
+func (c *MobileHisApiController) ToGetPatient() {
+
+	order, _ := service.GetDialysisOrderList(10340)
+	for _, item := range order {
+		service.UpdatePatientDialysisOrder(item.PatientId, item.Url)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -181,5 +181,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/prescription/create", &MobileHisApiController{}, "Post:CreateHisPrescription")
 
 	beego.Router("/m/api/patient/getpatientplan", &MobileHisApiController{}, "Get:GetPatientPlan")
+	beego.Router("/m/api/patient/togetpatient", &MobileHisApiController{}, "Get:ToGetPatient")
 
 }

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -49,10 +49,40 @@ func (this *StaffScheduleApiController) GetMobileDoctorList() {
 func (this *StaffScheduleApiController) GetMobileStaffScheduleList() {
 
 	orgId := this.GetMobileAdminUserInfo().Org.Id
-	start_time, _ := this.GetInt64("start_time")
-	fmt.Println("staft_time", start_time)
-	end_time, _ := this.GetInt64("end_time")
-	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
+	//start_time, _ := this.GetInt64("start_time")
+	//fmt.Println("staft_time", start_time)
+	//end_time, _ := this.GetInt64("end_time")
+	//fmt.Println("start_time",start_time)
+	//fmt.Println("end_time",end_time)
+	start_time_one := this.GetString("start_time_one")
+	end_time_one := this.GetString("end_time_one")
+	fmt.Println("start_time_one--------", len(start_time_one))
+	fmt.Println("end_time_one-------", end_time_one)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	fmt.Println("starti_time233232323232", startTime)
+	fmt.Println("end_time2323223232323", endTime)
+	staffList, err := service.GetStaffScheduleList(orgId, startTime, endTime)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -66,10 +96,33 @@ func (this *StaffScheduleApiController) GetMobileStaffScheduleList() {
 func (this *StaffScheduleApiController) GetMobileNextWeekScheduleLIst() {
 
 	orgId := this.GetMobileAdminUserInfo().Org.Id
-	start_time, _ := this.GetInt64("start_time")
-	end_time, _ := this.GetInt64("end_time")
+	//start_time, _ := this.GetInt64("start_time")
+	//end_time, _ := this.GetInt64("end_time")
+	start_time_one := this.GetString("start_time_one")
+	end_time_one := this.GetString("end_time_one")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
 
-	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
+	staffList, err := service.GetStaffScheduleList(orgId, startTime, endTime)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -82,10 +135,33 @@ func (this *StaffScheduleApiController) GetMobileNextWeekScheduleLIst() {
 
 func (this *StaffScheduleApiController) GetScheduleByUserType() {
 	doctor_id, _ := this.GetInt64("doctor_id")
-	start_time, _ := this.GetInt64("start_time")
-	end_time, _ := this.GetInt64("end_time")
+	//start_time, _ := this.GetInt64("start_time")
+	//end_time, _ := this.GetInt64("end_time")
+	start_time_one := this.GetString("start_time_one")
+	end_time_one := this.GetString("end_time_one")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
 	orgId := this.GetMobileAdminUserInfo().Org.Id
-	staffList, err := service.GetScheduleByDoctorId(doctor_id, start_time, end_time, orgId)
+	staffList, err := service.GetScheduleByDoctorId(doctor_id, startTime, endTime, orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -100,9 +176,34 @@ func (this *StaffScheduleApiController) GetSearchPatientByDoctorId() {
 
 	orgId := this.GetMobileAdminUserInfo().Org.Id
 	user_name := this.GetString("user_name")
-	start_time, _ := this.GetInt64("start_time")
-	end_time, _ := this.GetInt64("end_time")
-	staffList, err := service.ToSearchSeacheduleList(user_name, start_time, end_time, orgId)
+	//start_time, _ := this.GetInt64("start_time")
+	//end_time, _ := this.GetInt64("end_time")
+
+	start_time_one := this.GetString("start_time_one")
+	end_time_one := this.GetString("end_time_one")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	//
+	staffList, err := service.ToSearchSeacheduleList(user_name, startTime, endTime, orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -812,7 +913,7 @@ func (c *StaffScheduleApiController) ChangeScheduleById() {
 	patient_id, _ := c.GetInt64("patient_id")
 	org_id := c.GetMobileAdminUserInfo().Org.Id
 	err := service.ChangeScheduleById(id, mode_id)
-	fmt.Println("9999999999999999", err)
+	fmt.Println("err", err)
 	err = service.ChangeDialysisSolution(patient_id, schedule_date, org_id, mode_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",

controllers/pharmacy_controller.go

@@ -35,7 +35,7 @@ func PharmacyApiRegistRouters() {
 	beego.Router("/api/pharmacy/routeofadministration", &PharmacyController{}, "get:RouteOfAdministration") //获取当前机构的给药途径
 }
 
-//测试
+// 测试
 func (this *PharmacyController) Tlili() {
 	var err error
 	defer func() {
@@ -65,7 +65,7 @@ func (this *PharmacyController) GetCurrentName() {
 	return
 }
 
-//查询今天的待发药，已发药人数
+// 查询今天的待发药，已发药人数
 func (this *PharmacyController) TodayNumber() {
 	var err error
 	defer func() {
@@ -166,8 +166,17 @@ func (this *PharmacyController) IssuedDrug() {
 	}
 
 	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 {
-		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1)
-		fmt.Println("list23323232323232", list)
+
+		//获取排班班次
+		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+
+		var ids []int64
+		for _, item := range schedule {
+			ids = append(ids, item.PatientId)
+		}
+
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
+
 		var flist []models.TmpPatientOne
 		if len(list) > 0 {
 			for _, item := range list {
@@ -247,6 +256,7 @@ func (this *PharmacyController) WaitingDrug() {
 			return
 		}
 		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -261,7 +271,15 @@ func (this *PharmacyController) WaitingDrug() {
 	//当天已发药的人数
 	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
 
-		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0)
+		//获取排班班次
+		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+		fmt.Println("schedule--------", schedule)
+		var ids []int64
+		for _, item := range schedule {
+			ids = append(ids, item.PatientId)
+		}
+
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0, ids)
 
 		var flist []models.TmpPatientOne
 		if len(list) > 0 {
@@ -278,7 +296,6 @@ func (this *PharmacyController) WaitingDrug() {
 
 }
 
-//
 func (this *PharmacyController) GetPharmacyContent() {
 	var err error
 	defer func() {
@@ -320,7 +337,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 
 }
 
-//发药按钮点击
+// 发药按钮点击
 func (this *PharmacyController) DispensingMedicine() {
 	var err error
 	defer func() {
@@ -399,7 +416,7 @@ func (this *PharmacyController) DispensingMedicine() {
 	return
 }
 
-//退药按钮点击
+// 退药按钮点击
 func (this *PharmacyController) DrugWithdrawal() {
 	var err error
 	defer func() {
@@ -437,7 +454,7 @@ func (this *PharmacyController) DrugWithdrawal() {
 
 }
 
-//发药明细列表
+// 发药明细列表
 func (this *PharmacyController) DispensingDetails() {
 	var err error
 	defer func() {
@@ -485,7 +502,7 @@ func (this *PharmacyController) DispensingDetails() {
 	return
 }
 
-//处方详情
+// 处方详情
 func (this *PharmacyController) PrescriptionDetails() {
 	var err error
 	defer func() {
@@ -518,7 +535,7 @@ func (this *PharmacyController) PrescriptionDetails() {
 	return
 }
 
-//已发药品的信息
+// 已发药品的信息
 func (this *PharmacyController) DispenseMedicine() {
 	var err error
 	defer func() {
@@ -563,7 +580,7 @@ func (this *PharmacyController) DispenseMedicine() {
 	return
 }
 
-//待发药的药品信息
+// 待发药的药品信息
 func (this *PharmacyController) WaitingMedicine() {
 	var err error
 	defer func() {
@@ -608,7 +625,7 @@ func (this *PharmacyController) WaitingMedicine() {
 	return
 }
 
-//获取药品的所有患者信息
+// 获取药品的所有患者信息
 func (this *PharmacyController) GetPatientsWithDrugs() {
 	var err error
 	defer func() {
@@ -675,7 +692,7 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 	return
 }
 
-//药品管理发药按钮点击
+// 药品管理发药按钮点击
 func (this *PharmacyController) MedicineDeparture() {
 	var err error
 	defer func() {

controllers/schedule_api_controller.go

@@ -4334,11 +4334,16 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
 	patitionIdStr := c.GetString("patitionid")
 	ids := strings.Split(patitionIdStr, ",")
-	fmt.Println("patitonStr", ids)
+	//fmt.Println("patitonStr", ids)
 	schedule_type, _ := c.GetInt64("schedule_type")
+	is_before, _ := c.GetInt64("is_before")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
 	adminInfo := c.GetAdminUserInfo()
 
 	thisTime := time.Now()
+
 	today := thisTime.Format("2006-01-02")
 	if week < 1 || week > 4 {
 		week = 2
@@ -4377,9 +4382,17 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	loc, _ := time.LoadLocation("Local")
 	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
 	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+
 	weekStartPoint := theStarTime.Unix()
 	weekEndPoint := theEndTime.Unix()
-
+	if is_before > 0 {
+		timeLayout := "2006-01-02 15:04:05"
+		loc, _ := time.LoadLocation("Local")
+		theStarTime, _ := time.ParseInLocation(timeLayout, start_time, loc)
+		theEndTime, _ := time.ParseInLocation(timeLayout, end_time, loc)
+		weekStartPoint = theStarTime.Unix()
+		weekEndPoint = theEndTime.Unix()
+	}
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{

enums/error_code.go

@@ -275,6 +275,8 @@ const ( // ErrorCode
 	ErrorCodeDelScheduleFailByDialysisTwo = 60000003
 
 	ErrorCodeSyncWrong = 60000006
+
+	AdviceCodeParamWrong = 600000007
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -533,6 +535,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodePatientDialysisOrderTwo:      "被替换的患者已经上机,无法替换排班",
 	ErrorCodePatientScheduleRepeat:        "一天只能存在一次排班",
 	ErrorCodeDelScheduleFailByDialysisTwo: "已经上机透析，不能操作排班",
+	AdviceCodeParamWrong:                  "医嘱核对人和执行人不能为同一人,请更换第二核对人!",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -325,6 +325,7 @@ type PredialysisEvaluation struct {
 	Age                            string  `gorm:"column:age" json:"age" form:"age"`
 	HisDepartment                  string  `gorm:"column:his_department" json:"his_department" form:"his_department"`
 	HisBed                         string  `gorm:"column:his_bed" json:"his_bed" form:"his_bed"`
+	PointPuncture                  string  `gorm:"column:point_puncture" json:"point_puncture" form:"point_puncture"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -887,6 +888,7 @@ type XtDialysisOrder struct {
 	Number         int64  `gorm:"column:number" json:"number" form:"number"`
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	Url            string `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (XtDialysisOrder) TableName() string {

models/patient_models.go

@@ -1177,6 +1177,7 @@ type XtPatients struct {
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
+	Url                          string  `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (XtPatients) TableName() string {

service/dialysis_service.go

@@ -896,7 +896,7 @@ func GetAllStarfEs(orgid int64) (es []*models.SgjUserAdminRoles, err error) {
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgid, 10) + ":starfes"
 	starfes_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second)
 	if len(starfes_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
 		err = db.Select("x.id,x.admin_user_id,x.org_id,x.app_id,x.role_id,x.user_name,x.avatar,x.user_type,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id and s.status = 1").Where("x.org_id = ?", orgid).Scan(&es).Error

service/dialysis_solution_service.go

@@ -203,7 +203,7 @@ func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id []
 	//if partition_id > 0 {
 	//	db = db.Where("partition_id = ?", partition_id)
 	//}
-	fmt.Println("len-------------", len(partition_id))
+
 	if len(partition_id) > 0 {
 		db = db.Where("partition_id in(?)", partition_id)
 	}

service/his_service.go

@@ -618,7 +618,7 @@ func GetMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int
 	return
 }
 
-//未收费
+// 未收费
 func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int64, end_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -637,7 +637,7 @@ func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_
 	return
 }
 
-//已收费
+// 已收费
 func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_date int64, end_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -2235,7 +2235,7 @@ func GetHisPrescriptionTemplate(template_id int64, org_id int64) (prescription [
 	return
 }
 
-//组
+// 组
 func GetHisPrescriptionTemplateL(template_id int64, org_id int64) (prescription []*models.HisPrescriptionInfoTemplateL, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfoTemplateL{}).
 		Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
@@ -2343,7 +2343,7 @@ func GetChargeHisPrescriptionSeven(org_id int64, patient_id int64, order_number
 	return
 }
 
-//已收费
+// 已收费
 func GetChargeMonthHisPrescriptionFive(org_id int64, patient_id int64, order_number string, p_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -2714,3 +2714,15 @@ func UpdatePatienPlan(id int64, trement_plan string) error {
 	err := XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status = 1", id).Update(map[string]interface{}{"treatment_plan": trement_plan}).Error
 	return err
 }
+
+func GetDialysisOrderList(orgid int64) (order []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status= 1 and url<>''", orgid).Group("patient_id").Find(&order).Error
+	return order, err
+}
+
+func UpdatePatientDialysisOrder(patient_id int64, url string) error {
+
+	err := XTWriteDB().Model(&models.XtPatients{}).Where("id =? and status=1", patient_id).Updates(map[string]interface{}{"url": url}).Error
+	return err
+}

service/new_stock_service.go

@@ -90,6 +90,10 @@ func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword
 		db = db.Where("x.sum_count = 0")
 	}
 
+	if good_type == 4 {
+		db = db.Where("x.sum_count > 0")
+	}
+
 	if len(keyword) > 0 {
 		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
 	}

service/patient_service.go

@@ -533,7 +533,7 @@ func ChechLastDialysisNo(orgID int64) (dialysisNo int64) {
 }
 
 func FindPatientByDialysisNo(orgID int64, dialysisNo string) (patient models.Patients, err error) {
-	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and dialysis_no=?", orgID, dialysisNo).First(&patient).Error
+	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and dialysis_no=? and lapseto = 1", orgID, dialysisNo).First(&patient).Error
 	return
 }
 
@@ -605,7 +605,7 @@ func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient mode
 		return db.Preload("DeviceNumber", "org_id = ?", orgID).
 			Preload("DeviceZone", "org_id = ?", orgID).
 			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
-	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status = 1", orgID, no).First(&patient).Error
+	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status = 1 ", orgID, no).First(&patient).Error
 	return
 }
 

service/pharmacy_service.go

@@ -96,7 +96,33 @@ func GetTodayAdviceCount(stime, etime, orgid, is_medicine int64) (num int, err e
 	return len(tmp), err
 }
 
-func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+func GetSchedulePatientId(start_time int64, end_time int64, org_id int64, class_type int64, partion_type int64) (schedule []*models.XtSchedules, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status = 1")
+
+	if start_time > 0 {
+		db = db.Where("schedule_date >=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("schedule_date <=?", end_time)
+	}
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if class_type > 0 {
+		db = db.Where("schedule_type =?", class_type)
+	}
+	if partion_type > 0 {
+		db = db.Where("partition_id = ?", partion_type)
+	}
+	err = db.Find(&schedule).Error
+
+	return schedule, err
+}
+
+func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine int64, ids []int64) (advice []*models.HisDoctorAdviceInfo, err error) {
 
 	db := XTReadDB().Model(&advice).Where("status=1 and is_medicine = ?", is_medicine)
 	if stime > 0 {
@@ -109,6 +135,13 @@ func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine i
 		db = db.Where("user_org_id = ?", orgid)
 	}
 
+	if len(ids) == 0 {
+		db = db.Where("patient_id not in(?)", ids)
+	}
+	if len(ids) > 0 {
+		db = db.Where("patient_id in(?)", ids)
+	}
+
 	err = db.Group("patient_id").Find(&advice).Error
 	return advice, err
 }
@@ -1828,7 +1861,8 @@ func PartitionAndLayout(stime, etime, orgid, shift, partition int64, flist []*mo
 	if shift == 0 && partition == 0 {
 		return flist, nil
 	}
-	err = XTWriteDB().Model(&models.XtScheduleTwo{}).Where(s, orgid, stime, etime).Find(&sch).Error
+	err = XTReadDB().Model(&models.XtScheduleTwo{}).Where(s, orgid, stime, etime).Find(&sch).Error
+
 	if err != nil {
 		return
 	}

service/self_drug_service.go

@@ -1816,6 +1816,10 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 	if good_type == 3 {
 		db = db.Where("x.sum_count = 0")
 	}
+
+	if good_type == 4 {
+		db = db.Where("x.sum_count > 0")
+	}
 	if storehouse_id > 0 {
 		db = db.Preload("DrugWarehouseInfo", "org_id = ? and status = 1 and storehouse_id = ? and is_check = 1", orgId, storehouse_id)