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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #

controllers/base_controller.go

@@ -37,4 +37,3 @@ func (this *BaseController) DebugLog(format string, a ...interface{}) {
 func (this *BaseController) TraceLog(format string, a ...interface{}) {
 	//beego.Trace(fmt.Sprintf(format, a...))
 }
-

controllers/data_api_controller.go

@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" || module == "main_content" || module == "patient_case" || module == "tentative_diagnosis" || module == "diagnostic_basis" || module == "differential_diagnosis" || module == "treatment_plan" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" || module == "main_content" || module == "patient_case" || module == "tentative_diagnosis" || module == "diagnostic_basis" || module == "differential_diagnosis" || module == "treatment_plan" || module == "sick_history" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/dialysis_api_controller.go

@@ -113,6 +113,14 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/schedule/getmobileschedulelist", &DialysisApiController{}, "Get:GetMobileScheduleList")
 
 	beego.Router("/api/patient/saveinformation", &DialysisApiController{}, "Get:SaveInformation")
+
+	beego.Router("/api/patient/savedialysisInformationsetting", &DialysisApiController{}, "Get:SaveDialysisInformationSetting")
+
+	beego.Router("/api/patient/getdialyisinformationsetting", &DialysisApiController{}, "Get:GetDialysisInformationSetting")
+
+	beego.Router("/api/patient/checkdialysisinformation", &DialysisApiController{}, "Get:CheckDialysisInformation")
+
+	beego.Router("/api/dialysis/patientsflow", &DialysisApiController{}, "Get:GetDialysisPatientsFlow")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -586,7 +594,13 @@ func (c *DialysisApiController) PostPrescription() {
 			} else {
 				str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 			}
-			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
+
+			if adminUserInfo.CurrentOrgId == 10346 {
+				service.ModifyScheduleModeOne(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
+			} else {
+				service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
+			}
+
 		}
 
 		prescription.Creater = adminUserInfo.AdminUser.Id
@@ -906,7 +920,12 @@ func (c *DialysisApiController) PostSoulution() {
 			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 
 		}
-		service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
+		if adminUserInfo.CurrentOrgId == 10346 {
+			service.ModifyScheduleModeOne(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
+		} else {
+			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
+		}
+
 	}
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -3403,6 +3422,8 @@ func (c *DialysisApiController) CreateMonitor() {
 
 	monitor_anticoagulant, _ := c.GetInt64("monitor_anticoagulant")
 	monitor_anticoagulant_value := c.GetString("monitor_anticoagulant_value")
+	replacement_speed, _ := c.GetFloat("replacement_speed")
+	dicarbonate, _ := c.GetFloat("dicarbonate")
 	monitoring_date = monitoring_date / 1000
 	// operate_time = operate_time / 1000
 	if patient <= 0 {
@@ -3457,6 +3478,8 @@ func (c *DialysisApiController) CreateMonitor() {
 		DialysateFlow:             dialysate_flow,
 		MonitorAnticoagulant:      monitor_anticoagulant,
 		MonitorAnticoagulantValue: monitor_anticoagulant_value,
+		ReplacementSpeed:          replacement_speed,
+		Dicarbonate:               dicarbonate,
 	}
 
 	err := service.CreateMonitor(&monitorRecord)
@@ -3716,9 +3739,9 @@ func adviceFormDatas(advice *models.DoctorAdvice, data []byte, action string) (c
 }
 
 func (c *DialysisApiController) GetDialysisOrder() {
-	xtno := c.GetString("xtno")
+	//xtno := c.GetString("xtno")
 	xtdate := c.GetString("xtdate")
-
+	patient_id, _ := c.GetInt64("patient_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", xtdate+" 00:00:00", loc)
@@ -3735,7 +3758,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 
-	patientInfo, _ := service.FindPatientWithDeviceByNo(adminUserInfo.CurrentOrgId, xtno, xttime)
+	patientInfo, _ := service.FindPatientWithDeviceByPatientId(adminUserInfo.CurrentOrgId, patient_id, xttime)
 
 	//透析单
 	dialysisOrder, _ := service.MobileGetSchedualDialysisRecordTen(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
@@ -5213,7 +5236,7 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 	goodType, _ := service.GetAllGoodType(orgId)
 	if config.IsOpen != 1 {
 		list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, ids)
-		fmt.Println("list2232323223332323232", list)
+
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"list":     list,
@@ -5392,8 +5415,10 @@ func (this *DialysisApiController) GetDialysisParameterList() {
 
 	page, _ := this.GetInt64("page")
 
-	partition_id, _ := this.GetInt64("partition_id")
+	//partition_id, _ := this.GetInt64("partition_id")
 
+	partion_type := this.GetString("partition_id")
+	idSplit := strings.Split(partion_type, ",")
 	schedule_type, _ := this.GetInt64("schedule_type")
 
 	start_time := this.GetString("schedule_date")
@@ -5408,7 +5433,7 @@ func (this *DialysisApiController) GetDialysisParameterList() {
 	if scheduids != "" {
 		ids = strings.Split(scheduids, ",")
 	}
-	list, total, err := service.GetDialysisParameterList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, ids)
+	list, total, err := service.GetDialysisParameterList(keyword, limit, page, idSplit, schedule_type, startTime.Unix(), orgId, ids)
 
 	dialysisSett, _ := service.GetDialysisSetting(orgId)
 	if err == nil {
@@ -6394,6 +6419,111 @@ func (this *DialysisApiController) GetMobileScheduleList() {
 
 }
 
+func (this *DialysisApiController) SaveDialysisInformationSetting() {
+
+	week_day, _ := this.GetInt64("week_day")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	informaitonSetting := models.XtDialysisInformaitonSetting{
+		WeekDay:   week_day,
+		UserOrgId: orgId,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     0,
+	}
+	information, _ := service.GetInformationSettingByOrgId(orgId)
+	if information.ID == 0 {
+		service.CreateInformationSetting(informaitonSetting)
+	}
+	if information.ID > 0 {
+		service.UpdateInformationSettingById(orgId, week_day)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"informaitonSetting": informaitonSetting,
+	})
+	return
+}
+
+func (this *DialysisApiController) GetDialysisInformationSetting() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	informationSetting, _ := service.GetDialysisInformationSetting(orgId)
+
+	//未审核
+	infor, total, _ := service.GetDialysisInformationIsNoCheck(orgId, limit, page, 2)
+
+	//已经审核
+	inforList, totalOne, _ := service.GetDialysisInformationIsNoCheck(orgId, limit, page, 1)
+
+	patients, _ := service.GetAllpatientThirty(orgId)
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+	role, _ := service.GetAllDoctorListSix(orgId, appId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"informaitonSetting": informationSetting,
+		"infor":              infor,
+		"total":              total,
+		"totalOne":           totalOne,
+		"inforList":          inforList,
+		"patients":           patients,
+		"adminList":          role,
+	})
+	return
+}
+
+func (this *DialysisApiController) CheckDialysisInformation() {
+
+	id, _ := this.GetInt64("id")
+	application_status, _ := this.GetInt64("application_status")
+	timeNow := time.Now().Unix()
+	checker := this.GetAdminUserInfo().AdminUser.Id
+	information, _ := service.CheckDialysisInformation(id, application_status, timeNow, checker)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+	})
+	return
+}
+
+func (this *DialysisApiController) GetDialysisPatientsFlow() {
+
+	page, _ := this.GetInt64("page", 1)
+	limit, _ := this.GetInt64("limit", 10)
+	schedulType, _ := this.GetInt64("schedul_type", 0)
+	startTime, _ := this.GetInt64("schedul_time", 0)
+	partitionType, _ := this.GetInt64("partition_type", 0)
+	keywords := this.GetString("keywords")
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	adminUserInfo := this.GetAdminUserInfo()
+	if len(keywords) > 0 {
+
+		dialysisSchedule, err, total := service.GetDialysisWatchByKeywordFlow(adminUserInfo.CurrentOrgId, keywords, schedulType, partitionType, page, limit, start_time/1000, end_time/1000)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedule": dialysisSchedule,
+				"total":    total,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		}
+
+	} else {
+		dialysisSchedule, err, total := service.GetDialysisWatchFlow(adminUserInfo.CurrentOrgId, startTime/1000, schedulType, partitionType, page, limit, start_time/1000, end_time/1000)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedule": dialysisSchedule,
+				"total":    total,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		}
+	}
+}
+
 func (this *DialysisApiController) SaveInformation() {
 
 	patient_id, _ := this.GetInt64("patient_id")

controllers/dialysis_record_api_controller.go

@@ -565,6 +565,8 @@ type EditMonitorParamObject struct {
 	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
 	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
 	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
+	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
+	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -712,6 +714,8 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			HeparinAmount:               monitorParam.HeparinAmount,
 			Dehydration:                 monitorParam.Dehydration,
 			FilterPressure:              monitorParam.FilterPressure,
+			ReplacementSpeed:            monitorParam.ReplacementSpeed,
+			Dicarbonate:                 monitorParam.Dicarbonate,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		finish := models.XtDialysisFinish{
@@ -812,6 +816,8 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.HeparinAmount = monitorParam.HeparinAmount
 		monitor.Dehydration = monitorParam.Dehydration
 		monitor.FilterPressure = monitorParam.FilterPressure
+		monitor.ReplacementSpeed = monitorParam.ReplacementSpeed
+		monitor.Dicarbonate = monitorParam.Dicarbonate
 		updateErr := service.UpdateMonitor(monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		redis := service.RedisClient()

controllers/doctors_api_controller.go

@@ -164,7 +164,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 func (c *DoctorsApiController) GetAllDoctorAndNurse() {
 
 	adminUserInfo := c.GetAdminUserInfo()
-	doctors, nursers, _ := service.GetAllDoctorAndNurseSix(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+	doctors, nursers, _ := service.GetAllDoctorAndNurseSeven(adminUserInfo.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"doctors": doctors,

controllers/gobal_config_api_controller.go

@@ -600,7 +600,7 @@ func (c *GobalConfigApiController) GetDoctorAdviceConfig() {
 	})
 }
 
-//SF6090214798525
+// SF6090214798525
 func (c *GobalConfigApiController) Load(filename string, v interface{}) {
 	//ReadFile函数会读取文件的全部内容，并将结果以[]byte类型返回
 	data, err := ioutil.ReadFile(filename)

controllers/his_api_controller.go

@@ -4278,13 +4278,13 @@ func (c *HisApiController) DeleteProject() {
 	label.Status = 0
 	service.CreateHisLabelRecord(&label)
 
+	fmt.Println(goodOutConfig.IsOpen)
 	if goodOutConfig.IsOpen != 1 {
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 2 {
 				err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
 				fmt.Println(err)
 			}
-
 			if project.Type == 3 && project.IsOut == 1 {
 
 				houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
@@ -4536,12 +4536,15 @@ func (c *HisApiController) DeleteProject() {
 				fmt.Println(err)
 			}
 
+		} else {
+			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
+			fmt.Println(err)
+
 		}
 	}
 
 	//保存处方出库
 	if goodOutConfig.IsOpen == 1 {
-
 		if project.Type == 3 {
 			houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
@@ -9781,7 +9784,7 @@ func (c *HisApiController) GetPrivateExpensesInfo() {
 	}
 
 	orderInfos = append(orderInfos, orderInfos_two...)
-	if c.GetAdminUserInfo().CurrentOrgId != 10138 {
+	if c.GetAdminUserInfo().CurrentOrgId != 10138 || c.GetAdminUserInfo().CurrentOrgId != 10278 {
 		orderInfos = append(orderInfos, orderInfos_three...)
 
 	}

controllers/his_config_api_controller.go

@@ -515,6 +515,7 @@ func (this *HisConfigApiController) GetModeTemplateName() {
 func (this *HisConfigApiController) GetPrescriptionTemplateDetail() {
 
 	mode_id, _ := this.GetInt64("mode_id")
+
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	template, _ := service.GetModeTemplateNameDetail(mode_id, orgId)
 
@@ -1014,7 +1015,7 @@ func (c *HisConfigApiController) GetDrugsName() {
 
 }
 
-//配置项
+// 配置项
 func (c *HisConfigApiController) GetModeConfigs() {
 	var err error
 	defer func() {
@@ -1177,7 +1178,7 @@ func (c *HisConfigApiController) ReplaceConfig() {
 
 }
 
-//批量替换——药品
+// 批量替换——药品
 func (c *HisConfigApiController) ReplaceSaveDrug() {
 	var g errgroup.Group
 	var err error
@@ -1323,7 +1324,7 @@ func (c *HisConfigApiController) ReplaceSaveDrug() {
 	return
 }
 
-//批量替换项目
+// 批量替换项目
 func (c *HisConfigApiController) ReplaceSaveProject() {
 	var g errgroup.Group
 	var err error
@@ -1489,7 +1490,7 @@ func (c *HisConfigApiController) ReplaceSaveProject() {
 	return
 }
 
-//批量删除项目
+// 批量删除项目
 func (c *HisConfigApiController) BatchDeleteItems() {
 	var g errgroup.Group
 	var err error
@@ -1539,7 +1540,7 @@ func (c *HisConfigApiController) BatchDeleteItems() {
 	return
 }
 
-//批量删除药品
+// 批量删除药品
 func (c *HisConfigApiController) DeleteDrugsBatch() {
 	var g errgroup.Group
 	var err error
@@ -1589,7 +1590,7 @@ func (c *HisConfigApiController) DeleteDrugsBatch() {
 	return
 }
 
-//批量添加
+// 批量添加
 func (c *HisConfigApiController) AddsTemplate() {
 	var g errgroup.Group
 	var err error
@@ -1787,7 +1788,7 @@ func (c *HisConfigApiController) AddsTemplate() {
 
 }
 
-//根据透析模式和患者id获取该患者的处方内容
+// 根据透析模式和患者id获取该患者的处方内容
 func (c *HisConfigApiController) PTemplateInformation() {
 	var err error
 	defer func() {
@@ -1812,7 +1813,7 @@ func (c *HisConfigApiController) PTemplateInformation() {
 	return
 }
 
-//删除单条记录
+// 删除单条记录
 func (c *HisConfigApiController) DeleteOne() {
 	var err error
 	defer func() {

controllers/his_deposit_controller.go

@@ -59,7 +59,7 @@ func HisDepositApiRegistRouters() {
 //	return
 //}
 
-//获取病例中心，有效患者名称（去除了转出和死亡的）
+// 获取病例中心，有效患者名称（去除了转出和死亡的）
 func (this *HisDepositApiController) GetHisUserToAlive() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetHisUserToAlive(orgid)
@@ -73,7 +73,7 @@ func (this *HisDepositApiController) GetHisUserToAlive() {
 	return
 }
 
-//获取病例中心，有效患者名称
+// 获取病例中心，有效患者名称
 func (this *HisDepositApiController) GetHisUser() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	token := this.Ctx.Request.Header.Get("Cookie")
@@ -89,7 +89,7 @@ func (this *HisDepositApiController) GetHisUser() {
 	return
 }
 
-//新增押金
+// 新增押金
 func (this *HisDepositApiController) AddDeposit() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	dataBody := make(map[string]interface{}, 0)
@@ -162,7 +162,7 @@ func (this *HisDepositApiController) AddDeposit() {
 	return
 }
 
-//获取新增押金编号
+// 获取新增押金编号
 func (this *HisDepositApiController) GetDepositCode() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	var code string
@@ -179,7 +179,7 @@ func (this *HisDepositApiController) GetDepositCode() {
 	return
 }
 
-//获取退款编号
+// 获取退款编号
 func (this *HisDepositApiController) GetDeleteCode() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	var code string
@@ -196,7 +196,7 @@ func (this *HisDepositApiController) GetDeleteCode() {
 	return
 }
 
-//充值明细列表
+// 充值明细列表
 func (this *HisDepositApiController) RechargeDetails() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
@@ -253,7 +253,7 @@ func (this *HisDepositApiController) RechargeDetails() {
 	return
 }
 
-//充值汇总列表
+// 充值汇总列表
 func (this *HisDepositApiController) RechargeSummary() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
@@ -328,7 +328,7 @@ func (this *HisDepositApiController) RechargeSummary() {
 	return
 }
 
-//审核
+// 审核
 func (this *HisDepositApiController) UpDeposit() {
 	id, _ := this.GetInt64("id", 0)
 	if id == 0 {
@@ -386,7 +386,7 @@ func (this *HisDepositApiController) DeleteHistory() {
 	return
 }
 
-//根据id获取押金流水
+// 根据id获取押金流水
 func (this *HisDepositApiController) DepositFlow() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	check := map[string][]string{
@@ -454,7 +454,7 @@ func (this *HisDepositApiController) DepositFlow() {
 	return
 }
 
-//获取患者押金列表
+// 获取患者押金列表
 func (this *HisDepositApiController) GetUserList() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	keyword := this.GetString("keyword")
@@ -499,7 +499,7 @@ func (this *HisDepositApiController) GetUserList() {
 	return
 }
 
-//扣费明细查询
+// 扣费明细查询
 func (this *HisDepositApiController) DeductionDetails() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
@@ -566,7 +566,7 @@ func (this *HisDepositApiController) DeductionDetails() {
 	return
 }
 
-//扣费汇总
+// 扣费汇总
 func (this *HisDepositApiController) DeSummary() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
@@ -648,7 +648,7 @@ func (this *HisDepositApiController) DeSummary() {
 	return
 }
 
-//根据患者id查询患者的余额
+// 根据患者id查询患者的余额
 func (this *HisDepositApiController) IdToBalance() {
 	check := map[string][]string{
 		"his_patient_id": {"must", "int", "his_patient_id"},
@@ -667,7 +667,7 @@ func (this *HisDepositApiController) IdToBalance() {
 	return
 }
 
-//新增一条退款申请
+// 新增一条退款申请
 func (this *HisDepositApiController) RefundApplication() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	createid := this.GetAdminUserInfo().AdminUser.Id
@@ -734,7 +734,7 @@ func (this *HisDepositApiController) RefundApplication() {
 
 }
 
-//退款审核通过/拒绝
+// 退款审核通过/拒绝
 func (this *HisDepositApiController) RefundReview() {
 	check := map[string][]string{
 		"ids":          {"must", "string", "ids"},
@@ -770,7 +770,7 @@ func (this *HisDepositApiController) RefundReview() {
 	return
 }
 
-//退款删除
+// 退款删除
 func (this *HisDepositApiController) DeleteRefund() {
 	check := map[string][]string{
 		"id": {"must", "int", "id"},
@@ -793,7 +793,7 @@ func (this *HisDepositApiController) DeleteRefund() {
 	return
 }
 
-//更改退款申请
+// 更改退款申请
 func (this *HisDepositApiController) ChangeRefund() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	dataBody := make(map[string]interface{}, 0)
@@ -861,7 +861,7 @@ func (this *HisDepositApiController) ChangeRefund() {
 	return
 }
 
-//退款分页
+// 退款分页
 func (this *HisDepositApiController) RefundList() {
 	check := map[string][]string{
 		"refundtype":  {"must", "int", "refundtype"},
@@ -949,7 +949,7 @@ func (this *HisDepositApiController) GetorgName() {
 	return
 }
 
-//获取本月时间
+// 获取本月时间
 func (this *HisDepositApiController) GetMonthTime() {
 	stime, etime := service.GetMonth()
 	srart_time := fmt.Sprintf(time.Unix(stime, 0).Format("2006-01-02"))
@@ -962,7 +962,7 @@ func (this *HisDepositApiController) GetMonthTime() {
 	return
 }
 
-//获取本周时间
+// 获取本周时间
 func (this *HisDepositApiController) GetWeekTime() {
 	stime, etime := service.GetMondayOfWeek()
 	srart_time := fmt.Sprintf(time.Unix(stime, 0).Format("2006-01-02"))
@@ -975,7 +975,7 @@ func (this *HisDepositApiController) GetWeekTime() {
 	return
 }
 
-//判断前端参数是否为空
+// 判断前端参数是否为空
 func checks(this *HisDepositApiController, m *map[string][]string) (map[string]string, error) {
 	tmp := make(map[string]string)
 	for k, v := range *m {

controllers/his_project_api_controller.go

@@ -331,6 +331,7 @@ func (this *HisProjectApiController) SaveProjectTeam() {
 	tube_color, _ := this.GetInt64("tube_color")
 	team_type, _ := this.GetInt64("team_type")
 	remark := this.GetString("remark")
+	sort, _ := this.GetInt64("sort")
 	//ids := this.GetString("ids")
 	//item_id := this.GetString("item_id")
 
@@ -355,6 +356,7 @@ func (this *HisProjectApiController) SaveProjectTeam() {
 		UserOrgId:   orgId,
 		Status:      1,
 		CreatedTime: time.Now().Unix(),
+		Sort:        sort,
 		//ProjectId:   ids,
 		//ItemId:      item_id,
 	}
@@ -479,7 +481,7 @@ func (this *HisProjectApiController) UpdatedProjectTeam() {
 	tube_color, _ := this.GetInt64("tube_color")
 	team_type, _ := this.GetInt64("team_type")
 	remark := this.GetString("remark")
-
+	sort, _ := this.GetInt64("sort")
 	projectTeam, _ := service.GetProjectTeamDetail(id)
 
 	projectTeam.ProjectTeam = project_team
@@ -489,6 +491,7 @@ func (this *HisProjectApiController) UpdatedProjectTeam() {
 	projectTeam.TubeColor = tube_color
 	projectTeam.TeamType = team_type
 	projectTeam.Remark = remark
+	projectTeam.Sort = sort
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)

controllers/inspection_api_controller.go

@@ -27,12 +27,17 @@ func InspectionApiRegistRouters() {
 	beego.Router("/api/patient/inspection/get", &InspectionApiController{}, "Get:GetAllPatientInspection")
 	beego.Router("/api/patient/inspectioninit/get", &InspectionApiController{}, "Get:GetInitInsepction")
 
+	beego.Router("/api/patient/pic_inspection/create", &InspectionApiController{}, "Post:CreatePatientPicInspection")
+	beego.Router("/api/patient/pic_inspection/edit", &InspectionApiController{}, "Post:EditPatientPicInspection")
+
 }
 
-//PatientInspectionReference 请求检验检查大小项目
-//[get]: /api/patient/inspection/reference
+// PatientInspectionReference 请求检验检查大小项目
+// [get]: /api/patient/inspection/reference
 func (c *InspectionApiController) PatientInspectionReference() {
 	patient, _ := c.GetInt64("patient")
+	inspect_type, _ := c.GetInt64("type")
+
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -40,7 +45,7 @@ func (c *InspectionApiController) PatientInspectionReference() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 
-	references, err := service.GetInspectionReference(adminUserInfo.CurrentOrgId)
+	references, err := service.GetInspectionReference(adminUserInfo.CurrentOrgId, inspect_type)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -226,6 +231,179 @@ func (c *InspectionApiController) CreatePatientInspection() {
 	})
 	return
 }
+func (c *InspectionApiController) CreatePatientPicInspection() {
+	patient, _ := c.GetInt64("patient", 0)
+	if patient <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	patientInfo, _ := service.FindPatientById(adminUserInfo.CurrentOrgId, patient)
+	if patientInfo.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+
+	var from models.InepectionPICForm
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &from)
+	if err != nil {
+		utils.ErrorLog("%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02 15:04"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
+		return
+	}
+	if len(from.Imags) == 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "未上传图片")
+		return
+	}
+
+	date := theTime.Unix()
+	insp, err := service.GetPatientInspectionByDate(adminUserInfo.CurrentOrgId, patient, date, from.ProjectId)
+	if err != nil {
+		utils.ErrorLog("%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	if len(insp) > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInspectionDateExit)
+		return
+	}
+
+	inspection_re, _ := service.GetInspectionReferenceTwo(from.ProjectId)
+
+	inspections := make([]models.Inspection, 0)
+	for index, item := range from.Imags {
+		var inspection models.Inspection
+		inspection.OrgId = adminUserInfo.CurrentOrgId
+		inspection.PatientId = patient
+		inspection.ProjectId = from.ProjectId
+		inspection.ItemId = inspection_re[index].ID
+		inspection.ItemName = item.Desc
+		inspection.ProjectName = ""
+		inspection.InspectType = 3
+		inspection.InspectValue = item.ImgUrl
+		inspection.InspectDesc = item.Desc
+		inspection.InspectDate = date
+		inspection.Status = 1
+		inspection.CreatedTime = time.Now().Unix()
+		inspection.UpdatedTime = time.Now().Unix()
+		inspections = append(inspections, inspection)
+	}
+	err = service.CreatePatientInspection(inspections)
+	if err != nil {
+		utils.ErrorLog("%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInspectionAddFail)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"inspections": inspections,
+	})
+	return
+}
+func (c *InspectionApiController) EditPatientPicInspection() {
+	patient, _ := c.GetInt64("patient", 0)
+	if patient <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	patientInfo, _ := service.FindPatientById(adminUserInfo.CurrentOrgId, patient)
+	if patientInfo.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+
+	var from models.InepectionPICForm
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &from)
+	if err != nil {
+		utils.ErrorLog("%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02 15:04"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
+		return
+	}
+	if len(from.Imags) == 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "未上传图片")
+		return
+	}
+
+	date := theTime.Unix()
+	inspection_re, _ := service.GetInspectionReferenceTwo(from.ProjectId)
+	inspections := make([]models.Inspection, 0)
+	for index, item := range from.Imags {
+		if item.ID == 0 {
+			var inspection models.Inspection
+			inspection.OrgId = adminUserInfo.CurrentOrgId
+			inspection.PatientId = patient
+			inspection.ProjectId = from.ProjectId
+			inspection.ItemId = inspection_re[index].ID
+			inspection.ItemName = item.Desc
+			inspection.ProjectName = ""
+			inspection.InspectType = 3
+			inspection.InspectValue = item.ImgUrl
+			inspection.InspectDesc = item.Desc
+			inspection.InspectDate = date
+			inspection.Status = 1
+			inspection.CreatedTime = time.Now().Unix()
+			inspection.UpdatedTime = time.Now().Unix()
+			inspections = append(inspections, inspection)
+
+		} else {
+			var inspection models.Inspection
+			inspection.ID = item.ID
+			inspection.OrgId = adminUserInfo.CurrentOrgId
+			inspection.PatientId = patient
+			inspection.ProjectId = from.ProjectId
+			inspection.ItemId = inspection_re[index].ID
+			inspection.ItemName = item.Desc
+			inspection.ProjectName = ""
+			inspection.InspectType = 3
+			inspection.InspectValue = item.ImgUrl
+			inspection.InspectDesc = item.Desc
+			inspection.InspectDate = date
+			inspection.Status = 1
+			inspection.CreatedTime = time.Now().Unix()
+			inspection.UpdatedTime = time.Now().Unix()
+			err = service.SavePatientInspection(inspection)
+		}
+
+	}
+
+	for _, item := range from.DeleteImg {
+		service.DeleteInspectionTwo(item.ID)
+	}
+	if len(inspections) > 0 {
+		err = service.CreatePatientInspection(inspections)
+	}
+	if err != nil {
+		utils.ErrorLog("%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInspectionAddFail)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"inspections": inspections,
+	})
+	return
+}
 
 func (c *InspectionApiController) EditPatientInspection() {
 	patient, _ := c.GetInt64("patient", 0)

controllers/integration_config_api_controller.go

@@ -31,46 +31,44 @@ func IntegrationConfigRegistRouters() {
 
 func (c *IntegrationConfigApiController) SaveInspectionSysItemId() {
 	adminUserInfo := c.GetAdminUserInfo()
-	org_id,_ := c.GetInt64("org_id",0)
-	sys_item_id,_ := c.GetInt64("sys_item_id",0)
-	id,_ := c.GetInt64("id",0)
-	if org_id != adminUserInfo.CurrentOrgId || sys_item_id<= 0 || id <= 0 {
+	org_id, _ := c.GetInt64("org_id", 0)
+	sys_item_id, _ := c.GetInt64("sys_item_id", 0)
+	id, _ := c.GetInt64("id", 0)
+	if org_id != adminUserInfo.CurrentOrgId || sys_item_id <= 0 || id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	}
 
 	inspection_reference := &models.InspectionReference{
-		ID : id,
-		SysItemId : sys_item_id,
-		UpdatedTime : time.Now().Unix(),
+		ID:          id,
+		SysItemId:   sys_item_id,
+		UpdatedTime: time.Now().Unix(),
 	}
 	err := service.UpdateSysItemIdByID(inspection_reference)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"inspection_reference":  inspection_reference,
+		"inspection_reference": inspection_reference,
 	})
 	return
 }
 
 func (c *IntegrationConfigApiController) GetSysInspectionList() {
 	adminUserInfo := c.GetAdminUserInfo()
-	sysInspection,ownerInspection,err := service.GetSysInspectionList(adminUserInfo.CurrentOrgId)
+	sysInspection, ownerInspection, err := service.GetSysInspectionList(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	}
 
 	type InspectionStruce struct {
-		ProjectName string  `gorm:"-" json:"project_name" form:"project_name"`
-		ProjectId int64 `gorm:"-" json:"project_id" form:"project_id"`
-		InspectionReference []*models.InspectionReference  `gorm:"-" json:"inspection_reference" form:"inspection_reference"`
+		ProjectName         string                        `gorm:"-" json:"project_name" form:"project_name"`
+		ProjectId           int64                         `gorm:"-" json:"project_id" form:"project_id"`
+		InspectionReference []*models.InspectionReference `gorm:"-" json:"inspection_reference" form:"inspection_reference"`
 	}
 
 	sysInspec := make(map[int64]*InspectionStruce, 0)
 	ownerInspec := make(map[int64]*InspectionStruce, 0)
 
-	
-
 	for _, item := range sysInspection {
 		result := sysInspec[item.ProjectId]
 		if result == nil {
@@ -94,7 +92,7 @@ func (c *IntegrationConfigApiController) GetSysInspectionList() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"sysInspec":  sysInspec,
+		"sysInspec":   sysInspec,
 		"ownerInspec": ownerInspec,
 	})
 	return
@@ -123,46 +121,46 @@ func (c *IntegrationConfigApiController) GetSyncList() {
 
 func (c *IntegrationConfigApiController) SaveInterface() {
 	adminUserInfo := c.GetAdminUserInfo()
-	ID,_ := c.GetInt64("id",0)
+	ID, _ := c.GetInt64("id", 0)
 	OrgId := adminUserInfo.CurrentOrgId
-	Creater := adminUserInfo.AdminUser.Id 
-	Pattern,_ := c.GetInt("pattern",0)		
-	Dbhost := c.GetString("dbhost") 
+	Creater := adminUserInfo.AdminUser.Id
+	Pattern, _ := c.GetInt("pattern", 0)
+	Dbhost := c.GetString("dbhost")
 	Dbuser := c.GetString("dbuser")
-	Dbpassword := c.GetString("dbpassword") 
+	Dbpassword := c.GetString("dbpassword")
 	Dbname := c.GetString("dbname")
-	InterfaceUrl := c.GetString("interface_url") 
+	InterfaceUrl := c.GetString("interface_url")
 	InterFaceToken := c.GetString("interface_token")
 	AllowIp := c.GetString("allow_ip")
-	AllowToken := c.GetString("allow_token")		
-	SyncFrequency,_ := c.GetInt("sync_frequency")
+	AllowToken := c.GetString("allow_token")
+	SyncFrequency, _ := c.GetInt("sync_frequency")
 	Status := 1
-	UpdatedTime :=  time.Now().Unix()
+	UpdatedTime := time.Now().Unix()
 	interfaceinfo := &models.MiddleInterface{
-		ID  		: ID,
-	OrgId   		: OrgId	,
-	Creater   		: Creater	,
-	Pattern 		: Pattern	,
-	Dbhost 			: Dbhost	,
-	Dbuser 			: Dbuser	,
-	Dbpassword 		: Dbpassword	,
-	Dbname 			: Dbname	,
-	InterfaceUrl 	: InterfaceUrl	,
-	InterFaceToken 	: InterFaceToken	,
-	AllowIp 		: AllowIp	,
-	AllowToken 		: AllowToken	,
-	SyncFrequency 	: SyncFrequency	,
-	Status			: Status	,
-	UpdatedTime     : UpdatedTime	,
+		ID:             ID,
+		OrgId:          OrgId,
+		Creater:        Creater,
+		Pattern:        Pattern,
+		Dbhost:         Dbhost,
+		Dbuser:         Dbuser,
+		Dbpassword:     Dbpassword,
+		Dbname:         Dbname,
+		InterfaceUrl:   InterfaceUrl,
+		InterFaceToken: InterFaceToken,
+		AllowIp:        AllowIp,
+		AllowToken:     AllowToken,
+		SyncFrequency:  SyncFrequency,
+		Status:         Status,
+		UpdatedTime:    UpdatedTime,
 	}
 	if ID <= 0 {
-		interfaceinfo.CreatedTime =  time.Now().Unix()
+		interfaceinfo.CreatedTime = time.Now().Unix()
 	}
-	err:= service.SaveInterface(interfaceinfo)
+	err := service.SaveInterface(interfaceinfo)
 
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"interfaceinfo":  interfaceinfo,
+			"interfaceinfo": interfaceinfo,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -174,7 +172,7 @@ func (c *IntegrationConfigApiController) GetInterface() {
 	adminUserInfo := c.GetAdminUserInfo()
 	interfaceinfo, _ := service.GetInterface(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"interfaceinfo":  interfaceinfo,
+		"interfaceinfo": interfaceinfo,
 	})
 	return
 
@@ -244,31 +242,31 @@ func (c *IntegrationConfigApiController) CreatePatientHis() {
 	}
 
 	hisPatient := &models.HisPatients{
-		UserOrgId:          adminUserInfo.CurrentOrgId,
-		UserId:             patient.UserId,
-		Avatar:             patient.Avatar,
-		PatientType:        patient.PatientType,
-		DialysisNo:         patient.DialysisNo,
-		AdmissionNumber:    patient.AdmissionNumber,
-		Source:             patient.Source,
-		Lapseto:            patient.Lapseto,
-		PartitionId:        patient.PartitionId,
-		BedId:              patient.BedId,
-		Name:               patient.Name,
-		Alias:              patient.Alias,
-		Gender:             patient.Gender,
-		Nation:             patient.Nation,
-		NativePlace:        patient.NativePlace,
-		MaritalStatus:      patient.MaritalStatus,
-		IdCardNo:           patient.IdCardNo,
-		Birthday:           patient.Birthday,
-		ReimbursementWayId: patient.ReimbursementWayId,
-		HealthCareType:     patient.HealthCareType,
-		HealthCareNo:       patient.HealthCareNo,
-		HealthCareDueDate:  patient.HealthCareDueDate,
-		Height:             patient.Height,
-		BloodType:          patient.BloodType,
-		Rh:                 patient.Rh,
+		UserOrgId:                    adminUserInfo.CurrentOrgId,
+		UserId:                       patient.UserId,
+		Avatar:                       patient.Avatar,
+		PatientType:                  patient.PatientType,
+		DialysisNo:                   patient.DialysisNo,
+		AdmissionNumber:              patient.AdmissionNumber,
+		Source:                       patient.Source,
+		Lapseto:                      patient.Lapseto,
+		PartitionId:                  patient.PartitionId,
+		BedId:                        patient.BedId,
+		Name:                         patient.Name,
+		Alias:                        patient.Alias,
+		Gender:                       patient.Gender,
+		Nation:                       patient.Nation,
+		NativePlace:                  patient.NativePlace,
+		MaritalStatus:                patient.MaritalStatus,
+		IdCardNo:                     patient.IdCardNo,
+		Birthday:                     patient.Birthday,
+		ReimbursementWayId:           patient.ReimbursementWayId,
+		HealthCareType:               patient.HealthCareType,
+		HealthCareNo:                 patient.HealthCareNo,
+		HealthCareDueDate:            patient.HealthCareDueDate,
+		Height:                       patient.Height,
+		BloodType:                    patient.BloodType,
+		Rh:                           patient.Rh,
 		HealthCareDueAlertDate:       patient.HealthCareDueAlertDate,
 		EducationLevel:               patient.EducationLevel,
 		Profession:                   patient.Profession,
@@ -310,18 +308,18 @@ func (c *IntegrationConfigApiController) CreatePatientHis() {
 		CreatedTime:                  time.Now().Unix(),
 		UpdatedTime:                  time.Now().Unix(),
 		Age:                          patient.Age,
-		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
-		IsInfectious:             patient.IsInfectious,
-		RemindCycle:              patient.RemindCycle,
-		ResponseResult:           patient.ResponseResult,
-		IsOpenRemind:             patient.IsOpenRemind,
-		DialysisAge:              patient.DialysisAge,
-		ExpenseKind:              patient.ExpenseKind,
-		TellPhone:                patient.TellPhone,
-		FirstTreatmentDate:       patient.FirstTreatmentDate,
-		ContactName:              patient.ContactName,
-		HisUserId:                his_user_id,
-		XtPatientId:              patient.ID,
+		InfectiousNextRecordTime:     patient.InfectiousNextRecordTime,
+		IsInfectious:                 patient.IsInfectious,
+		RemindCycle:                  patient.RemindCycle,
+		ResponseResult:               patient.ResponseResult,
+		IsOpenRemind:                 patient.IsOpenRemind,
+		DialysisAge:                  patient.DialysisAge,
+		ExpenseKind:                  patient.ExpenseKind,
+		TellPhone:                    patient.TellPhone,
+		FirstTreatmentDate:           patient.FirstTreatmentDate,
+		ContactName:                  patient.ContactName,
+		HisUserId:                    his_user_id,
+		XtPatientId:                  patient.ID,
 	}
 
 	err := service.CreatePatientsHis(hisPatient)

controllers/manage_api_controller.go

@@ -145,6 +145,8 @@ func ManageRouters() {
 	beego.Router("/api/manage/getobjecttabledisinfectbyidlist", &MachineApiController{}, "Get:GetObjectTableDisinfectByList")
 	beego.Router("/api/manage/updateobjecttabledisinfect", &MachineApiController{}, "Post:UpdateObjectTableDisinfect")
 	beego.Router("/api/manage/deleteobjecttabledisinfect", &MachineApiController{}, "Get:DeleteObjectTableDisinfect")
+	beego.Router("/api/manage/getairdisinfectionlongtime", &MachineApiController{}, "Get:GetAirDisinfectionLongTime")
+	beego.Router("/api/manage/getobjcttabledisinfectlongtime", &MachineApiController{}, "Get:GetObjectDisInfectionLongTime")
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -4495,7 +4497,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
 
 	first_end_time := dataBody["first_end_time"].(string)
 
@@ -4503,7 +4505,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -4523,7 +4525,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
 
@@ -4531,7 +4533,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -4551,7 +4553,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
 
@@ -4559,7 +4561,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -4575,7 +4577,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
@@ -4583,7 +4585,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -4723,7 +4725,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
 
 	first_end_time := dataBody["first_end_time"].(string)
 
@@ -4731,7 +4733,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -4751,7 +4753,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
 
@@ -4759,7 +4761,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -4779,7 +4781,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
 
@@ -4787,7 +4789,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -4803,7 +4805,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
@@ -4811,7 +4813,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -4908,19 +4910,19 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 
 	first_start_time := dataBody["first_start_time"].(string)
 
-	if len(first_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var firstStartTimeUnix int64
+	if len(first_start_time) > 0 {
+		firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
+		firstStartTimeUnix = firstStartTime.Unix()
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
 
+	var firstEndTimeUnix int64
 	first_end_time := dataBody["first_end_time"].(string)
 
-	if len(first_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	if len(first_end_time) > 0 {
+		firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
+		firstEndTimeUnix = firstEndTime.Unix()
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -4935,20 +4937,18 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 	sencond_disinfection_time := dataBody["sencond_disinfection_time"].(string)
 
 	sencond_start_time := dataBody["sencond_start_time"].(string)
-
-	if len(sencond_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var sencondStartTimeUnixt int64
+	if len(sencond_start_time) > 0 {
+		sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
+		sencondStartTimeUnixt = sencondStartTime.Unix()
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
-
-	if len(sencond_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var sencondEndTimeUnixt int64
+	if len(sencond_end_time) > 0 {
+		sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
+		sencondEndTimeUnixt = sencondEndTime.Unix()
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -4963,20 +4963,18 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 	third_disinfection_time := dataBody["third_disinfection_time"].(string)
 
 	third_start_time := dataBody["third_start_time"].(string)
-
-	if len(third_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var thirdStartTimeUnix int64
+	if len(third_start_time) > 0 {
+		thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
+		thirdStartTimeUnix = thirdStartTime.Unix()
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
-
-	if len(third_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var thirdEndTimeUnix int64
+	if len(third_end_time) > 0 {
+		thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
+		thirdEndTimeUnix = thirdEndTime.Unix()
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -4991,20 +4989,18 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 	fourth_disinfection_time := dataBody["fourth_disinfection_time"].(string)
 
 	fourth_start_time := dataBody["fourth_start_time"].(string)
-
-	if len(fourth_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var fourthiStartTimeUnitx int64
+	if len(fourth_start_time) > 0 {
+		fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
+		fourthiStartTimeUnitx = fourthStartTime.Unix()
 	}
-	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_start_time)
 
 	fourth_end_time := dataBody["fourth_end_time"].(string)
-
-	if len(fourth_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var fourthEndTimeUnix int64
+	if len(fourth_end_time) > 0 {
+		fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
+		fourthEndTimeUnix = fourthEndTime.Unix()
 	}
-	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_end_time)
 
 	fourth_total_time := dataBody["fourth_total_time"].(string)
 
@@ -5018,20 +5014,19 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 	last_disinfection_methods := dataBody["last_disinfection_methods"].(string)
 	last_disinfection_time := dataBody["last_disinfection_time"].(string)
 	last_start_time := dataBody["last_start_time"].(string)
-
-	if len(last_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var lastStartTimeUnix int64
+	if len(last_start_time) > 0 {
+		lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
+		lastStartTimeUnix = lastStartTime.Unix()
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
-	if len(last_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var lastEndTimeUnix int64
+	if len(last_end_time) > 0 {
+		lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
+		lastEndTimeUnix = lastEndTime.Unix()
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -5049,8 +5044,8 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		FirstDisinfectionWater:     first_disinfection_water,
 		FirstDisinfectionMethods:   first_disinfection_methods,
 		FirstDisinfectionTime:      first_disinfection_time,
-		FirstStartTime:             firstStartTime.Unix(),
-		FirstEndTime:               firstEndTime.Unix(),
+		FirstStartTime:             firstStartTimeUnix,
+		FirstEndTime:               firstEndTimeUnix,
 		FirstTotalTime:             first_total_time,
 		FirstIsCheck:               first_is_check,
 		FirstModifications:         first_modifications,
@@ -5058,8 +5053,8 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		SencondDisinfectionWater:   sencond_disinfection_water,
 		SencondDisinfectionMethods: sencond_disinfection_methods,
 		SencondDisinfectionTime:    sencond_disinfection_time,
-		SencondStartTime:           sencondStartTime.Unix(),
-		SencondEndTime:             sencondEndTime.Unix(),
+		SencondStartTime:           sencondStartTimeUnixt,
+		SencondEndTime:             sencondEndTimeUnixt,
 		SencondTotalTime:           sencond_total_time,
 		SencondIsCheck:             sencond_is_check,
 		SencondModifications:       sencond_modifications,
@@ -5067,14 +5062,14 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		ThirdDisinfectionWater:     third_disinfection_water,
 		ThirdDisinfectionMethods:   third_disinfection_methods,
 		ThirdDisinfectionTime:      third_disinfection_time,
-		ThirdStartTime:             thirdStartTime.Unix(),
-		ThirdEndTime:               thirdEndTime.Unix(),
+		ThirdStartTime:             thirdStartTimeUnix,
+		ThirdEndTime:               thirdEndTimeUnix,
 		ThirdTotalTime:             third_total_time,
 		ThirdIsCheck:               third_is_check,
 		ThirdModifications:         third_modifications,
 		ThirdCreator:               third_creator,
-		LastStartTime:              lastStartTime.Unix(),
-		LastEndTime:                lastEndTime.Unix(),
+		LastStartTime:              lastStartTimeUnix,
+		LastEndTime:                lastEndTimeUnix,
 		LastTotalTime:              last_total_time,
 		LastIsCheck:                last_is_check,
 		LastModifications:          last_modifications,
@@ -5085,8 +5080,8 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		FourthDisinfectionWater:    fourth_disinfection_water,
 		FourthDisinfectionMethods:  fourth_disinfection_methods,
 		FourthDisinfectionTime:     fourth_disinfection_time,
-		FourthStartTime:            fourthStartTime.Unix(),
-		FourthEndTime:              fourthEndTime.Unix(),
+		FourthStartTime:            fourthiStartTimeUnitx,
+		FourthEndTime:              fourthEndTimeUnix,
 		FourthTotalTime:            fourth_total_time,
 		FourthIsCheck:              fourth_is_check,
 		FourthModifications:        fourth_modifications,
@@ -5167,8 +5162,9 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println("err", err)
-	id := int64(dataBody["id"].(float64))
 	record_date := dataBody["record_date"].(string)
+
+	id := int64(dataBody["id"].(float64))
 	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recorddateunix := recorddate.Unix()
 
@@ -5178,19 +5174,19 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 
 	first_start_time := dataBody["first_start_time"].(string)
 
-	if len(first_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var firstStartTimeUnix int64
+	if len(first_start_time) > 0 {
+		firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
+		firstStartTimeUnix = firstStartTime.Unix()
 	}
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
 
+	var firstEndTimeUnix int64
 	first_end_time := dataBody["first_end_time"].(string)
 
-	if len(first_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	if len(first_end_time) > 0 {
+		firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
+		firstEndTimeUnix = firstEndTime.Unix()
 	}
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
 
 	first_total_time := dataBody["first_total_time"].(string)
 
@@ -5205,20 +5201,18 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	sencond_disinfection_time := dataBody["sencond_disinfection_time"].(string)
 
 	sencond_start_time := dataBody["sencond_start_time"].(string)
-
-	if len(sencond_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var sencondStartTimeUnixt int64
+	if len(sencond_start_time) > 0 {
+		sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
+		sencondStartTimeUnixt = sencondStartTime.Unix()
 	}
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
 
 	sencond_end_time := dataBody["sencond_end_time"].(string)
-
-	if len(sencond_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var sencondEndTimeUnixt int64
+	if len(sencond_end_time) > 0 {
+		sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
+		sencondEndTimeUnixt = sencondEndTime.Unix()
 	}
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
 
 	sencond_total_time := dataBody["sencond_total_time"].(string)
 
@@ -5233,20 +5227,18 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	third_disinfection_time := dataBody["third_disinfection_time"].(string)
 
 	third_start_time := dataBody["third_start_time"].(string)
-
-	if len(third_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var thirdStartTimeUnix int64
+	if len(third_start_time) > 0 {
+		thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
+		thirdStartTimeUnix = thirdStartTime.Unix()
 	}
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
 
 	third_end_time := dataBody["third_end_time"].(string)
-
-	if len(third_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var thirdEndTimeUnix int64
+	if len(third_end_time) > 0 {
+		thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
+		thirdEndTimeUnix = thirdEndTime.Unix()
 	}
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
 
 	third_total_time := dataBody["third_total_time"].(string)
 
@@ -5261,20 +5253,18 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	fourth_disinfection_time := dataBody["fourth_disinfection_time"].(string)
 
 	fourth_start_time := dataBody["fourth_start_time"].(string)
-
-	if len(fourth_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var fourthiStartTimeUnitx int64
+	if len(fourth_start_time) > 0 {
+		fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
+		fourthiStartTimeUnitx = fourthStartTime.Unix()
 	}
-	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_start_time)
 
 	fourth_end_time := dataBody["fourth_end_time"].(string)
-
-	if len(fourth_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var fourthEndTimeUnix int64
+	if len(fourth_end_time) > 0 {
+		fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
+		fourthEndTimeUnix = fourthEndTime.Unix()
 	}
-	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_end_time)
 
 	fourth_total_time := dataBody["fourth_total_time"].(string)
 
@@ -5288,20 +5278,19 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 	last_disinfection_methods := dataBody["last_disinfection_methods"].(string)
 	last_disinfection_time := dataBody["last_disinfection_time"].(string)
 	last_start_time := dataBody["last_start_time"].(string)
-
-	if len(last_start_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var lastStartTimeUnix int64
+	if len(last_start_time) > 0 {
+		lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
+		lastStartTimeUnix = lastStartTime.Unix()
 	}
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
 
 	last_end_time := dataBody["last_end_time"].(string)
 
-	if len(last_end_time) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+	var lastEndTimeUnix int64
+	if len(last_end_time) > 0 {
+		lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
+		lastEndTimeUnix = lastEndTime.Unix()
 	}
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
 
 	last_total_time := dataBody["last_total_time"].(string)
 
@@ -5320,8 +5309,8 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		FirstDisinfectionWater:     first_disinfection_water,
 		FirstDisinfectionMethods:   first_disinfection_methods,
 		FirstDisinfectionTime:      first_disinfection_time,
-		FirstStartTime:             firstStartTime.Unix(),
-		FirstEndTime:               firstEndTime.Unix(),
+		FirstStartTime:             firstStartTimeUnix,
+		FirstEndTime:               firstEndTimeUnix,
 		FirstTotalTime:             first_total_time,
 		FirstIsCheck:               first_is_check,
 		FirstModifications:         first_modifications,
@@ -5329,8 +5318,8 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		SencondDisinfectionWater:   sencond_disinfection_water,
 		SencondDisinfectionMethods: sencond_disinfection_methods,
 		SencondDisinfectionTime:    sencond_disinfection_time,
-		SencondStartTime:           sencondStartTime.Unix(),
-		SencondEndTime:             sencondEndTime.Unix(),
+		SencondStartTime:           sencondStartTimeUnixt,
+		SencondEndTime:             sencondEndTimeUnixt,
 		SencondTotalTime:           sencond_total_time,
 		SencondIsCheck:             sencond_is_check,
 		SencondModifications:       sencond_modifications,
@@ -5338,14 +5327,14 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		ThirdDisinfectionWater:     third_disinfection_water,
 		ThirdDisinfectionMethods:   third_disinfection_methods,
 		ThirdDisinfectionTime:      third_disinfection_time,
-		ThirdStartTime:             thirdStartTime.Unix(),
-		ThirdEndTime:               thirdEndTime.Unix(),
+		ThirdStartTime:             thirdStartTimeUnix,
+		ThirdEndTime:               thirdEndTimeUnix,
 		ThirdTotalTime:             third_total_time,
 		ThirdIsCheck:               third_is_check,
 		ThirdModifications:         third_modifications,
 		ThirdCreator:               third_creator,
-		LastStartTime:              lastStartTime.Unix(),
-		LastEndTime:                lastEndTime.Unix(),
+		LastStartTime:              lastStartTimeUnix,
+		LastEndTime:                lastEndTimeUnix,
 		LastTotalTime:              last_total_time,
 		LastIsCheck:                last_is_check,
 		LastModifications:          last_modifications,
@@ -5356,8 +5345,8 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		FourthDisinfectionWater:    fourth_disinfection_water,
 		FourthDisinfectionMethods:  fourth_disinfection_methods,
 		FourthDisinfectionTime:     fourth_disinfection_time,
-		FourthStartTime:            fourthStartTime.Unix(),
-		FourthEndTime:              fourthEndTime.Unix(),
+		FourthStartTime:            fourthiStartTimeUnitx,
+		FourthEndTime:              fourthEndTimeUnix,
 		FourthTotalTime:            fourth_total_time,
 		FourthIsCheck:              fourth_is_check,
 		FourthModifications:        fourth_modifications,
@@ -5389,3 +5378,33 @@ func (this *MachineApiController) DeleteObjectTableDisinfect() {
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *MachineApiController) GetAirDisinfectionLongTime() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetAirDisInfectionLongTime(orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) GetObjectDisInfectionLongTime() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetObjectDisInfectionLongTime(orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/manager_center_api_controller.go

@@ -665,7 +665,7 @@ func (c *ManagerCenterApiController) CreateDrugUnitSafeguard() {
 
 }
 
-//GetPatientsList 取配置信息列表
+// GetPatientsList 取配置信息列表
 func (c *ManagerCenterApiController) GetConfigList() {
 	adminUserInfo := c.GetAdminUserInfo()
 	configList, _ := service.GetDictionaryConfigList(adminUserInfo.CurrentOrgId)
@@ -676,7 +676,7 @@ func (c *ManagerCenterApiController) GetConfigList() {
 
 }
 
-//CreateConfig  创建配置信息
+// CreateConfig  创建配置信息
 func (c *ManagerCenterApiController) CreateConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -917,7 +917,7 @@ func (c *ManagerCenterApiController) DeleteChildConfig() {
 	return
 }
 
-//CreateChildConfig  创建子配置信息
+// CreateChildConfig  创建子配置信息
 func (c *ManagerCenterApiController) CreateChildConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -2126,6 +2126,8 @@ func (c *ManagerCenterApiController) CreateDiagnose() {
 	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 
+	sort, _ := c.GetInt64("sort")
+	fmt.Println("sort-------------------", sort)
 	if len(class_name) <= 0 {
 		utils.ErrorLog("len(class_name) == 0")
 
@@ -2153,6 +2155,7 @@ func (c *ManagerCenterApiController) CreateDiagnose() {
 		Status:             1,
 		Pinyin:             pinyin,
 		Wubi:               wubi,
+		Sort:               sort,
 	}
 
 	err, dealers := service.AddSigleDiagnose(&dealer)
@@ -2182,7 +2185,7 @@ func (c *ManagerCenterApiController) ModifyDiagnose() {
 	remark := c.GetString("remark")
 	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
-
+	sort, _ := c.GetInt64("sort")
 	if id <= 0 {
 		utils.ErrorLog("id == 0")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2215,6 +2218,7 @@ func (c *ManagerCenterApiController) ModifyDiagnose() {
 		Pinyin:             pinyin,
 		Wubi:               wubi,
 		Status:             1,
+		Sort:               sort,
 	}
 
 	err := service.ModifyDiagnose(&dealer)

controllers/mobile_api_controllers/check_api_controller.go

@@ -20,7 +20,7 @@ func (c *CheckApiController) GetInspectionReference() {
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
-	references, err := service.GetInspectionReference(adminUserInfo.Org.Id)
+	references, err := service.GetInspectionReference(adminUserInfo.Org.Id, 0)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3203,6 +3203,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			}
 		}
+
 		err := service.CreateMonitor(&record)
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
@@ -4004,6 +4005,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
 	fmt.Println(evaluation)
+
 	if prescription.ID > 0 {
 
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
@@ -4055,9 +4057,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			if adminInfo.Org.Id == 10469 {
+
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
+
 			}
 
 			if adminInfo.Org.Id == 10471 {
@@ -8457,9 +8461,68 @@ func (this *DialysisAPIController) ExectionMobileAdvice() {
 							if config.IsOpen != 1 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									service.HisDrugsDelivery(orgId, creater, &advice)
+									if orgId == 3877 || orgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(advice.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             orgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "透析医嘱页面出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              0,
+													Prescribingnumber:     advice.PrescribingNumber,
+													PrescribingNumberUnit: advice.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											this.ServeSuccessJSON(map[string]interface{}{
+												"msg":  "2",
+												"drug": medical,
+												"ids":  ids,
+											})
+											return
+
+										}
+									}
 								}
 								if pharmacyConfig.IsOpen != 1 {
 									service.HisDrugsDelivery(orgId, creater, &advice)
+									if orgId == 3877 || orgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(advice.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             orgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "透析医嘱页面出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              0,
+													Prescribingnumber:     advice.PrescribingNumber,
+													PrescribingNumberUnit: advice.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											this.ServeSuccessJSON(map[string]interface{}{
+												"msg":  "2",
+												"drug": medical,
+												"ids":  ids,
+											})
+											return
+										}
+									}
 								}
 
 								//更新字典里面的库存

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -106,6 +106,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	blood_monitor, _ := this.GetFloat("blood_monitor")
 	dehydration, _ := this.GetFloat("dehydration")
 	filter_pressure := this.GetString("filter_pressure")
+	replacement_speed, _ := this.GetFloat("replacement_speed")
+	dicarbonate, _ := this.GetFloat("dicarbonate")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -196,6 +198,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		HeparinAmount:               heparin_amount,
 		Dehydration:                 dehydration,
 		FilterPressure:              filter_pressure,
+		Dicarbonate:                 dicarbonate,
+		ReplacementSpeed:            replacement_speed,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -325,6 +329,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	heparin_amount, _ := this.GetFloat("heparin_amount")
 	dehydration, _ := this.GetFloat("dehydration")
 	filter_pressure := this.GetString("filter_pressure")
+	replacement_speed, _ := this.GetFloat("replacement_speed")
+	dicarbonate, _ := this.GetFloat("dicarbonate")
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -409,6 +415,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 
 		}
 	}
+	monitor.ReplacementSpeed = replacement_speed
+	monitor.Dicarbonate = dicarbonate
 	err = service.UpdateMonitor(monitor)
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_records"
 	redis := service.RedisClient()

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -143,6 +143,9 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 
 			//redis key值
 			key := "purviews_" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + strconv.FormatInt(adminUserInfo.AdminUser.Id, 10)
+			fmt.Println("ket--------------------", key)
+
+			redis.Set(key, "", time.Second)
 			purviews_json_str, _ := redis.Get(key).Result()
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -152,10 +155,12 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			fmt.Println(purviews_json_str)
 			fmt.Println("----redis 结束----")
 
+			fmt.Println("purviews_json_str0000000000000000000000000000", len(purviews_json_str))
 			if len(purviews_json_str) == 0 {
 				for _, item := range roles {
 					role_id, _ := strconv.ParseInt(item, 10, 64)
 					purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+					fmt.Println("2333333333333333333", purviews)
 					if len(userRolePurviews) == 0 {
 						userRolePurviews = purviews
 					} else {
@@ -166,6 +171,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 				userRolePurviewsArr = RemoveRepeatedPurviewElement(strings.Split(userRolePurviews, ","))
 				//缓存数据
 				purview_json, err := json.Marshal(userRolePurviewsArr)
+				fmt.Println("errr-------------------", err)
 				if err == nil {
 					redis.Set(key, purview_json, time.Minute*60*60*24)
 				}
@@ -183,6 +189,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
+			fmt.Println("allPermission-----------------------", allPermission)
 			for _, item := range allPermission {
 				//判断当前路由是否在权限路由列表里面
 				if strings.Split(item.Urlfor, ",")[0] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -621,6 +621,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	origin, _ := c.GetInt64("origin", 0)
 	groupno, _ := c.GetInt64("groupno", -1)
 
+	fmt.Println("orgind===2=323322323232323", origin)
+	fmt.Println("groupno233333333333333333333", groupno)
 	if origin != 2 {
 		adminUserInfo := c.GetMobileAdminUserInfo()
 		execution_staff := adminUserInfo.AdminUser.Id
@@ -688,6 +690,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			UpdatedTime:    time.Now().Unix(),
 		}
 		var err error
+		fmt.Println("groupno==============", groupno)
 		if groupno > 0 {
 
 			// 查询信息规挡的设置天数
@@ -805,22 +808,16 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
-				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+				advices, _ := service.FindAllDoctorAdviceByGoroupNoTwety(adminUserInfo.Org.Id, groupno)
 
-				isHasWay := false //用来判断是否包含来自药品库的医嘱
-				for _, item := range advices {
-					if item.Way == 1 {
-						isHasWay = true
-					}
-
-				}
-
-				if isHasWay {
+				if len(advices) > 0 {
 					var total int64
 					var prescribing_number_total int64
 
+					//出库
 					for _, item := range advices {
 						if item.Way == 1 {
+
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 							//查询该药品的剩余库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
@@ -843,6 +840,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if medical.IsUse == 1 {
+
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 									"advice": advice,
@@ -853,14 +851,28 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+									if advice.UserOrgId != 10278 {
+										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+										advice.ExecutionTime = 0
+										advice.ExecutionState = 2
+										advice.ExecutionStaff = 0
+									}
+
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "3",
 										"advice": advice,
 										"ids":    ids,
 									})
 									return
+
 								}
 								if prescribing_number_total > total {
+									if advice.UserOrgId != 10278 {
+										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+										advice.ExecutionTime = 0
+										advice.ExecutionState = 2
+										advice.ExecutionStaff = 0
+									}
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "2",
 										"advice": advice,
@@ -869,48 +881,31 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 							}
-
-							if prescribing_number_total <= total {
-
+							//查询是否出库按钮开启
+							adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+							if adviceSetting.IsAdviceOpen == 1 {
 								//查询是否出库按钮开启
-								adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
-								if adviceSetting.IsAdviceOpen == 1 {
-									//查询是否出库按钮开启
-									prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
-									pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-									if prescriptionConfig.IsOpen == 1 {
-										if medical.IsUse == 2 {
-											if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-											}
-											if pharmacyConfig.IsOpen != 1 {
+								prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+								//患者发药
+								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+								if prescriptionConfig.IsOpen == 1 {
+									if medical.IsUse == 2 {
+										if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+											//查询今日是否出库
+											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+											if drugOutInfo.ID == 0 {
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 											}
 
-											//更新字典里面的库存
-											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)
-										}
-									}
-								} else {
-									pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-									if medical.IsUse == 2 {
-										if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 										if pharmacyConfig.IsOpen != 1 {
-											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+											if drugOutInfo.ID == 0 {
+												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											}
 										}
 
+										//更新字典里面的库存
 										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 										var sum_count int64
 										for _, its := range stockInfo {
@@ -924,35 +919,82 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 									}
 								}
+							} else {
+								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+								if medical.IsUse == 2 {
+									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+										if drugOutInfo.ID == 0 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										}
+									}
+									if pharmacyConfig.IsOpen != 1 {
+										drugError := models.XtDrugError{
+											ID:                    0,
+											UserOrgId:             item.UserOrgId,
+											DrugId:                item.DrugId,
+											RecordDate:            item.AdviceDate,
+											PatientId:             item.PatientId,
+											Remark:                "恒泰中医院出库开始",
+											Status:                1,
+											Ctime:                 time.Now().Unix(),
+											Mtime:                 0,
+											Prescribingnumber:     item.PrescribingNumber,
+											PrescribingNumberUnit: item.PrescribingNumberUnit,
+											SumCount:              0,
+										}
+										service.CreateDrugError(drugError)
+										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+										if drugOutInfo.ID == 0 {
+
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										}
+									}
+
+									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)
+								}
 							}
 						}
+
 					}
 
 				}
-			} else {
 
-				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
-				isHasWay := false //用来判断是否包含来自药品库的医嘱
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+					"ids":    ids,
+				})
+				return
 
-				for _, item := range advices {
-					if item.Way == 1 {
-						isHasWay = true
-					}
-				}
+			} else {
+
+				advices, _ := service.FindDoctorAdviceByIdsTwety(adminUserInfo.Org.Id, ids)
 
-				if isHasWay {
+				if len(advices) > 0 {
 					var total int64
 					var prescribing_number_total int64
-					for _, item := range advices {
 
+					for _, item := range advices {
 						if item.Way == 1 {
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 							//查询该药品的剩余库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 
-							//查询改药品信息
-							medical, _ := service.GetBaseDrugMedical(item.DrugId)
-
 							//判断单位是否相等
 							if medical.MaxUnit == item.PrescribingNumberUnit {
 								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -971,6 +1013,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if medical.IsUse == 1 {
+
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 									"advice": advice,
@@ -980,6 +1023,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+									if advice.UserOrgId != 10278 {
+										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+										advice.ExecutionTime = 0
+										advice.ExecutionState = 2
+										advice.ExecutionStaff = 0
+									}
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "3",
 										"advice": advice,
@@ -988,6 +1037,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 								if prescribing_number_total > total {
+									if advice.UserOrgId != 10278 {
+										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+										advice.ExecutionTime = 0
+										advice.ExecutionState = 2
+										advice.ExecutionStaff = 0
+									}
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "2",
 										"advice": advice,
@@ -996,52 +1051,56 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 							}
-
-							if prescribing_number_total <= total {
-								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-								if medical.IsUse == 2 {
-									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+							if medical.IsUse == 2 {
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+									//查询今日是否出库
+									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+									if drugOutInfo.ID == 0 {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 									}
-									if pharmacyConfig.IsOpen != 1 {
+								}
+								if pharmacyConfig.IsOpen != 1 {
+									//查询今日是否出库
+									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+									if drugOutInfo.ID == 0 {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 									}
+								}
 
-									//更新字典里面的库存
-									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-									var sum_count int64
-									for _, its := range stockInfo {
-										baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
-										if its.MaxUnit == baseDrug.MaxUnit {
-											its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
-										}
-										sum_count += its.StockMaxNumber + its.StockMinNumber
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								var sum_count int64
+								for _, its := range stockInfo {
+									baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+									if its.MaxUnit == baseDrug.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
 									}
-									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-									//剩余库存
-									service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+									sum_count += its.StockMaxNumber + its.StockMinNumber
 								}
-								if medical.IsUse == 1 {
-									c.ServeSuccessJSON(map[string]interface{}{
-										"msg":    "1",
-										"advice": advice,
-										"ids":    ids,
-									})
-									return
-								}
-
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+							}
+							if medical.IsUse == 1 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
 							}
+
 						}
+
 					}
 				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+					"ids":    ids,
+				})
+				return
 			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":    "1",
-				"advice": advice,
-				"ids":    ids,
-			})
-			return
 		}
 
 		if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
@@ -1219,6 +1278,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 			}
 			err = service.SaveHisDoctorAdvice(item)
+			if err == nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             adminInfo.Org.Id,
+					DrugId:                item.DrugId,
+					RecordDate:            item.AdviceDate,
+					PatientId:             item.PatientId,
+					Remark:                "执行成功",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     item.PrescribingNumber,
+					PrescribingNumberUnit: item.PrescribingNumberUnit,
+				}
+				service.CreateDrugError(drugError)
+			}
+
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -1514,22 +1590,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 					//
-					//if config.IsOpen == 1 && item.UserOrgId == 10088 {
-					//
-					//	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 == 10028 {
+
+						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)
+					}
 
 				}
 			}

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -22,7 +22,7 @@ func (this *IndexEvaluationApiController) GetAdminUser() {
 
 //化验指标
 
-//初始化数据
+// 初始化数据
 func (this *IndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	var references []*models.InspectionReference
@@ -56,7 +56,7 @@ func (this *IndexEvaluationApiController) GetLaboratoryIndexInitData() {
 
 }
 
-//获取取值范围
+// 获取取值范围
 func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueData() {
 	range_type, _ := this.GetInt64("range_type")
 	project_id, _ := this.GetInt64("project_id")

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -1039,6 +1039,9 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 	id, _ := c.GetInt64("id")
 	org_id := c.GetMobileAdminUserInfo().Org.Id
 
+	temp_schedule, _ := service.GetScheduleByClassTypeTwo(schedule_type, schedule_date, patient_id, org_id)
+	id = temp_schedule.ID
+
 	//查询该班次该床位是否已经存在患者
 	schedule, _ := service.GetScheduleByClassType(schedule_type, schedule_date, bed_id, org_id)
 	//查询该床位所属分区

controllers/patient_api_controller.go

@@ -1718,6 +1718,19 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 		}
 	}
 
+	if advice.UserOrgId == 3877 || advice.UserOrgId == 10340 || advice.UserOrgId == 9671 {
+		if advice.PrescribingNumber == 0 {
+			advice.PrescribingNumber = 1
+		}
+		//查询该患者今日有没有双人核对
+		check, _ := service.MobileGetDoubleCheckSix(advice.UserOrgId, patientInfo.ID, advice.AdviceDate)
+
+		if check.ID > 0 {
+			advice.Checker = check.Modifier
+			advice.CheckState = 1
+			advice.CheckTime = time.Now().Unix()
+		}
+	}
 	err := service.CreateDoctorAdvice(&advice)
 	//创建步骤表
 	finish := models.XtDialysisFinish{
@@ -1899,10 +1912,17 @@ func (c *PatientApiController) ExecGroupAdvice() {
 				pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
 				if medical.IsUse == 2 {
 					if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-						service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+						drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+						if drugOutInfo.ID == 0 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+						}
+
 					}
 					if pharmacyConfig.IsOpen != 1 {
-						service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+						drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+						if drugOutInfo.ID == 0 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+						}
 					}
 
 					//查询默认仓库
@@ -2122,7 +2142,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				if medical.IsUse != 1 {
+
 					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+						service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+						advice.ExecutionState = 2
+						advice.ExecutionStaff = 0
+						advice.ExecutionTime = 0
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "3",
 							"advice": advice,
@@ -2130,6 +2155,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						return
 					}
 					if prescribing_number_total > total {
+						service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+						advice.ExecutionState = 2
+						advice.ExecutionStaff = 0
+						advice.ExecutionTime = 0
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "2",
 							"advice": advice,
@@ -2162,12 +2191,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								//是通过药房发药
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									//执行出库
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+									if drugOutInfo.ID == 0 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									}
 								}
 								//不通过药房发药
 								if pharmacyConfig.IsOpen != 1 {
 									//执行出库
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+									if drugOutInfo.ID == 0 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									}
 								}
 
 								//查询默认仓库
@@ -2184,6 +2221,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 
 								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 								break
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
@@ -2213,11 +2253,19 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						if medical.IsUse == 2 {
 							//是通过药房发药
 							if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+								drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+								if drugOutInfo.ID == 0 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								}
 							}
 							//不通过药房发药
 							if pharmacyConfig.IsOpen != 1 {
-								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+								drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+								if drugOutInfo.ID == 0 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								}
 							}
 							//更新字典里面的库存
 							var sum_count int64
@@ -2229,6 +2277,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								sum_count += its.StockMaxNumber + its.StockMinNumber
 							}
 							service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+							//剩余库存
+							service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 							break
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",

controllers/patient_dataconfig_api_controller.go

@@ -22,12 +22,678 @@ func PatientDataConfigAPIControllerRegistRouters() {
 	beego.Router("/api/patient/rescues", &PatientDataConfigAPIController{}, "get:Rescues")
 	beego.Router("/api/patient/rescue/create", &PatientDataConfigAPIController{}, "post:CreateRescue")
 	beego.Router("/api/patient/rescue/delete", &PatientDataConfigAPIController{}, "post:DeleteRescue")
+
+	beego.Router("/api/patient/sickhistory", &PatientDataConfigAPIController{}, "get:GetSickHistorys")
+	beego.Router("/api/patient/sickhistory/create", &PatientDataConfigAPIController{}, "get:CreateSickHistory")
+	beego.Router("/api/patient/sickhistory/delete", &PatientDataConfigAPIController{}, "post:DeleteSickHistory")
+	beego.Router("/api/patient/sickhistory/modify", &PatientDataConfigAPIController{}, "get:ModifySickHistory")
+
+	beego.Router("/api/patient/physiquecheck", &PatientDataConfigAPIController{}, "get:GetPhysiqueChecks")
+	beego.Router("/api/patient/physiquecheck/create", &PatientDataConfigAPIController{}, "get:CreatePhysiqueCheck")
+	beego.Router("/api/patient/physiquecheck/delete", &PatientDataConfigAPIController{}, "post:DeletePhysiqueCheck")
+	beego.Router("/api/patient/physiquecheck/modify", &PatientDataConfigAPIController{}, "get:ModifyPhysiqueCheck")
+
+	beego.Router("/api/patient/sickhistory/print", &PatientDataConfigAPIController{}, "get:GetSickhistoryPrints")
+	beego.Router("/api/patient/physiquecheck/print", &PatientDataConfigAPIController{}, "get:GetPhysiquecheckPrints")
+
 }
 
 type PatientDataConfigAPIController struct {
 	BaseAuthAPIController
 }
 
+func (this *PatientDataConfigAPIController) GetPhysiquecheckPrints() {
+
+	patientID, _ := this.GetInt64("patient_id")
+	idsStr := this.GetString("ids")
+	if patientID <= 0 || len(idsStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordIDStrs := strings.Split(idsStr, ",")
+	patient, _ := service.GetPatientByID(this.GetAdminUserInfo().CurrentOrgId, patientID)
+	sickHostory, _ := service.GetPatienttPhysiqueByIds(this.GetAdminUserInfo().CurrentOrgId, patientID, recordIDStrs)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient":      patient,
+		"sickhistorys": sickHostory,
+	})
+
+}
+func (this *PatientDataConfigAPIController) GetSickhistoryPrints() {
+	patientID, _ := this.GetInt64("patient_id")
+	idsStr := this.GetString("ids")
+	if patientID <= 0 || len(idsStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordIDStrs := strings.Split(idsStr, ",")
+	patient, _ := service.GetPatientByID(this.GetAdminUserInfo().CurrentOrgId, patientID)
+	sickHostory, _ := service.GetPatientSickHistoryByIds(this.GetAdminUserInfo().CurrentOrgId, patientID, recordIDStrs)
+	for _, item := range sickHostory {
+		pc, _ := service.GetLastPatientPhysiqueCheck(this.GetAdminUserInfo().CurrentOrgId, item.PatientId, item.RecordDate)
+		item.XtPatientPhysiqueCheck = pc
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient":      patient,
+		"sickhistorys": sickHostory,
+	})
+}
+
+func (this *PatientDataConfigAPIController) GetSickHistorys() {
+	patientID, _ := this.GetInt64("patient_id")
+	startTimeYMDStr := this.GetString("start_time")
+	endTimeYMDStr := this.GetString("end_time")
+	if patientID <= 0 || len(startTimeYMDStr) == 0 || len(endTimeYMDStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	endTimeYMDHmsStr := endTimeYMDStr + " 23:59:59"
+	startTime, parseStartTimeErr := utils.ParseTimeStringToTime("2006-01-02", startTimeYMDStr)
+	endTime, parseEndTimeErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
+	if parseStartTimeErr != nil || parseEndTimeErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+		return
+	}
+
+	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
+	}
+
+	records, getRecordsErr := service.GetPatientSickHistory(adminUserInfo.CurrentOrgId, patientID, startTime.Unix(), endTime.Unix())
+	if getRecordsErr != nil {
+		this.ErrorLog("获取患者病程记录失败:%v", getRecordsErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	admins, getAllAdminsErr := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+	if getAllAdminsErr != nil {
+		this.ErrorLog("获取所有管理员失败:%v", getAllAdminsErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"records": records,
+		"doctors": admins,
+	})
+}
+func (this *PatientDataConfigAPIController) CreateSickHistory() {
+	patientID, _ := this.GetInt64("patient_id")
+	content := this.GetString("content")
+	record_time_str := this.GetString("record_time")
+	title := this.GetString("title")
+	is_shenyizhishi, _ := this.GetInt64("is_shenyizhishi")
+	is_fumotouxishi, _ := this.GetInt64("is_fumotouxishi")
+	is_guominyaowu, _ := this.GetInt64("is_guominyaowu")
+	guominyaowu_desc := this.GetString("guominyaowu_desc")
+	doctor_id, _ := this.GetInt64("doctor_id")
+
+	if patientID <= 0 || len(content) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(record_time_str) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	record_date := strings.Split(record_time_str, " ")
+
+	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
+	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
+
+	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
+	}
+
+	now := time.Now().Unix()
+	record := models.XtPatientSickHistory{
+		OrgId:                   adminUserInfo.CurrentOrgId,
+		PatientId:               patientID,
+		Recorder:                adminUserInfo.AdminUser.Id,
+		RecordTime:              checkDate.Unix(),
+		Content:                 content,
+		Status:                  1,
+		Title:                   title,
+		IsShenyizhiHistory:      is_shenyizhishi,
+		IsFumoDialysisHistory:   is_fumotouxishi,
+		HypersusceptibilityDesc: guominyaowu_desc,
+		IsHypersusceptibility:   is_guominyaowu,
+		Ctime:                   now,
+		Mtime:                   now,
+		DoctorId:                doctor_id,
+		RecordDate:              checkDate_two.Unix(),
+	}
+
+	createErr := service.CreatePatientSickHistory(&record)
+	if createErr != nil {
+		this.ErrorLog("创建患者病史记录失败:%v", createErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"record": record,
+	})
+}
+func (this *PatientDataConfigAPIController) DeleteSickHistory() {
+	patientID, _ := this.GetInt64("patient_id")
+	idsStr := this.GetString("ids")
+	if patientID <= 0 || len(idsStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	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
+	}
+
+	recordIDStrs := strings.Split(idsStr, ",")
+	recordIDs := make([]int64, 0, len(recordIDStrs))
+	for _, idStr := range recordIDStrs {
+		id, parseErr := strconv.Atoi(idStr)
+		if parseErr != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordIDs = append(recordIDs, int64(id))
+	}
+
+	deleteErr := service.DeletePatientSickHistoryInBatch(adminUserInfo.CurrentOrgId, patientID, recordIDs)
+	if deleteErr != nil {
+		this.ErrorLog("删除患者病程记录失败:%v", deleteErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(nil)
+}
+func (this *PatientDataConfigAPIController) ModifySickHistory() {
+	patientID, _ := this.GetInt64("patient_id")
+	content := this.GetString("content")
+	id, _ := this.GetInt64("id", 0)
+	record_time_str := this.GetString("record_time")
+	title := this.GetString("title")
+
+	is_shenyizhishi, _ := this.GetInt64("is_shenyizhishi")
+	is_fumotouxishi, _ := this.GetInt64("is_fumotouxishi")
+	is_guominyaowu, _ := this.GetInt64("is_guominyaowu")
+	guominyaowu_desc := this.GetString("guominyaowu_desc")
+	doctor_id, _ := this.GetInt64("doctor_id")
+
+	if patientID <= 0 || len(content) == 0 || id == 0 || len(record_time_str) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//timeLayout := "2006-01-02"
+	//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
+	}
+
+	now := time.Now().Unix()
+
+	record := models.XtPatientSickHistory{
+		ID:                      id,
+		OrgId:                   adminUserInfo.CurrentOrgId,
+		PatientId:               patientID,
+		Recorder:                adminUserInfo.AdminUser.Id,
+		Content:                 content,
+		Status:                  1,
+		Ctime:                   now,
+		Mtime:                   now,
+		Title:                   title,
+		RecordTime:              checkDate.Unix(),
+		IsShenyizhiHistory:      is_shenyizhishi,
+		IsFumoDialysisHistory:   is_fumotouxishi,
+		HypersusceptibilityDesc: guominyaowu_desc,
+		IsHypersusceptibility:   is_guominyaowu,
+		DoctorId:                doctor_id,
+	}
+	createErr := service.ModifyPatientSickHistory(&record)
+	if createErr != nil {
+		this.ErrorLog("创建患者抢救记录失败:%v", createErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"record": record,
+	})
+}
+
+func (this *PatientDataConfigAPIController) GetPhysiqueChecks() {
+	patientID, _ := this.GetInt64("patient_id")
+	startTimeYMDStr := this.GetString("start_time")
+	endTimeYMDStr := this.GetString("end_time")
+	if patientID <= 0 || len(startTimeYMDStr) == 0 || len(endTimeYMDStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	endTimeYMDHmsStr := endTimeYMDStr + " 23:59:59"
+	startTime, parseStartTimeErr := utils.ParseTimeStringToTime("2006-01-02", startTimeYMDStr)
+	endTime, parseEndTimeErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
+	if parseStartTimeErr != nil || parseEndTimeErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+		return
+	}
+
+	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
+	}
+
+	records, getRecordsErr := service.GetPatientPhysiqueCheck(adminUserInfo.CurrentOrgId, patientID, startTime.Unix(), endTime.Unix())
+	if getRecordsErr != nil {
+		this.ErrorLog("获取患者病程记录失败:%v", getRecordsErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	admins, getAllAdminsErr := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+	if getAllAdminsErr != nil {
+		this.ErrorLog("获取所有管理员失败:%v", getAllAdminsErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"records": records,
+		"doctors": admins,
+	})
+}
+func (this *PatientDataConfigAPIController) CreatePhysiqueCheck() {
+	patientID, _ := this.GetInt64("patient_id")
+	doctor_id, _ := this.GetInt64("doctor_id")
+	record_time_str := this.GetString("record_time")
+	t := this.GetString("t")
+	p := this.GetString("p")
+	r := this.GetString("r")
+	bp_left := this.GetString("bp_left")
+	bp_right := this.GetString("bp_right")
+	pinxuerongmao, _ := this.GetInt64("pinxuerongmao")
+	tiwei, _ := this.GetInt64("tiwei")
+	fuzhong, _ := this.GetInt64("fuzhong")
+	chuxuedian, _ := this.GetInt64("chuxuedian")
+
+	fayu, _ := this.GetInt64("fayu")
+	yinyang, _ := this.GetInt64("yinyang")
+	shenzhi, _ := this.GetInt64("shenzhi")
+	pifunianmo, _ := this.GetInt64("pifunianmo")
+	buwei := this.GetString("buwei")
+	chengdu := this.GetString("chengdu")
+	pixiachuxue, _ := this.GetInt64("pixiachuxue")
+	zidian, _ := this.GetInt64("zidian")
+	pifuwendu, _ := this.GetInt64("pifuwendu")
+	qita := this.GetString("qita")
+
+	linbazhongda, _ := this.GetInt64("linbazhongda")
+	linbabuwei := this.GetString("linbabuwei")
+
+	yanlian, _ := this.GetInt64("yanlian")
+	tongkong, _ := this.GetInt64("tongkong")
+	zuo := this.GetString("zuo")
+	you := this.GetString("you")
+
+	duiguangfanshe := this.GetString("duiguangfanshe")
+	biantaoti := this.GetString("biantaoti")
+	yanbu := this.GetString("yanbu")
+	toubuqita := this.GetString("toubuqita")
+	huxiyin := this.GetString("huxiyin")
+
+	xiongmomocayin, _ := this.GetInt64("xiongmomocayin")
+	feizhangbuwei, _ := this.GetInt64("feizhangbuwei")
+	luoyin, _ := this.GetInt64("luoyin")
+	desc := this.GetString("desc")
+
+	xinzangdaxiao, _ := this.GetInt64("xinzangdaxiao")
+	xinlv, _ := this.GetInt64("xinlv")
+	xinbaomocasheng, _ := this.GetInt64("xinbaomocasheng")
+	zayin, _ := this.GetInt64("zayin")
+	fujiayin, _ := this.GetInt64("fujiayin")
+	xinzangdesc := this.GetString("xinzangdesc")
+
+	fushuizheng, _ := this.GetInt64("fushuizheng")
+	ganjingjingmai := this.GetString("ganjingjingmai")
+
+	gangzhang_yatong, _ := this.GetInt64("gangzhang_yatong")
+	gangzhang_koutong, _ := this.GetInt64("gangzhang_koutong")
+	pizhang_yatong, _ := this.GetInt64("pizhang_yatong")
+	pizhang_koutong, _ := this.GetInt64("pizhang_koutong")
+
+	shenzhang_yatong, _ := this.GetInt64("shenzhang_yatong")
+	shenzhang_koutong, _ := this.GetInt64("shenzhang_koutong")
+	fubu_desc := this.GetString("fubu_desc")
+	oth_desc := this.GetString("oth_desc")
+
+	if patientID <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(record_time_str) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	record_date := strings.Split(record_time_str, " ")
+	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
+	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
+
+	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
+	}
+
+	now := time.Now().Unix()
+	record := models.XtPatientPhysiqueCheck{
+		DoctorId:         doctor_id,
+		OrgId:            adminUserInfo.CurrentOrgId,
+		PatientId:        patientID,
+		Recorder:         adminUserInfo.AdminUser.Id,
+		RecordTime:       checkDate.Unix(),
+		Status:           1,
+		Ctime:            now,
+		Mtime:            now,
+		T:                t,
+		P:                p,
+		R:                r,
+		BpRight:          bp_right,
+		BpLeft:           bp_left,
+		Pinxuerongmao:    pinxuerongmao,
+		Tiwei:            tiwei,
+		Fuzhong:          fuzhong,
+		Chuxuedian:       chuxuedian,
+		Fayu:             fayu,
+		Yinyang:          yinyang,
+		Shenzhi:          shenzhi,
+		Pifunianmo:       pifunianmo,
+		Buwei:            buwei,
+		Chengdu:          chengdu,
+		Pixiachuxue:      pixiachuxue,
+		Zidian:           zidian,
+		Pifuwendu:        pifuwendu,
+		Qita:             qita,
+		Linbazhongda:     linbazhongda,
+		Linbabuwei:       linbabuwei,
+		Yanlian:          yanlian,
+		Tongkong:         tongkong,
+		Zuo:              zuo,
+		You:              you,
+		Duiguangfanshe:   duiguangfanshe,
+		Biantaoti:        biantaoti,
+		Yanbu:            yanbu,
+		Toubuqita:        toubuqita,
+		Huxiyin:          huxiyin,
+		Xiongmomocayin:   xiongmomocayin,
+		Feizhangbuwei:    feizhangbuwei,
+		Luoyin:           luoyin,
+		Desc:             desc,
+		Xinzangdaxiao:    xinzangdaxiao,
+		Xinlv:            xinlv,
+		Xinbaomocasheng:  xinbaomocasheng,
+		Zayin:            zayin,
+		Fujiayin:         fujiayin,
+		Xinzangdesc:      xinzangdesc,
+		Fushuizheng:      fushuizheng,
+		Ganjingjingmai:   ganjingjingmai,
+		GangzhangYatong:  gangzhang_yatong,
+		GangzhangKoutong: gangzhang_koutong,
+		PizhangKoutong:   pizhang_koutong,
+		PizhangYatong:    pizhang_yatong,
+		ShenzhangKoutong: shenzhang_koutong,
+		ShenzhangYatong:  shenzhang_yatong,
+		FubuDesc:         fubu_desc,
+		OthDesc:          oth_desc,
+		RecordDate:       checkDate_two.Unix(),
+	}
+	createErr := service.CreatePatientPhysiqueCheck(&record)
+	if createErr != nil {
+		this.ErrorLog("创建患者病史记录失败:%v", createErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"record": record,
+	})
+}
+func (this *PatientDataConfigAPIController) DeletePhysiqueCheck() {
+	patientID, _ := this.GetInt64("patient_id")
+	idsStr := this.GetString("ids")
+	if patientID <= 0 || len(idsStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	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
+	}
+
+	recordIDStrs := strings.Split(idsStr, ",")
+	recordIDs := make([]int64, 0, len(recordIDStrs))
+	for _, idStr := range recordIDStrs {
+		id, parseErr := strconv.Atoi(idStr)
+		if parseErr != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordIDs = append(recordIDs, int64(id))
+	}
+
+	deleteErr := service.DeletePatientPhysiqueCheckInBatch(adminUserInfo.CurrentOrgId, patientID, recordIDs)
+	if deleteErr != nil {
+		this.ErrorLog("删除患者病程记录失败:%v", deleteErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(nil)
+}
+func (this *PatientDataConfigAPIController) ModifyPhysiqueCheck() {
+	patientID, _ := this.GetInt64("patient_id")
+	id, _ := this.GetInt64("id", 0)
+	doctor_id, _ := this.GetInt64("doctor_id", 0)
+
+	record_time_str := this.GetString("record_time")
+
+	if patientID <= 0 || id == 0 || len(record_time_str) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	t := this.GetString("t")
+	p := this.GetString("p")
+	r := this.GetString("r")
+	bp_left := this.GetString("bp_left")
+	bp_right := this.GetString("bp_right")
+	pinxuerongmao, _ := this.GetInt64("pinxuerongmao")
+	tiwei, _ := this.GetInt64("tiwei")
+	fuzhong, _ := this.GetInt64("fuzhong")
+	chuxuedian, _ := this.GetInt64("chuxuedian")
+
+	fayu, _ := this.GetInt64("fayu")
+	yinyang, _ := this.GetInt64("yinyang")
+	shenzhi, _ := this.GetInt64("shenzhi")
+	pifunianmo, _ := this.GetInt64("pifunianmo")
+	buwei := this.GetString("buwei")
+	chengdu := this.GetString("chengdu")
+	pixiachuxue, _ := this.GetInt64("pixiachuxue")
+	zidian, _ := this.GetInt64("zidian")
+	pifuwendu, _ := this.GetInt64("pifuwendu")
+	qita := this.GetString("qita")
+
+	linbazhongda, _ := this.GetInt64("linbazhongda")
+	linbabuwei := this.GetString("linbabuwei")
+
+	yanlian, _ := this.GetInt64("yanlian")
+	tongkong, _ := this.GetInt64("tongkong")
+	zuo := this.GetString("zuo")
+	you := this.GetString("you")
+
+	duiguangfanshe := this.GetString("duiguangfanshe")
+	biantaoti := this.GetString("biantaoti")
+	yanbu := this.GetString("yanbu")
+	toubuqita := this.GetString("toubuqita")
+	huxiyin := this.GetString("huxiyin")
+
+	xiongmomocayin, _ := this.GetInt64("xiongmomocayin")
+	feizhangbuwei, _ := this.GetInt64("feizhangbuwei")
+	luoyin, _ := this.GetInt64("luoyin")
+	desc := this.GetString("desc")
+
+	xinzangdaxiao, _ := this.GetInt64("xinzangdaxiao")
+	xinlv, _ := this.GetInt64("xinlv")
+	xinbaomocasheng, _ := this.GetInt64("xinbaomocasheng")
+	zayin, _ := this.GetInt64("zayin")
+	fujiayin, _ := this.GetInt64("fujiayin")
+	xinzangdesc := this.GetString("xinzangdesc")
+
+	fushuizheng, _ := this.GetInt64("fushuizheng")
+	ganjingjingmai := this.GetString("ganjingjingmai")
+
+	gangzhang_yatong, _ := this.GetInt64("gangzhang_yatong")
+	gangzhang_koutong, _ := this.GetInt64("gangzhang_koutong")
+	pizhang_yatong, _ := this.GetInt64("pizhang_yatong")
+	pizhang_koutong, _ := this.GetInt64("pizhang_koutong")
+
+	shenzhang_yatong, _ := this.GetInt64("shenzhang_yatong")
+	shenzhang_koutong, _ := this.GetInt64("shenzhang_koutong")
+	fubu_desc := this.GetString("fubu_desc")
+	oth_desc := this.GetString("oth_desc")
+
+	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
+	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
+	}
+	now := time.Now().Unix()
+
+	record := models.XtPatientPhysiqueCheck{
+		ID:               id,
+		OrgId:            adminUserInfo.CurrentOrgId,
+		PatientId:        patientID,
+		Recorder:         adminUserInfo.AdminUser.Id,
+		RecordTime:       checkDate.Unix(),
+		DoctorId:         doctor_id,
+		Status:           1,
+		Ctime:            now,
+		Mtime:            now,
+		T:                t,
+		P:                p,
+		R:                r,
+		BpRight:          bp_right,
+		BpLeft:           bp_left,
+		Pinxuerongmao:    pinxuerongmao,
+		Tiwei:            tiwei,
+		Fuzhong:          fuzhong,
+		Chuxuedian:       chuxuedian,
+		Fayu:             fayu,
+		Yinyang:          yinyang,
+		Shenzhi:          shenzhi,
+		Pifunianmo:       pifunianmo,
+		Buwei:            buwei,
+		Chengdu:          chengdu,
+		Pixiachuxue:      pixiachuxue,
+		Zidian:           zidian,
+		Pifuwendu:        pifuwendu,
+		Qita:             qita,
+		Linbazhongda:     linbazhongda,
+		Linbabuwei:       linbabuwei,
+		Yanlian:          yanlian,
+		Tongkong:         tongkong,
+		Zuo:              zuo,
+		You:              you,
+		Duiguangfanshe:   duiguangfanshe,
+		Biantaoti:        biantaoti,
+		Yanbu:            yanbu,
+		Toubuqita:        toubuqita,
+		Huxiyin:          huxiyin,
+		Xiongmomocayin:   xiongmomocayin,
+		Feizhangbuwei:    feizhangbuwei,
+		Luoyin:           luoyin,
+		Desc:             desc,
+		Xinzangdaxiao:    xinzangdaxiao,
+		Xinlv:            xinlv,
+		Xinbaomocasheng:  xinbaomocasheng,
+		Zayin:            zayin,
+		Fujiayin:         fujiayin,
+		Xinzangdesc:      xinzangdesc,
+		Fushuizheng:      fushuizheng,
+		Ganjingjingmai:   ganjingjingmai,
+		GangzhangYatong:  gangzhang_yatong,
+		GangzhangKoutong: gangzhang_koutong,
+		PizhangKoutong:   pizhang_koutong,
+		PizhangYatong:    pizhang_yatong,
+		ShenzhangKoutong: shenzhang_koutong,
+		ShenzhangYatong:  shenzhang_yatong,
+		FubuDesc:         fubu_desc,
+		OthDesc:          oth_desc,
+	}
+	createErr := service.ModifyPatientPhysiqueCheck(&record)
+	if createErr != nil {
+		this.ErrorLog("修改患者体格检查失败:%v", createErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"record": record,
+	})
+}
+
 // /api/patient/courses [get]
 // @param patient_id:int
 // @param start_time:string (yyyy-MM-dd)

controllers/pay_api_controller.go

@@ -348,7 +348,7 @@ func (this *PayApiController) GetClientIp() string {
 	return ip
 }
 
-//截取字符串 start 起点下标 end 终点下标(不包括)
+// 截取字符串 start 起点下标 end 终点下标(不包括)
 func (this *PayApiController) Substr(str string, start int, end int) string {
 	rs := []rune(str)
 	length := len(rs)
@@ -362,7 +362,7 @@ func (this *PayApiController) Substr(str string, start int, end int) string {
 	return string(rs[start:end])
 }
 
-//设置请求参数
+// 设置请求参数
 func (this *PayApiController) SetParameter(key string, value string) {
 	if this.parameters == nil {
 		this.parameters = make(map[string]string)
@@ -370,7 +370,7 @@ func (this *PayApiController) SetParameter(key string, value string) {
 	this.parameters[key] = value
 }
 
-//设置请求参数
+// 设置请求参数
 func (this *PayApiController2) SetResultParameter(key string, value string) {
 	if this.resultParameters == nil {
 		this.resultParameters = make(map[string]string)
@@ -378,7 +378,7 @@ func (this *PayApiController2) SetResultParameter(key string, value string) {
 	this.resultParameters[key] = value
 }
 
-//设置prepay_id
+// 设置prepay_id
 func (this *PayApiController) SetPayUrl(payUrl string) {
 	this.payUrl = payUrl
 }
@@ -461,7 +461,7 @@ func (this *PayApiController) CreateXml() (string, error) {
 	return this.ParamsToXml(this.parameters), nil
 }
 
-//产生随机字符串，不长于32位
+// 产生随机字符串，不长于32位
 func (this *PayApiController) CreateNoncestr(length int) (nonceStr string) {
 	chars := "abcdefghijklmnopqrstuvwxyz0123456789"
 	for i := 0; i < length; i++ {
@@ -479,7 +479,7 @@ func (this *PayApiController) Error(strMsg string, err error) error {
 	}
 }
 
-//格式化参数，签名过程需要使用
+// 格式化参数，签名过程需要使用
 func (this *PayApiController) FormatParams(paramsMap map[string]string) string {
 	//STEP 1, 对key进行升序排序.
 	var sorted_keys []string
@@ -499,7 +499,7 @@ func (this *PayApiController) FormatParams(paramsMap map[string]string) string {
 	return strings.Join(paramsStr, "&")
 }
 
-//生成签名
+// 生成签名
 func (this *PayApiController) GetSign(paramsMap map[string]string, wxKey string) string {
 	//STEP 1：按字典序排序参数
 	paramsStr := this.FormatParams(paramsMap)
@@ -512,7 +512,7 @@ func (this *PayApiController) GetSign(paramsMap map[string]string, wxKey string)
 	return strings.ToUpper(hex.EncodeToString(sign.Sum(nil)))
 }
 
-//xml结构
+// xml结构
 func (this *PayApiController) ParamsToXml(data map[string]string) string {
 	fmt.Println(data)
 	buf := bytes.NewBufferString("<xml>")
@@ -528,7 +528,7 @@ func (this *PayApiController) ParamsToXml(data map[string]string) string {
 	return buf.String()
 }
 
-//xml结构
+// xml结构
 func (this *PayApiController2) ParamsToXml2(data map[string]string) string {
 	fmt.Println(data)
 	buf := bytes.NewBufferString("<xml>")

controllers/pc_index_evaluation_api_controller.go

@@ -49,7 +49,7 @@ type PCIndexEvaluationApiController struct {
 
 //化验指标
 
-//初始化数据
+// 初始化数据
 func (this *PCIndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	adminUserInfo := this.GetAdminUserInfo()
 
@@ -71,7 +71,7 @@ func (this *PCIndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	})
 }
 
-//获取取值范围
+// 获取取值范围
 func (this *PCIndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueData() {
 	range_type, _ := this.GetInt64("range_type")
 	project_id, _ := this.GetInt64("project_id")

controllers/pharmacy_controller.go

@@ -438,6 +438,7 @@ func (this *PharmacyController) DispensingMedicine() {
 
 // 退药按钮点击
 func (this *PharmacyController) DrugWithdrawal() {
+	fmt.Println("寄哪里2333333333333333333333333333333")
 	var err error
 	defer func() {
 		if rec := recover(); rec != nil {

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -136,7 +136,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
@@ -339,7 +339,7 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 	if types == 2 {
 		//list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
 		list, _ := service.GetWarehouseOutInfoPrintList(adminUserInfo.CurrentOrgId, startTime, endTime)
-		fmt.Println("list23323232233232", list)
+
 		stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/public_api_controller.go

@@ -115,23 +115,23 @@ func (c *PublicApiController) HandleSchedule() {
 
 func (c *PublicApiController) HandleOne() {
 	//fmt.Println("~~~~~~")
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	if err != nil {
-	}
-	startRecordDateTime := startTime.Unix()
-	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	if err != nil {
-	}
-	endRecordDateTime := endTime.Unix()
-	orders, _ := service.GetHisOrderDetailOne(startRecordDateTime, endRecordDateTime)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"order": orders,
-	})
+	//start_time := c.GetString("start_time")
+	//end_time := c.GetString("end_time")
+	//
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	//if err != nil {
+	//}
+	//startRecordDateTime := startTime.Unix()
+	//endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	//if err != nil {
+	//}
+	//endRecordDateTime := endTime.Unix()
+	//orders, _ := service.GetHisOrderDetailOne(startRecordDateTime, endRecordDateTime)
+	//c.ServeSuccessJSON(map[string]interface{}{
+	//	"order": orders,
+	//})
 }
 
 //func (c *PublicApiController) HandleScheduleTwo() {

controllers/secondary_order_api_contorller.go

@@ -1321,12 +1321,12 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 					}
 					//查询该调拨单是否有生成入库单
 					_, errcodess := service.GetWarehouseBySecondWarehouseId(12, item.WarehouseId, orgId, record_date)
-					fmt.Println("ERRCODESSS-------------------", errcodess)
+
 					if errcodess == gorm.ErrRecordNotFound {
 						service.AddSigleWarehouse(&warehousing)
 					}
 					infoObj, _ := service.GetLastWarehouseById(12, item.WarehouseId, orgId, record_date)
-					fmt.Println("INFOR----------------------", infoObj.ID)
+
 					warehouseInfo := &models.WarehousingInfo{
 						WarehousingOrder:      infoObj.WarehousingOrder,
 						WarehousingId:         infoObj.ID,

controllers/supply_order_api_contorller.go

@@ -108,7 +108,7 @@ func SupplyOrderApiRegistRouters() {
 	beego.Router("/api/supply/getgoodorderdetaillist", &SupplyOrderApiController{}, "Get:GetGoodOrderDetailList")
 }
 
-//判断前端参数是否为空
+// 判断前端参数是否为空
 func CheckParams(this *SupplyOrderApiController, m *map[string][]string) (map[string]string, error) {
 	tmp := make(map[string]string)
 	for k, v := range *m {
@@ -121,7 +121,7 @@ func CheckParams(this *SupplyOrderApiController, m *map[string][]string) (map[st
 	return tmp, nil
 }
 
-//获取供应商列表GetSupplyList
+// 获取供应商列表GetSupplyList
 func (this *SupplyOrderApiController) GetSupplyList() {
 	var err error
 	defer func() {
@@ -224,7 +224,7 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 	}
 }
 
-//保存供应商及联系人（用于更改）
+// 保存供应商及联系人（用于更改）
 func (this *SupplyOrderApiController) UpdateSupply() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	dataBody := make(map[string]interface{}, 0)
@@ -371,7 +371,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	return
 }
 
-//获取单条供应商和涉及到的联系人记录
+// 获取单条供应商和涉及到的联系人记录
 func (this *SupplyOrderApiController) GetSupplyAndContactOne() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	id, _ := this.GetInt64("id")
@@ -441,7 +441,7 @@ func (this *SupplyOrderApiController) GetSupplyAndContactOne() {
 	return
 }
 
-//获取供应商类别
+// 获取供应商类别
 func (this *SupplyOrderApiController) GetSupplyType() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	costClassify := "供应商类别"
@@ -453,7 +453,7 @@ func (this *SupplyOrderApiController) GetSupplyType() {
 	return
 }
 
-//删除供应商及联系人
+// 删除供应商及联系人
 func (this *SupplyOrderApiController) DelSupply() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//拿到供应商的id
@@ -478,7 +478,7 @@ func (this *SupplyOrderApiController) DelSupply() {
 	return
 }
 
-//删除单条联系人记录
+// 删除单条联系人记录
 func (this *SupplyOrderApiController) DelContactOne() {
 	id, _ := this.GetInt64("id")
 	if id == 0 {
@@ -499,7 +499,7 @@ func (this *SupplyOrderApiController) DelContactOne() {
 	return
 }
 
-//获取供应商编码
+// 获取供应商编码
 func (this *SupplyOrderApiController) GetSupplyCode() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	supply, err := service.GetSuppliyCode(orgId)
@@ -531,7 +531,7 @@ func (this *SupplyOrderApiController) GetSupplyCode() {
 	return
 }
 
-//保存供应商（用于新增）
+// 保存供应商（用于新增）
 func (this *SupplyOrderApiController) SaveSupply() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	dataBody := make(map[string]interface{}, 0)

go.mod

@@ -0,0 +1,30 @@
+module XT_New
+
+go 1.19
+
+require (
+	github.com/astaxie/beego v1.12.3 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/go-redis/redis v6.15.9+incompatible // indirect
+	github.com/go-sql-driver/mysql v1.7.0 // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/jinzhu/gorm v1.9.16 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/prometheus/client_golang v1.7.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.10.0 // indirect
+	github.com/prometheus/procfs v0.1.3 // indirect
+	github.com/robfig/cron v1.2.0 // indirect
+	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	google.golang.org/protobuf v1.23.0 // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
+)

go.sum

@@ -0,0 +1,205 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
+github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
+github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
+github.com/astaxie/beego v1.12.3 h1:SAQkdD2ePye+v8Gn1r4X6IKZM1wd28EyUOVQ3PDSOOQ=
+github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA=
+github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
+github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
+github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
+github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
+github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
+github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
+github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
+github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
+github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
+github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
+github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U=
+github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
+github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
+github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo=
+github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
+github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
+github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s=
+github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
+github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
+github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
+github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM/fAoGlaiiHYiFYdm80=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

models/dialysis.go

@@ -763,6 +763,8 @@ type MonitoringRecord struct {
 	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
 	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
 	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
+	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
+	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
 }
 
 func (MonitoringRecord) TableName() string {
@@ -1241,6 +1243,7 @@ type HisDoctorAdvice struct {
 	DrugId                int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	DrugNameId            int64              `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 	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"`
 }
 
 func (HisDoctorAdvice) TableName() string {
@@ -1471,3 +1474,79 @@ type NewAssessmentAfterDislysis struct {
 func (NewAssessmentAfterDislysis) TableName() string {
 	return "xt_assessment_after_dislysis"
 }
+
+type XtDialysisInformaitonSetting struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	WeekDay   int64 `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDialysisInformaitonSetting) TableName() string {
+	return "xt_dialysis_informaiton_setting"
+}
+
+type DialysisInformation struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	Module            int64  `gorm:"column:module" json:"module" form:"module"`
+	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ApplicationDate   int64  `gorm:"column:application_date" json:"application_date" form:"application_date"`
+	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	ApplicationStatus int64  `gorm:"column:application_status" json:"application_status" form:"application_status"`
+	Checker           int64  `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckTime         int64  `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (DialysisInformation) TableName() string {
+	return "xt_dialysis_information"
+}
+
+type DialysisScheduleFlow 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"`
+
+	MonitorPatients *MonitorPatients `gorm:"ForeignKey:PatientId" json:"patient"`
+	DeviceNumber    *DeviceNumber    `gorm:"ForeignKey:BedId" json:"device_number"`
+	DeviceZone      *DeviceZone      `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	TreatmentMode   *TreatmentMode   `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
+	DialysisFinish  *DialysisFinish  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId" json:"dialysis_finish"`
+}
+
+func (DialysisScheduleFlow) TableName() string {
+	return "xt_schedule"
+}
+
+type DialysisFinish struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	IsFinish   int64 `gorm:"column:is_finish" json:"is_finish" form:"is_finish"`
+	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime      int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Module     int64 `gorm:"column:module" json:"module" form:"module"`
+	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Sourse     int64 `gorm:"column:sourse" json:"sourse" form:"sourse"`
+	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+}
+
+func (DialysisFinish) TableName() string {
+	return "xt_dialysis_finish"
+}

models/his_charge_models.go

@@ -179,6 +179,10 @@ type HisChargeSettleOrder struct {
 	AliPay      string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
 	JifenPay    string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
 	OthDesc     string `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 }
 
 func (HisChargeSettleOrder) TableName() string {

models/his_deposit_models.go

@@ -129,7 +129,7 @@ func (Deposit1) TableName() string {
 	return "sgj_xt.his_deposit"
 }
 
-//扣费明细列表
+// 扣费明细列表
 type Details struct {
 	ID         int64           `json:"id"`          //原始code
 	Code       string          `json:"code"`        //就诊号
@@ -143,7 +143,7 @@ type Details struct {
 	ButtonShow int64           `json:"button_show"` //查看详情按钮是否显示，0隐藏，1显示
 }
 
-//扣费汇总
+// 扣费汇总
 type DeductionSummary struct {
 	Name    string          `json:"name"`    //患者名字
 	Total   decimal.Decimal `json:"total"`   //医疗费总额
@@ -159,7 +159,7 @@ func (GetorgName) TableName() string {
 	return "sgj_users.sgj_user_org"
 }
 
-//获取就诊号
+// 获取就诊号
 type GetMdtrtId struct {
 	Id      int64  `json:"id"`
 	MdtrtId string `json:"mdtrt_id"`

models/his_hospital_models.go

@@ -33,6 +33,10 @@ type HisHospitalOrder struct {
 
 	IsPre     int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	Diagnosis string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 }
 
 func (HisHospitalOrder) TableName() string {

models/his_models.go

@@ -65,6 +65,7 @@ type XtHisProjectTeam struct {
 	ProjectId   string              `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	ItemId      string              `gorm:"column:item_id" json:"item_id" form:"item_id"`
 	List        []*XtHisProjectList `gorm:"-" json:"list" form:"list"`
+	Sort        int64               `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (XtHisProjectTeam) TableName() string {
@@ -507,16 +508,17 @@ type TempHisOrder struct {
 	FaPiaoCode            string  `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber          string  `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
 
-	AdminUser         AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
-	IsUploadDiagnose  int64     `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
-	IsUploadOrderInfo int64     `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
-	IsUploadSuccess   int64     `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 
 	SettleType      int64  `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
 	SettleStartTime int64  `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
 	SettleEndTime   int64  `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
 	IsPre           int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	Diagnosis       string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 }
 
 func (TempHisOrder) TableName() string {
@@ -1402,6 +1404,7 @@ type HisXtDiagnoseConfig struct {
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
 	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Sort               int64  `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (HisXtDiagnoseConfig) TableName() string {

models/inspection_models.go

@@ -15,6 +15,7 @@ type Inspection struct {
 	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"`
+	InspectDesc  string `gorm:"column:inspect_desc" json:"inspect_desc" form:"inspect_desc"`
 }
 
 func (Inspection) TableName() string {
@@ -112,6 +113,26 @@ type InepectionForm struct {
 		RangeType   int64  `json:"range_type"`
 		Value       string `json:"value"`
 	} `json:"formItem"`
+	Imags []struct {
+		ID     int64  `json:"id"`
+		ImgUrl string `json:"img_url"`
+		Desc   string `json:"desc"`
+	} `json:"imgs"`
+}
+
+type InepectionPICForm struct {
+	Method         string `json:"method"`
+	ProjectId      int64  `json:"project_id"`
+	InspectDate    string `json:"inspect_date"`
+	OldInspectDate string `json:"old_inspect_date"`
+	Imags          []struct {
+		ID     int64  `json:"id"`
+		ImgUrl string `json:"img_url"`
+		Desc   string `json:"desc"`
+	} `json:"imgs"`
+	DeleteImg []struct {
+		ID int64 `json:"id"`
+	} `json:"delete_imgs"`
 }
 
 type InspectionDate struct {

models/patient_models.go

@@ -1602,6 +1602,7 @@ type VmDialysisSolutionOne struct {
 	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
 	ModeName                   string `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
 	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	SolutionStatus             int64  `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
 }
 
 func (VmDialysisSolutionOne) TableName() string {
@@ -1634,6 +1635,7 @@ type XtScheduleList struct {
 	ModeId           int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 	IsExport         int64              `gorm:"column:is_export" json:"is_export" form:"is_export"`
 	DialysisSolution VmDialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
+	Status           int64              `gorm:"column:status" json:"status" form:"status"`
 }
 
 func (XtScheduleList) TableName() string {
@@ -1856,3 +1858,95 @@ type XtDialysisInformaitonSetting struct {
 func (XtDialysisInformaitonSetting) TableName() string {
 	return "xt_dialysis_informaiton_setting"
 }
+
+type XtPatientSickHistory struct {
+	ID                      int64                  `gorm:"column:id" json:"id" form:"id"`
+	OrgId                   int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	PatientId               int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Recorder                int64                  `gorm:"column:recorder" json:"recorder" form:"recorder"`
+	RecordTime              int64                  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	RecordDate              int64                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Content                 string                 `gorm:"column:content" json:"content" form:"content"`
+	Status                  int64                  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64                  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64                  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Title                   string                 `gorm:"column:title" json:"title" form:"title"`
+	IsShenyizhiHistory      int64                  `gorm:"column:is_shenyizhi_history" json:"is_shenyizhi_history" form:"is_shenyizhi_history"`
+	IsFumoDialysisHistory   int64                  `gorm:"column:is_fumo_dialysis_history" json:"is_fumo_dialysis_history" form:"is_fumo_dialysis_history"`
+	HypersusceptibilityDesc string                 `gorm:"column:hypersusceptibility_desc" json:"hypersusceptibility_desc" form:"hypersusceptibility_desc"`
+	DoctorId                int64                  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	IsHypersusceptibility   int64                  `gorm:"column:is_hypersusceptibility" json:"is_hypersusceptibility" form:"is_hypersusceptibility"`
+	XtPatientPhysiqueCheck  XtPatientPhysiqueCheck `gorm:"json:"ppc"`
+}
+
+func (XtPatientSickHistory) TableName() string {
+	return "xt_patient_sick_history"
+}
+
+type XtPatientPhysiqueCheck struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Recorder   int64 `gorm:"column:recorder" json:"recorder" form:"recorder"`
+	RecordTime int64 `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	T                string `gorm:"column:t" json:"t" form:"t"`
+	P                string `gorm:"column:p" json:"p" form:"p"`
+	R                string `gorm:"column:r" json:"r" form:"r"`
+	BpRight          string `gorm:"column:bp_right" json:"bp_right" form:"bp_right"`
+	BpLeft           string `gorm:"column:bp_left" json:"bp_left" form:"bp_left"`
+	Pinxuerongmao    int64  `gorm:"column:pinxuerongmao" json:"pinxuerongmao" form:"pinxuerongmao"`
+	Tiwei            int64  `gorm:"column:tiwei" json:"tiwei" form:"tiwei"`
+	Fuzhong          int64  `gorm:"column:fuzhong" json:"fuzhong" form:"fuzhong"`
+	Chuxuedian       int64  `gorm:"column:chuxuedian" json:"chuxuedian" form:"chuxuedian"`
+	Fayu             int64  `gorm:"column:fayu" json:"fayu" form:"fayu"`
+	Yinyang          int64  `gorm:"column:yinyang" json:"yinyang" form:"yinyang"`
+	Shenzhi          int64  `gorm:"column:shenzhi" json:"shenzhi" form:"shenzhi"`
+	Pifunianmo       int64  `gorm:"column:pifunianmo" json:"pifunianmo" form:"pifunianmo"`
+	Buwei            string `gorm:"column:buwei" json:"buwei" form:"buwei"`
+	Chengdu          string `gorm:"column:chengdu" json:"chengdu" form:"chengdu"`
+	Pixiachuxue      int64  `gorm:"column:pixiachuxue" json:"pixiachuxue" form:"pixiachuxue"`
+	Zidian           int64  `gorm:"column:zidian" json:"zidian" form:"zidian"`
+	Pifuwendu        int64  `gorm:"column:pifuwendu" json:"pifuwendu" form:"pifuwendu"`
+	Qita             string `gorm:"column:qita" json:"qita" form:"qita"`
+	Linbazhongda     int64  `gorm:"column:linbazhongda" json:"linbazhongda" form:"linbazhongda"`
+	Linbabuwei       string `gorm:"column:linbabuwei" json:"linbabuwei" form:"linbabuwei"`
+	Yanlian          int64  `gorm:"column:yanlian" json:"yanlian" form:"yanlian"`
+	Tongkong         int64  `gorm:"column:tongkong" json:"tongkong" form:"tongkong"`
+	Zuo              string `gorm:"column:zuo" json:"zuo" form:"zuo"`
+	You              string `gorm:"column:you" json:"you" form:"you"`
+	Duiguangfanshe   string `gorm:"column:duiguangfanshe" json:"duiguangfanshe" form:"duiguangfanshe"`
+	Biantaoti        string `gorm:"column:biantaoti" json:"biantaoti" form:"biantaoti"`
+	Yanbu            string `gorm:"column:yanbu" json:"yanbu" form:"yanbu"`
+	Toubuqita        string `gorm:"column:toubuqita" json:"toubuqita" form:"toubuqita"`
+	Huxiyin          string `gorm:"column:huxiyin" json:"huxiyin" form:"huxiyin"`
+	Xiongmomocayin   int64  `gorm:"column:xiongmomocayin" json:"xiongmomocayin" form:"xiongmomocayin"`
+	Feizhangbuwei    int64  `gorm:"column:feizhangbuwei" json:"feizhangbuwei" form:"feizhangbuwei"`
+	Luoyin           int64  `gorm:"column:luoyin" json:"luoyin" form:"luoyin"`
+	Desc             string `gorm:"column:desc" json:"desc" form:"desc"`
+	Xinzangdaxiao    int64  `gorm:"column:xinzangdaxiao" json:"xinzangdaxiao" form:"xinzangdaxiao"`
+	Xinlv            int64  `gorm:"column:xinlv" json:"xinlv" form:"xinlv"`
+	Xinbaomocasheng  int64  `gorm:"column:xinbaomocasheng" json:"xinbaomocasheng" form:"xinbaomocasheng"`
+	Zayin            int64  `gorm:"column:zayin" json:"zayin" form:"zayin"`
+	Fujiayin         int64  `gorm:"column:fujiayin" json:"fujiayin" form:"fujiayin"`
+	Xinzangdesc      string `gorm:"column:xinzangdesc" json:"xinzangdesc" form:"xinzangdesc"`
+	Fushuizheng      int64  `gorm:"column:fushuizheng" json:"fushuizheng" form:"fushuizheng"`
+	Ganjingjingmai   string `gorm:"column:ganjingjingmai" json:"ganjingjingmai" form:"ganjingjingmai"`
+	GangzhangYatong  int64  `gorm:"column:gangzhang_yatong" json:"gangzhang_yatong" form:"gangzhang_yatong"`
+	GangzhangKoutong int64  `gorm:"column:gangzhang_koutong" json:"gangzhang_koutong" form:"gangzhang_koutong"`
+	PizhangYatong    int64  `gorm:"column:pizhang_yatong" json:"pizhang_yatong" form:"pizhang_yatong"`
+	PizhangKoutong   int64  `gorm:"column:pizhang_koutong" json:"pizhang_koutong" form:"pizhang_koutong"`
+	ShenzhangYatong  int64  `gorm:"column:shenzhang_yatong" json:"shenzhang_yatong" form:"shenzhang_yatong"`
+	ShenzhangKoutong int64  `gorm:"column:shenzhang_koutong" json:"shenzhang_koutong" form:"shenzhang_koutong"`
+	FubuDesc         string `gorm:"column:fubu_desc" json:"fubu_desc" form:"fubu_desc"`
+	OthDesc          string `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
+	DoctorId         int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+}
+
+func (XtPatientPhysiqueCheck) TableName() string {
+	return "xt_patient_physique_check"
+}

models/pharmacy_models.go

@@ -1,6 +1,6 @@
 package models
 
-//药房表
+// 药房表
 type Pharmary 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"`
@@ -26,7 +26,7 @@ func (XtErrs) TableName() string {
 	return "sgj_xt.xt_errs"
 }
 
-//病人
+// 病人
 type TmpPatient struct {
 	PatientID  int64
 	Name       string
@@ -44,7 +44,7 @@ func (TmpPatientOne) TableName() string {
 	return "xt_patients"
 }
 
-//药品信息
+// 药品信息
 type PharmacyContent struct {
 	Name         string //名称
 	SingleDosage string //单次用量
@@ -57,7 +57,7 @@ type PharmacyContent struct {
 	Remarks      string //备注
 }
 
-//发药明细列表
+// 发药明细列表
 type DispensingList struct {
 	PatientID  int64  //	患者id
 	Name       string //患者姓名
@@ -72,7 +72,7 @@ type PrescripDetailsList struct {
 	Pres []*PrescripDetails
 }
 
-//处方详情
+// 处方详情
 type PrescripDetails struct {
 	Drugname     string //药品名称
 	SingleDosage string //单次用量
@@ -84,7 +84,7 @@ type PrescripDetails struct {
 	Remarks      string //备注
 }
 
-//临时医嘱
+// 临时医嘱
 type StatOrder struct {
 	StartTime             string //开始时间
 	Name                  string //医嘱名称
@@ -95,7 +95,7 @@ type StatOrder struct {
 	ExecutionFrequency    string //执行频率
 }
 
-//退库用的结构体
+// 退库用的结构体
 type SpecialForStock struct {
 	BatchNumber       string      `json:"batch_number"`
 	BatchNumberId     int64       `json:"batch_number_id"`
@@ -118,7 +118,7 @@ type SpecialForStock struct {
 	ReturnCount       string      `json:"return_count"`
 }
 
-//药品发药药品列表
+// 药品发药药品列表
 type ListOfDrugs struct {
 	ID             int64  `json:"id"`             //药品id
 	Name           string `json:"name"`           //药品 名称
@@ -126,7 +126,7 @@ type ListOfDrugs struct {
 	Stock          string `json:"stock"`          //库存（当前的仓库库存）
 }
 
-//病人信息
+// 病人信息
 type PatientInformation struct {
 	Id           string `json:"id"`            //hid表示his_doctor_advice_info的id ,xid表示xt_doctor_advice的id
 	PatientId    int64  `json:"patient_id"`    //患者id
@@ -274,19 +274,19 @@ type TmpAdviceDoctor struct {
 	AdviceDoctor int64
 }
 
-//替换药品名称
+// 替换药品名称
 type ReplacementDrugs struct {
 	Id   int64  `json:"id"`
 	Name string `json:"name"`
 }
 
-//病人
+// 病人
 type DialysisPatient struct {
 	ID   int64  `json:"id"`
 	Name string `json:"name"`
 }
 
-//项目下拉列表
+// 项目下拉列表
 type DropDownList struct {
 	Id   string `json:"id"`
 	Name string `json:"name"`
@@ -497,7 +497,7 @@ func (BaseDrugLibL) TableName() string {
 	return "xt_base_drug"
 }
 
-//组
+// 组
 type HisPrescriptionInfoTemplateL 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"`

models/schedule_models.go

@@ -74,9 +74,10 @@ type ScheduleTwo struct {
 	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"`
-	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
-	DialysisMachineName       string               `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	Patient                   string                `gorm:"-" json:"patient" form:"patient"`
+	PatientInfectiousDiseases []InfectiousDiseases  `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisMachineName       string                `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	DialysisSolution          VmDialysisSolutionOne `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 }
 
 func (ScheduleTwo) TableName() string {

models/secondary_models.go

@@ -1,6 +1,6 @@
 package models
 
-//仓库配置
+// 仓库配置
 type StorehouseConfig 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"`                         //机构id
@@ -37,7 +37,7 @@ func (UserOrg) TableName() string {
 	return "sgj_users.sgj_user_org"
 }
 
-//分页
+// 分页
 type Storehouselist struct {
 	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
 	StorehouseCode      string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`                 //仓库编号
@@ -119,7 +119,7 @@ func (XtStorehouseConfig) TableName() string {
 	return "xt_storehouse_config"
 }
 
-//二级仓库
+// 二级仓库
 type Storehouse struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	StorehouseCode    string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`             //仓库编号

models/supply.models.go

@@ -1,6 +1,6 @@
 package models
 
-//供应商联系人
+// 供应商联系人
 type SpSupplierContacts struct {
 	ID           int64  `gorm:"column:id" json:"id" form:"id"`
 	Name         string `gorm:"column:name" json:"name" form:"name"`

service/app_version.go

@@ -353,6 +353,7 @@ type HisPrescriptionInfoTemplateTwo struct {
 func (HisPrescriptionInfoTemplateTwo) TableName() string {
 	return "his_prescription_info_template"
 }
+
 func GetHisPrescriptionTemplateTwo() (prescription []*HisPrescriptionInfoTemplateTwo, err error) {
 	err = readDb.Model(&HisPrescriptionInfoTemplateTwo{}).
 		Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
@@ -362,9 +363,11 @@ func GetHisPrescriptionTemplateTwo() (prescription []*HisPrescriptionInfoTemplat
 		Find(&prescription).Error
 	return
 }
+
 func SaveAdviceTemplate(advice HisPrescriptionAdviceTemplate) {
 	writeDb.Save(&advice)
 }
+
 func GetAllPT(org_id int64) (his []*models.HisPrescriptionTemplate, err error) {
 	err = readDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND status = 1", org_id).Find(&his).Error
 	return
@@ -422,6 +425,7 @@ type HisPrescriptionInfoTemplateTHree struct {
 func (HisPrescriptionInfoTemplateTHree) TableName() string {
 	return "his_prescription_info_template"
 }
+
 func GetAllPTInfo(org_id int64, p_template_id int64) (his []*HisPrescriptionInfoTemplateTHree, err error) {
 	err = readDb.Model(&HisPrescriptionInfoTemplateTHree{}).Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1")
@@ -430,6 +434,7 @@ func GetAllPTInfo(org_id int64, p_template_id int64) (his []*HisPrescriptionInfo
 	}).Where("user_org_id = ? AND status = 1 AND p_template_id = ?", org_id, p_template_id).Find(&his).Error
 	return
 }
+
 func GetAllInfo(org_id int64, project_id int64) (his []*HisPrescriptionProjectTemplate, err error) {
 	err = readDb.Model(&HisPrescriptionProjectTemplate{}).Where("user_org_id = ? AND status = 1 AND project_id = ? ", org_id, project_id).Find(&his).Error
 	return
@@ -438,21 +443,26 @@ func UpdateStatus(project_id int64, p_id int64) {
 	writeDb.Model(&HisPrescriptionProjectTemplate{}).Where("id = ?", project_id).Updates(map[string]interface{}{"status": 0})
 	writeDb.Model(&HisPrescriptionInfoTemplateTwo{}).Where("id = ?", p_id).Updates(map[string]interface{}{"status": 0})
 }
+
 func SaveOrder(order *models.HisOrder) {
 	writeDb.Save(&order)
 }
+
 func GetAllPrivateHis(org_id int64) (his []*models.HisPatient) {
 	readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND balance_accounts_type = 2 AND status = 1", org_id).Find(&his)
 	return
 }
+
 func SaveHis(his *models.HisPatient) {
 	writeDb.Save(his)
 	return
 }
+
 func GetAllProjectPrescription() (pre []*models.HisPrescription) {
 	readDb.Model(&models.HisPrescription{}).Where("user_org_id = 10215 AND status = 1 AND type = 2 AND order_status = 1 AND record_date >= 1659283200").Find(&pre)
 	return
 }
+
 func GetAllProject(id int64) (pre []*models.HisPrescriptionProject) {
 	readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = 10215 AND status = 1 AND project_id = 1735  AND prescription_id = ?", id).Find(&pre)
 	return
@@ -468,6 +478,7 @@ func GetAllProject(id int64) (pre []*models.HisPrescriptionProject) {
 //	}).Find(&order).Error
 //	return
 //}
+
 type HisOrderTen 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"`
@@ -542,47 +553,14 @@ type HisOrderTen struct {
 	Creator               int64                 `gorm:"column:creator" json:"creator" form:"creator"`
 	PType                 int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	Decimal               float64               `gorm:"column:decimal" json:"decimal" form:"decimal"`
-	HisPrescriptionTen    []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
-	//VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"order_info"`
-	VmHisOrderInfo9504 []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
-	OthDesc            string                `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
-	PayWays            string                `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
-
-	Patients Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
+	Patients              Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 }
 
 func (HisOrderTen) TableName() string {
 	return "his_order"
 }
 
-type HisPrescriptionInfoOne 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"`
-	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	Status             int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments        int64  `gorm:"column:departments" json:"departments" form:"departments"`
-	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
-	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
-	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	SickType           int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
-	PType              int64  `gorm:"column:p_type" json:"p_type" form:"p_type"`
-}
-
-func (HisPrescriptionInfoOne) TableName() string {
-	return "his_prescription_info"
-}
-
 type HisPrescriptionTen 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"`
@@ -604,7 +582,6 @@ type HisPrescriptionTen struct {
 	Patients                  Patients                     `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisDoctorAdviceInfoTen    []*HisDoctorAdviceInfoTen    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
 	HisPrescriptionProjectTen []*HisPrescriptionProjectTen `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
-	HisPrescriptionInfoOne    HisPrescriptionInfoOne       `gorm:"ForeignKey:PrescriptionNumber;AssociationForeignKey:PrescriptionNumber" json:"p_info"`
 	Total                     string                       `gorm:"-" json:"total" form:"total"`
 	PType                     int64                        `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	MedType                   string                       `gorm:"column:med_type" json:"med_type" form:"med_type"`
@@ -614,83 +591,43 @@ type HisPrescriptionTen struct {
 func (HisPrescriptionTen) TableName() string {
 	return "his_prescription"
 }
+
 func GetHisOrderDetailThree() (order []*HisOrderTen, err error) {
-	err = readDb.Model(&HisOrderTen{}).Preload("VmHisOrderInfo9504", "status = 1").Preload("Patients", "status = 1").Preload("HisPrescriptionTen", func(db *gorm.DB) *gorm.DB {
+	err = readDb.Model(&HisOrderTen{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject", "status = 1").Preload("VMGoodInfo", "status = 1")
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("Drug", "status = 1")
 		})
-	}).Where("settle_accounts_date >= 1675180800 AND settle_accounts_date <= 1677513600 AND status = 1 AND order_status =2 and p_type = 1 AND user_org_id = 10215").Find(&order).Order("patient_id").Error
+	}).Where("setl_time >= '2023-03-01 00:00:00' AND setl_time <= '2023-03-31 23:59:59' AND status = 1 AND order_status =2 and p_type = 1 AND user_org_id = 10215").Find(&order).Order("patient_id").Error
 	return
 }
 
-type VmHisOrderInfo9504Two struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
-	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
-	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
-	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
-	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
-	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
-	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
-	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
-	BasMednFlag      string  `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
-	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
-	HiNegoDrugFlag   string  `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
-	Status           int64   `gorm:"column:status" json:"status" form:"status"`
-	Memo             string  `gorm:"column:memo" json:"memo" form:"memo"`
-	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	InscpScpAmt      float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
-	DrtReimFlag      string  `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
-	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	ListSpItemFlag   string  `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
-	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
-	LmtUsedFlag      string  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
-	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId     int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
-	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	SettleType       int64   `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
-}
-
-func (VmHisOrderInfo9504Two) TableName() string {
-	return "his_order_info"
-}
-
 type HisDoctorAdviceInfoTen 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"`
-	AdviceDate            int64                 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
-	AdviceName            string                `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	AdviceDesc            string                `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
-	SingleDose            float64               `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	SingleDoseUnit        string                `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
-	PrescribingNumber     float64               `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	PrescribingNumberUnit string                `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DeliveryWay           string                `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string                `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime           int64                 `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	RecordDate            int64                 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DrugSpec              float64               `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugSpecUnit          string                `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
-	PrescriptionId        int64                 `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	VmHisOrderInfo9504Two VmHisOrderInfo9504Two `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"order_info"`
-	Price                 float64               `gorm:"column:price" json:"price" form:"price"`
-	DrugId                int64                 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Drug                  Drug                  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
-	IsMedicine            int64                 `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
-	ExecutionFrequencyId  int64                 `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	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"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+
+	Price                float64 `gorm:"column:price" json:"price" form:"price"`
+	DrugId               int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Drug                 Drug    `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	IsMedicine           int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisDoctorAdviceInfoTen) TableName() string {
@@ -698,39 +635,38 @@ func (HisDoctorAdviceInfoTen) TableName() string {
 }
 
 type HisPrescriptionProjectTen struct {
-	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
-	ProjectId             int64                 `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price                 float64               `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
-	Ctime                 int64                 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                 int64                 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId          int64                 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate            int64                 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId        int64                 `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count                 string                `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn             string                `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg           string                `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose            string                `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay           string                `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string                `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                   string                `gorm:"column:day" json:"day" form:"day"`
-	VMHisProject          VMHisProject          `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	VMGoodInfo            VMGoodInfo            `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
-	Remark                string                `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit                  string                `gorm:"column:unit" json:"unit" form:"unit"`
-	Type                  int64                 `gorm:"column:type" json:"type" form:"type"`
-	Doctor                int64                 `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	ExecutionTime         int64                 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff        int64                 `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState        int64                 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	CheckTime             int64                 `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState            int64                 `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	Checker               int64                 `gorm:"column:checker" json:"checker" form:"checker"`
-	StartTime             int64                 `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	TeamId                int64                 `gorm:"column:team_id" json:"team_id" form:"team_id"`
-	VmHisOrderInfo9504Two VmHisOrderInfo9504Two `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	ID                 int64        `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64      `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64        `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string       `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string       `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string       `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string       `gorm:"column:day" json:"day" form:"day"`
+	VMHisProject       VMHisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	VMGoodInfo         VMGoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Remark             string       `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string       `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64        `gorm:"column:type" json:"type" form:"type"`
+	Doctor             int64        `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime      int64        `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff     int64        `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState     int64        `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime          int64        `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState         int64        `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker            int64        `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime          int64        `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId             int64        `gorm:"column:team_id" json:"team_id" form:"team_id"`
 
 	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
 	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
@@ -741,19 +677,14 @@ type HisPrescriptionProjectTen struct {
 func (HisPrescriptionProjectTen) TableName() string {
 	return "his_prescription_project"
 }
+
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
-	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2023-02-01 00:00:00' AND in_hosptial_time <= '2023-02-28 23:59:59'", orgid).Find(&paitent).Error
-	return paitent, err
-}
-func GetHisPatient2222(orgid int64) (paitent []*models.HisPatient, err error) {
-	err = XTReadDB().Model(&models.HisPatient{}).Where("user_org_id = ?  and status = 1 AND record_date >= 1654012800 AND record_date <= 1659196800 ", orgid).Find(&paitent).Error
+	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2022-12-01 00:00:00' AND in_hosptial_time <= '2022-12-31 23:59:59'", orgid).Find(&paitent).Error
 	return paitent, err
 }
+
 func SaveHP(paitent *models.HisHospitalCheckRecord) {
 	writeDb.Save(&paitent)
-}
-func SaveHPtWO(paitent *models.HisPatient) {
-	writeDb.Save(&paitent)
 
 }
 
@@ -829,8 +760,6 @@ type HisOrder9504 struct {
 	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
 	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
 	SettleStartTime       int64     `gorm:"settle_start_time" json:"settle_start_time" form:"settle_start_time"`
-	OthDesc               string    `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
-	PayWays               string    `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 
 	Creator            int64                 `gorm:"column:creator" json:"creator" form:"creator"`
 	PType              int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
@@ -926,6 +855,7 @@ type VmHisOrderInfo95042 struct {
 func (VmHisOrderInfo95042) TableName() string {
 	return "his_order_info"
 }
+
 func GetHisOrderDetail9504() (order []*HisOrder9504, err error) {
 	err = readDb.Model(&HisOrder9504{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
@@ -936,6 +866,7 @@ func GetHisOrderDetail9504() (order []*HisOrder9504, err error) {
 	}).Where("settle_accounts_date >= 1640966400 AND settle_accounts_date <= 1661875200 AND status = 1 AND order_status =2  AND user_org_id = 9504").Find(&order).Order("setl_time").Error
 	return
 }
+
 func GetHisOrderDetail10188() (order []*HisOrder9504, err error) {
 	err = readDb.Model(&HisOrder9504{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
@@ -959,7 +890,7 @@ func GetHisOrderDetail10138() (order []*HisOrderTen, err error) {
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject")
 		})
-	}).Where("settle_accounts_date >= 1672502400 AND settle_accounts_date <= 1676822400 AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
+	}).Where("settle_accounts_date >= 1664553600 AND settle_accounts_date <= 1672416000 AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
 	return
 }
 
@@ -1104,181 +1035,9 @@ func SaveSch(sch models.Schedule) (err error) {
 }
 
 func SaveSchTwo(sch models.Schedule, sch_two models.Schedule) (err error) {
-	utx := writeDb.Begin()
-	if err = utx.Model(&Schedule{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error; err != nil {
-		utx.Rollback()
-		return err
-	}
-	if err = utx.Model(&Schedule{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error; err != nil {
-		utx.Rollback()
-		return err
-	}
-	utx.Commit()
-	return err
-}
+	//err = writeDb.Save(&sch).Error
+	err = writeDb.Model(&Schedule{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error
+	err = writeDb.Model(&Schedule{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error
 
-func GetHisOrderInfoDetail() (order []*VmHisOrderInfo9504, err error) {
-	err = readDb.Model(&VmHisOrderInfo9504{}).Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
-	}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("Drug")
-	}).Where("status = 1 AND order_number = '202302201702258124538'").Find(&order).Error
-	return
-}
-
-func GetHisPrescriptionInfoDetail() (order []*HisPrescriptionProjectTen, err error) {
-	err = readDb.Model(&HisPrescriptionProjectTen{}).Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
-	}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("Drug")
-	}).Where("status = 1 AND order_number = '202302201702258124538'").Find(&order).Error
-	return
-}
-
-type HisOrder10138 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"`
-	Status             int64                 `gorm:"column:status" json:"status" form:"status"`
-	Number             string                `gorm:"column:number" json:"number" form:"number"`
-	PatientId          int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	OrderStatus        int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId            string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	Ctime              int64                 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	SettleAccountsDate int64                 `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	VmHisOrderInfo9504 []*VmHisOrderInfo9504 `json:"infos" form:"infos"`
-}
-
-func (HisOrder10138) TableName() string {
-	return "his_order"
-}
-
-type PatientVM10138 struct {
-	ID            int64            `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Name          string           `gorm:"column:name" json:"name" form:"name"`
-	HisOrder10138 []*HisOrder10138 `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"order"`
-}
-
-func (PatientVM10138) TableName() string {
-	return "xt_patients"
-}
-
-func GetHisAllPatientOrder(start_time int64, end_time int64) (order []*PatientVM10138, err error) {
-	err = readDb.Model(&PatientVM10138{}).Preload("HisOrder10138", " ctime >= ? AND ctime <= ? AND status = 1 AND order_status = 2", start_time, end_time).Where("user_org_id = 10138 AND status = 1").Find(&order).Error
-	return
-}
-
-func GetHisOrderInfoDetail10138(order_number string) (order []*VmHisOrderInfo9504, err error) {
-	err = readDb.Model(&VmHisOrderInfo9504{}).Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
-	}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("Drug")
-	}).Where("status = 1 AND order_number = ?", order_number).Find(&order).Error
-	return
-}
-
-//func GetHisOrderDetailOne(start_time int64, end_time int64) (order []*HisOrder9504, err error) {
-//	err = readDb.Model(&HisOrder9504{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
-//		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
-//			return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
-//		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
-//			return db.Where("status = 1").Preload("Drug")
-//		})
-//	}).Where("settle_accounts_date >= ? AND settle_accounts_date <= ? AND status = 1 AND order_status =2  AND user_org_id = 9919", start_time, end_time).Find(&order).Order("setl_time").Error
-//	return
-//}
-//
-
-type HisOrderTenOne 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"`
-	HisPatientId          int64                 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate    int64                 `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	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"`
-	Number                string                `gorm:"column:number" json:"number" form:"number"`
-	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Infcode               int64                 `gorm:"column:infcode" json:"infcode" form:"infcode"`
-	WarnMsg               string                `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
-	Cainfo                string                `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
-	ErrMsg                string                `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
-	RespondTime           string                `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
-	InfRefmsgid           string                `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
-	OrderStatus           int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId               string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	SetlId                string                `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
-	PsnNo                 string                `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
-	PsnName               string                `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
-	PsnCertType           string                `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
-	Certno                string                `gorm:"column:certno" json:"certno" form:"certno"`
-	Gend                  string                `gorm:"column:gend" json:"gend" form:"gend"`
-	Naty                  string                `gorm:"column:naty" json:"naty" form:"naty"`
-	Brdy                  time.Time             `gorm:"column:brdy" json:"brdy" form:"brdy"`
-	Age                   float64               `gorm:"column:age" json:"age" form:"age"`
-	Insutype              string                `gorm:"column:insutype" json:"insutype" form:"insutype"`
-	PsnType               string                `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
-	CvlservFlag           string                `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
-	SetlTime              string                `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
-	MdtrtCertType         string                `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
-	MedType               string                `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	MedfeeSumamt          float64               `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	FulamtOwnpayAmt       float64               `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-	OverlmtSelfPay        float64               `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
-	PreselfpayAmt         float64               `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
-	InscpScpAmt           float64               `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
-	ActPayDedc            float64               `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
-	HifpPay               float64               `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
-	CvlservPay            float64               `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
-	PoolPropSelfpay       float64               `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
-	HifesPay              float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
-	HifmiPay              float64               `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
-	HifobPay              float64               `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
-	MafPay                float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
-	OthPay                float64               `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
-	FundPaySumamt         float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
-	PsnPartAmt            float64               `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
-	AcctPay               float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
-	PsnCashPay            float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
-	HospPartAmt           float64               `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
-	Balc                  float64               `gorm:"column:balc" json:"balc" form:"balc"`
-	AcctMulaidPay         float64               `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
-	MedinsSetlId          string                `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
-	ClrOptins             string                `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
-	ClrWay                string                `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
-	ClrType               string                `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
-	SetlDetail            string                `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
-	IsMedicineInsurance   int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
-	PayWay                int64                 `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
-	PayPrice              float64               `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
-	PayCardNo             string                `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
-	DiscountPrice         float64               `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
-	PreferentialPrice     float64               `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
-	RealityPrice          float64               `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
-	FoundPrice            float64               `gorm:"column:found_price" json:"found_price" form:"found_price"`
-	MedicalInsurancePrice float64               `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
-	PrivatePrice          float64               `gorm:"column:private_price" json:"private_price" form:"private_price"`
-	DepartmentName        string                `gorm:"-" json:"department_name" form:"department_name"`
-	DoctorName            string                `gorm:"-" json:"doctor_name" form:"doctor_name"`
-	Creator               int64                 `gorm:"column:creator" json:"creator" form:"creator"`
-	PType                 int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Decimal               float64               `gorm:"column:decimal" json:"decimal" form:"decimal"`
-	HisPrescriptionTen    []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
-	OthDesc               string                `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
-	PayWays               string                `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
-}
-
-func (HisOrderTenOne) TableName() string {
-	return "his_order"
-}
-
-func GetHisOrderDetailOne(start_time int64, end_time int64) (order []*HisOrderTen, err error) {
-	err = readDb.Model(&HisOrderTen{}).Preload("HisPrescriptionTen", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("HisPrescriptionInfoOne", "status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1").Preload("VmHisOrderInfo9504Two", "status = 1").Preload("VMHisProject", "status = 1").Preload("VMGoodInfo", "status = 1")
-		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1").Preload("VmHisOrderInfo9504Two", "status = 1").Preload("Drug", "status = 1")
-		})
-	}).Where("settle_accounts_date >= ? AND settle_accounts_date <= ? AND status = 1 AND order_status =2 AND user_org_id = 9919 AND setl_id <> ''", start_time, end_time).Find(&order).Error
 	return
 }

service/auto_create_drug.go

@@ -70,7 +70,7 @@ func AutoCreateDrugJob() {
 
 }
 
-//查询当天有排班的所有机构
+// 查询当天有排班的所有机构
 func GetAllOrgName(time int64) (schedule []*models.XtSchedule, err error) {
 
 	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error
@@ -78,14 +78,14 @@ func GetAllOrgName(time int64) (schedule []*models.XtSchedule, err error) {
 	return schedule, err
 }
 
-//根据机构ID查询药品信息
+// 根据机构ID查询药品信息
 func FindAllDrugList(orgid int64) (lib []*models.BaseDrugLib, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&lib).Error
 	return lib, err
 }
 
-//根据药品ID统计该药品的库存
+// 根据药品ID统计该药品的库存
 func FindAllDrugTotalCount(drug_id int64) (info []*models.DrugWarehouseInfoSix, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")

service/auto_create_stock.go

@@ -79,7 +79,7 @@ func AutoCreateStockJob() {
 	}
 }
 
-//查询所有的耗材信息
+// 查询所有的耗材信息
 func FindAlLGoodInformation(orgid int64) (info []*models.GoodInfo, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&info).Error

service/auto_create_week_disinfection.go

@@ -31,7 +31,7 @@ func BeginAutoCreateWeekDisinfectionJob() {
 }
 
 func AutoCreateWeekDisinfectionJob() {
-	fmt.Println("开始执行-----------------------------------------------")
+
 	timeStr := time.Now().Format("2006-01-02")
 	timeLayout := "2006-01-02 15:04:05"
 	fmt.Println("timeStr:", timeStr)

service/data.go

@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-//GetPatientList 返回患者的列表
+// GetPatientList 返回患者的列表
 func GetConfigList(orgID int64) (dataconfig interface{}, err error) {
 	var configList []*models.Dataconfig
 
@@ -296,45 +296,45 @@ func FindeInspectionByOrgId(orgid int64) (xtquality []*models.XtCheckConfigurati
 }
 
 func BatchInsertFiledConfig(org_id int64) (err error) {
-	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 0 AND is_show = 1", org_id).Error
+	err = XTWriteDB().Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 0 AND is_show = 1", org_id).Error
 	return
 }
 
 func BatchInsertQualityControl(org_id int64) (err error) {
 
-	err = readDb.Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0 and is_status = 1", org_id).Error
+	err = XTWriteDB().Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0 and is_status = 1", org_id).Error
 	return
 }
 
 func BathInsertQualityControlTwo(org_id int64) (err error) {
-	err = readDb.Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0 and is_status = 0", org_id).Error
+	err = XTWriteDB().Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0 and is_status = 0", org_id).Error
 	return
 }
 
 func BatchInspectionConfiguration(orgid int64) (err error) {
 
-	err = readDb.Exec("INSERT INTO xt_check_configuration(user_org_id,inspection_major,inspection_frequency,sort,created_time,status) SELECT ?,inspection_major,inspection_frequency,sort,created_time,status FROM xt_check_configuration where user_org_id = 0", orgid).Error
+	err = XTWriteDB().Exec("INSERT INTO xt_check_configuration(user_org_id,inspection_major,inspection_frequency,sort,created_time,status) SELECT ?,inspection_major,inspection_frequency,sort,created_time,status FROM xt_check_configuration where user_org_id = 0", orgid).Error
 	return
 }
 
 func ShowFiledConfig(org_id int64, isShow int, is_write int, id int64) (err error) {
-	err = readDb.Model(&models.FiledConfig{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"create_time": time.Now().Unix(), "update_time": time.Now().Unix(), "is_show": isShow, "is_write": is_write}).Error
+	err = XTWriteDB().Model(&models.FiledConfig{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"create_time": time.Now().Unix(), "update_time": time.Now().Unix(), "is_show": isShow, "is_write": is_write}).Error
 	return
 }
 
 func FindSysDialysisFiledByOrgId() (filedConfig []*models.FiledConfig, err error) {
-	err = readDb.Model(&models.FiledConfig{}).Where("org_id =? AND id in (11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,11262)", 0).Find(&filedConfig).Error
+	err = XTWriteDB().Model(&models.FiledConfig{}).Where("org_id =? AND id in (11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,11262)", 0).Find(&filedConfig).Error
 	return
 }
 
 func BatchInsertFiledSystemConfig(org_id int64) (err error) {
-	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 9442", org_id).Error
+	err = XTWriteDB().Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 9442", org_id).Error
 	return
 }
 
 func BatchInsertDoctorSchedule(orgid int64) (err error) {
 
-	err = readDb.Exec("INSERT INTO sgj_xt.xt_doctor_schedules(user_org_id,class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute) SELECT ?, class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute FROM xt_doctor_schedules WHERE user_org_id = 0", orgid).Error
+	err = XTWriteDB().Exec("INSERT INTO sgj_xt.xt_doctor_schedules(user_org_id,class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute) SELECT ?, class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute FROM xt_doctor_schedules WHERE user_org_id = 0", orgid).Error
 	return
 }
 

service/device_service.go

@@ -824,6 +824,12 @@ func GetScheduleByClassType(schedule_type int64, schedule_date int64, bed_id int
 	return schedule, err
 }
 
+func GetScheduleByClassTypeTwo(schedule_type int64, schedule_date int64, patient_id int64, user_org_id int64) (models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTReadDB().Where(" schedule_date = ? and patient_id = ? and user_org_id = ? and status = 1", schedule_date, patient_id, user_org_id).Find(&schedule).Error
+	return schedule, err
+}
+
 func GetPartionId(bed_id int64, org_id int64) (models.XtDeviceNumber, error) {
 
 	number := models.XtDeviceNumber{}

service/dialysis_service.go

@@ -1119,6 +1119,16 @@ func ModifyScheduleMode(mode_id int64, patient_id int64, recordDate int64, org_i
 	ut.Commit()
 }
 
+func ModifyScheduleModeOne(mode_id int64, patient_id int64, recordDate int64, org_id int64, dialysis_machine_name string) {
+	ut := writeDb.Begin()
+	err = writeDb.Model(&models.Schedule{}).Where("status = 1   AND user_org_id = ? AND patient_id = ? AND schedule_date >= ? mode_id= ?", org_id, patient_id, recordDate, mode_id).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "dialysis_machine_name": dialysis_machine_name}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+}
+
 func FindDialysisOrderById(id int64) (error, *models.DialysisOrder) {
 	dialysisRecord := models.DialysisOrder{}
 	err := readDb.Model(&models.DialysisOrder{}).Where("id = ? AND status = 1", id).Find(&dialysisRecord).Error
@@ -1988,7 +1998,7 @@ func GetHisMobileAdviceList(orgid int64, ids []string) (advice []*models.HisDoct
 func ExectionMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
 
 	advice := models.HisDoctorAdvice{}
-	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1, "is_mobile": 3}).Error
 	return err
 }
 
@@ -2010,7 +2020,7 @@ func FindAllDoctorAdviceByIds(orgID int64, ids []string) (advice []models.Doctor
 }
 
 func ExectionBloodMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
-	fmt.Println("ids2323232323323223233223wode", ids)
+
 	advice := models.DoctorAdviceThrity{}
 	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
 	return err
@@ -2137,3 +2147,142 @@ func UpdateDialysisInformationById(patient_id int64, record_date int64, user_org
 	err := XTWriteDB().Model(&information).Where("patient_id = ? and record_date = ? and user_org_id  =? and module = ? and status=1", patient_id, record_date, user_org_id, module).Update(map[string]interface{}{"application_date": advice_date, "remark": remark}).Error
 	return err
 }
+
+func UpdateDoctorAdviceByExcecute(id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("id = ? and user_org_id = ? and status =1", id, user_org_id).Updates(map[string]interface{}{"execution_time": 0, "execution_staff": 0, "execution_state": 2}).Error
+	return err
+}
+
+func UpdateInformationSettingById(orgid int64, week_day int64) error {
+
+	err := XTWriteDB().Model(&models.XtDialysisInformaitonSetting{}).Where("user_org_id = ? and status =1", orgid).Updates(map[string]interface{}{"week_day": week_day}).Error
+	return err
+}
+
+func CreateInformationSetting(setting models.XtDialysisInformaitonSetting) error {
+
+	err := XTWriteDB().Create(&setting).Error
+
+	return err
+}
+
+func GetInformationSettingByOrgId(user_org_id int64) (models.XtDialysisInformaitonSetting, error) {
+
+	setting := models.XtDialysisInformaitonSetting{}
+
+	err := XTReadDB().Where("user_org_id = ? and status =1", user_org_id).Find(&setting).Error
+
+	return setting, err
+}
+
+func GetDialysisInformationSetting(user_org_id int64) (infor []*models.XtDialysisInformaitonSetting, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status =1", user_org_id).Find(&infor).Error
+
+	return infor, err
+}
+
+func GetDialysisInformationIsNoCheck(user_org_id int64, limit int64, page int64, application_status int64) (infor []*models.DialysisInformation, total int64, err error) {
+
+	db := XTReadDB().Model(&infor).Where("status= 1")
+	if application_status > 0 {
+		db = db.Where("application_status = ?", application_status)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Find(&infor).Error
+	return infor, total, err
+}
+
+func CheckDialysisInformation(id int64, application_status int64, timenow int64, checker int64) (models.DialysisInformation, error) {
+
+	information := models.DialysisInformation{}
+
+	err := XTWriteDB().Model(&information).Where("id=? and status = 1", id).Updates(map[string]interface{}{"application_status": application_status, "check_time": timenow, "checker": checker}).Error
+
+	return information, err
+
+}
+
+func GetDialysisWatchByKeywordFlow(orgID int64, keyword string, schedulType int64, partitionType int64, page int64, limit int64, start int64, end int64) ([]*models.DialysisScheduleFlow, error, int64) {
+	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 {
+		return nil, getPatientErr, 0
+	}
+	patientIDs := make([]int64, len(patients))
+	for index, patient := range patients {
+		patientIDs[index] = patient.ID
+	}
+
+	db := readDb.Model(&models.DialysisScheduleFlow{})
+	if start > 0 && end > 0 {
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
+			// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("DialysisFinish", "status = 1 AND user_org_id = ? and record_date >= ? and record_date<=?", orgID, start, end).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+	} else {
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("DialysisFinish", "status = 1 AND user_org_id = ?", orgID).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+	}
+
+	db = db.Where("xt_schedule.status = 1 AND patient_id in (?)", patientIDs)
+	if schedulType > 0 {
+		db = db.Where("schedule_type = ?", schedulType)
+	}
+	if start > 0 {
+		db = db.Where("schedule_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("schedule_date<=?", end)
+	}
+	if partitionType > 0 {
+		db = db.Joins("inner join xt_device_number as d_n on d_n.id = xt_schedule.bed_id and d_n.zone_id = ?", partitionType)
+	}
+	var schedules []*models.DialysisScheduleFlow
+	total := int64(0)
+	err := db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Order("schedule_date desc").Find(&schedules).Error
+	return schedules, err, total
+}
+
+func GetDialysisWatchFlow(orgID int64, schedulDate int64, schedulType int64, partitionType int64, page int64, limit int64, start int64, end int64) (schedule []*models.DialysisScheduleFlow, err error, total int64) {
+	db := readDb.Model(&models.DialysisScheduleFlow{})
+	if start > 0 && end > 0 {
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("DialysisFinish", "status = 1 AND user_org_id = ? and record_date>=? and record_date<=?", orgID, start, end).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+		db = db.Where("xt_schedule.status = 1")
+	}
+	if schedulDate > 0 {
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("DialysisFinish", "status = 1 AND user_org_id = ? and record_date>=? and record_date<=?", orgID, schedulDate, schedulDate).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+		db = db.Where("xt_schedule.status = 1")
+		db = db.Where("schedule_date = ?", schedulDate)
+	}
+	if schedulType > 0 {
+		db = db.Where("schedule_type = ?", schedulType)
+	}
+	if start > 0 {
+		db = db.Where("schedule_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("schedule_date <= ?", end)
+	}
+	if orgID > 0 {
+		db = db.Where("user_org_id = ?", orgID)
+	}
+	if partitionType > 0 {
+		db = db.Joins("inner join xt_device_number on xt_device_number.id = xt_schedule.bed_id and xt_device_number.zone_id = ?", partitionType)
+	}
+	offset := (page - 1) * limit
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("bed_id desc").Find(&schedule).Error
+	return schedule, err, total
+}

service/dialysis_solution_service.go

@@ -139,7 +139,7 @@ func GetDialysisSetting(orgid int64) (models.XtDialysisSetting, error) {
 	return setting, err
 }
 
-func GetDialysisParameterList(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) {
+func GetDialysisParameterList(keywords string, limit int64, page int64, partition_id []string, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
 	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
@@ -148,8 +148,11 @@ func GetDialysisParameterList(keywords string, limit int64, page int64, partitio
 	if schedule_type > 0 {
 		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
 	}
-	if partition_id > 0 {
-		db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	//if partition_id > 0 {
+	//	db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	//}
+	if len(partition_id) > 0 {
+		db = db.Where("xt_schedule.partition_id in(?)", partition_id)
 	}
 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)

service/gdyb_service.go

@@ -421,7 +421,7 @@ type Result struct {
 	OrderId        int64   `json:"order_id" form:"order_id"`
 }
 
-//  门诊费用明细信息上传
+// 门诊费用明细信息上传
 func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -572,7 +572,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	//return &result
 }
 
-//  门诊费用明细信息撤销
+// 门诊费用明细信息撤销
 func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -633,7 +633,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	return str
 }
 
-//  门诊预结算
+// 门诊预结算
 func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -699,7 +699,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	return str
 }
 
-//  门诊结算
+// 门诊结算
 func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -765,7 +765,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	return str
 }
 
-//  门诊结算撤销
+// 门诊结算撤销
 func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -823,7 +823,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	return str
 }
 
-//  医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+// 医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams) string {
 	fmt.Println("11222333-----")
 
@@ -896,8 +896,8 @@ type Params struct {
 	FixmedinsCode string `json:"fixmedins_code"` //调用环境生产为1 沙盒2
 }
 
-//文件上传
-//文件上传
+// 文件上传
+// 文件上传
 func Gdyb9101(baseParams models.BaseParams, file_name string, file_byte []byte) string {
 
 	// 生成签名

service/his_config_service.go

@@ -54,7 +54,7 @@ func DelelteHisPrescriptionInfoTemplate(id int64, user_org_id int64) (err error)
 
 func DelelteHisPrescriptionTemplate(id int64, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND p_template_id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
 }
 
@@ -69,7 +69,7 @@ func DelelteHisPrescriptionProjectTemplate(id int64, user_org_id int64) (err err
 	return
 }
 
-//封装保存接口
+// 封装保存接口
 func FenCreatePrescriptionTemplate(id, mode_id, types, patient_id int64, name string, adminInfo *AdminUserInfo, dataBody map[string]interface{}) (err error) {
 	tmp_bool_id := IsDialysisMode(adminInfo.CurrentOrgId, patient_id, mode_id)
 
@@ -203,7 +203,7 @@ func FenCreatePrescriptionTemplate(id, mode_id, types, patient_id int64, name st
 	return
 }
 
-//复制一个setProjectTemplateWithJSON接口
+// 复制一个setProjectTemplateWithJSON接口
 func FensetProjectTemplateWithJSON(project *models.HisPrescriptionProjectTemplate, json map[string]interface{}) int {
 	if json["id"] != nil {
 		id := json["id"].(string)
@@ -321,7 +321,7 @@ func FensetProjectTemplateWithJSON(project *models.HisPrescriptionProjectTemplat
 	return 0
 }
 
-//复制一个setAdviceTemplateWithJSON接口
+// 复制一个setAdviceTemplateWithJSON接口
 func FensetAdviceTemplateWithJSON(advice *models.HisPrescriptionAdviceTemplate, json map[string]interface{}) int {
 	//if json["advice_id"] != nil || reflect.TypeOf(json["advice_id"]).String() == "float64" {
 	//	advice_id := int64(json["advice_id"].(float64))
@@ -448,7 +448,7 @@ func FensetAdviceTemplateWithJSON(advice *models.HisPrescriptionAdviceTemplate,
 	return 0
 }
 
-//判断该患者是否有该透析模式
+// 判断该患者是否有该透析模式
 func IsDialysisMode(orgid, patient_id, mode int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? and patient_id = ? and status = 1 and mode = ?", orgid, patient_id, mode).Count(&total)
@@ -459,7 +459,7 @@ func IsDialysisMode(orgid, patient_id, mode int64) bool {
 	}
 }
 
-//获取该透析模式的患者列表
+// 获取该透析模式的患者列表
 func GetDialysisModePatient(orgid, model int64) (list []*models.DialysisPatient, err error) {
 	var tmp []*models.DialysisPatient
 	err = XTReadDB().Raw("select id,name from xt_patients,(SELECT patient_id FROM his_prescription_template WHERE user_org_id = ? and "+
@@ -470,7 +470,7 @@ func GetDialysisModePatient(orgid, model int64) (list []*models.DialysisPatient,
 	return tmp, err
 }
 
-//如果没有名字默认透析模式
+// 如果没有名字默认透析模式
 func DialysisModeName(mode int64) string {
 	tmp := make(map[int64]string)
 	tmp[1] = "HD"
@@ -511,14 +511,14 @@ func DialysisModeName(mode int64) string {
 	return ""
 }
 
-//查询出该模板的id
+// 查询出该模板的id
 func IdOfTheTemplate(orgid, patient_id, mode_id int64) (src_template models.HisPrescriptionTemplate, err error) {
 	err = XTReadDB().Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? and "+
 		"patient_id = ? and status = 1 and mode = ?", orgid, patient_id, mode_id).Find(&src_template).Error
 	return src_template, err
 }
 
-//根据透析模式、患者姓名、药品项目获取处方内容
+// 根据透析模式、患者姓名、药品项目获取处方内容
 func GetPrescriptionContent(mode, orgid, patient_id int64) (list []*models.HisPrescriptionInfoTemplate, err error) {
 	var tmp models.HisPrescriptionTemplate
 	err = XTReadDB().Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? and patient_id = ? and mode = ? and status = 1", orgid, patient_id, mode).Find(&tmp).Error
@@ -531,7 +531,7 @@ func GetPrescriptionContent(mode, orgid, patient_id int64) (list []*models.HisPr
 
 }
 
-//获取该透析模式患者列表（批量删除时用）药品
+// 获取该透析模式患者列表（批量删除时用）药品
 func GetDialysisDrugDelect(orgid, model, drug_id int64) (list []*models.DialysisPatient, err error) {
 	var tmp []*models.DialysisPatient
 	err = XTReadDB().Raw("select id,name from xt_patients,("+
@@ -546,7 +546,7 @@ func GetDialysisDrugDelect(orgid, model, drug_id int64) (list []*models.Dialysis
 	return tmp, err
 }
 
-//获取该透析模式患者列表（批量删除时用）项目
+// 获取该透析模式患者列表（批量删除时用）项目
 func GetDialysisProjectDelect2(orgid, model, drug_id int64) (list []*models.DialysisPatient, err error) {
 	var tmp []*models.DialysisPatient
 	err = XTReadDB().Raw("select id,name from xt_patients,("+
@@ -561,7 +561,7 @@ func GetDialysisProjectDelect2(orgid, model, drug_id int64) (list []*models.Dial
 	return tmp, err
 }
 
-//获取该透析模式患者列表（批量删除时用）耗材
+// 获取该透析模式患者列表（批量删除时用）耗材
 func GetDialysisProjectDelect3(orgid, model, drug_id int64) (list []*models.DialysisPatient, err error) {
 	var tmp []*models.DialysisPatient
 	err = XTReadDB().Raw("select id,name from xt_patients,("+
@@ -576,7 +576,7 @@ func GetDialysisProjectDelect3(orgid, model, drug_id int64) (list []*models.Dial
 	return tmp, err
 }
 
-//根据透析模式删除药品
+// 根据透析模式删除药品
 func ModeDeleteDrug(orgid, model, drug_id int64, patient_id []int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -613,7 +613,7 @@ func ModeDeleteDrug(orgid, model, drug_id int64, patient_id []int64) (err error)
 	return
 }
 
-//根据透析模式删除项目和耗材
+// 根据透析模式删除项目和耗材
 func ModeDelectItemsAndConsumables(orgid, model int64, drug_id string, patient_id []int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -668,7 +668,7 @@ func ModeDelectItemsAndConsumables(orgid, model int64, drug_id string, patient_i
 	return
 }
 
-//替换该透析模式药品
+// 替换该透析模式药品
 func ReplaceDrug(orgid, model, drug_id int64, patient_id []int64, advice models.HisPrescriptionAdviceTemplate) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -714,7 +714,7 @@ func ReplaceDrug(orgid, model, drug_id int64, patient_id []int64, advice models.
 	return
 }
 
-//替换该透析模式耗材
+// 替换该透析模式耗材
 func ReplaceItemsAndConsumables(orgid, model int64, drug_id string, patient_id []int64, project models.HisPrescriptionProjectTemplate) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -778,7 +778,7 @@ func ReplaceItemsAndConsumables(orgid, model int64, drug_id string, patient_id [
 	return
 }
 
-//跟据id查询药品、项目、耗材、套餐
+// 跟据id查询药品、项目、耗材、套餐
 func QueryFourTables(id string, orgid int64) (tmp interface{}, err error) {
 	if id[0] == 112 {
 		after := id[1:]
@@ -857,7 +857,7 @@ func QueryFourTables(id string, orgid int64) (tmp interface{}, err error) {
 	}
 }
 
-//获取机构项目中所用的组
+// 获取机构项目中所用的组
 func GetDataConfig(orgid int64) (dataconfig []*models.DictDataconfig, err error) {
 	err = XTReadDB().Raw("select * from xt_drug_data_config where parent_id in "+
 		"(select id from xt_drug_data_config where name = \"统计分类\" and parent_id = 0) "+
@@ -865,7 +865,7 @@ func GetDataConfig(orgid int64) (dataconfig []*models.DictDataconfig, err error)
 	return
 }
 
-//翻译项目中的组
+// 翻译项目中的组
 func TranslateZu(sc, orgid int64, types string) (s string, err error) {
 	var dataconfig []*models.DictDataconfig
 	tmp := "select * from xt_drug_data_config where parent_id in (select id from xt_d·rug_data_config where name = \"" + types + "\" and parent_id = 0) and value = " + config.ToString(sc) + " and status = 1 and (org_id = " + config.ToString(orgid) + " or org_id = 0)"

service/his_deposit_service.go

@@ -12,9 +12,9 @@ import (
 	"time"
 )
 
-//生成编号?+yymmdd+随机数（4位）
-//新增参数为CP
-//退款参数为AF
+// 生成编号?+yymmdd+随机数（4位）
+// 新增参数为CP
+// 退款参数为AF
 func CreateCPCode(str string) string {
 	s := fmt.Sprintf("%04v", rand.New(rand.NewSource(time.Now().UnixNano())).Int63n(10000))
 	t := time.Now().Format("20060102")
@@ -22,25 +22,25 @@ func CreateCPCode(str string) string {
 	return code
 }
 
-//获取his中的有效患者
+// 获取his中的有效患者
 func GetHisUser(orgid int64) (hisname []models.GetHisName, err error) {
 	err = XTReadDB().Model(&models.GetHisName{}).Where("status = 1 and user_org_id = ?", orgid).Find(&hisname).Error
 	return
 }
 
-//获取his中的有效患者去除了转出和死亡的
+// 获取his中的有效患者去除了转出和死亡的
 func GetHisUserToAlive(orgid int64) (hisname []models.GetHisName, err error) {
 	err = XTReadDB().Model(&models.GetHisName{}).Where("status = 1 and user_org_id = ? and lapseto = 1", orgid).Find(&hisname).Error
 	return
 }
 
-//获取his中的有效患者
+// 获取his中的有效患者
 func GetHisUserName(orgid, id int64) (hisname models.GetHisName, err error) {
 	err = XTReadDB().Model(&models.GetHisName{}).Where("status = 1 and user_org_id = ? and id = ?", orgid, id).Find(&hisname).Error
 	return
 }
 
-//添加押金(开始)调用接口前记得判断审核状态，确认通过审核后在调用
+// 添加押金(开始)调用接口前记得判断审核状态，确认通过审核后在调用
 func UpDeposit(code, remarks string, his_patient_id, orgid, trial_status, createid int64, deposit decimal.Decimal) (err error) {
 	//查押金表是否存在记录
 	tmp, tmpdeposit := IsHisPatientId(his_patient_id, orgid)
@@ -96,13 +96,13 @@ func UpDeposit(code, remarks string, his_patient_id, orgid, trial_status, create
 	return
 }
 
-//添加押金记录
+// 添加押金记录
 func AddDepositHistory(dh models.DepositHistory) error {
 	err := XTWriteDB().Create(&dh).Error
 	return err
 }
 
-//押金中添加一条记录,并返回该数据的id和押金余额（当没有该用户记录时调用）
+// 押金中添加一条记录,并返回该数据的id和押金余额（当没有该用户记录时调用）
 func AddDeposit(de models.Deposit) (int64, decimal.Decimal, error) {
 	var tmp models.Deposit
 	err := XTWriteDB().Create(&de).Find(&tmp).Error
@@ -112,7 +112,7 @@ func AddDeposit(de models.Deposit) (int64, decimal.Decimal, error) {
 	return tmp.ID, tmp.Deposit, err
 }
 
-//更改押金记录
+// 更改押金记录
 func UpdateDeposit(de models.Deposit) (err error) {
 	err = XTWriteDB().Model(&models.Deposit{}).Where("id = ? and status = 1", de.ID).Updates(map[string]interface{}{
 		"mtime":   de.Mtime,
@@ -121,7 +121,7 @@ func UpdateDeposit(de models.Deposit) (err error) {
 	return
 }
 
-//判断押金表是否存在当前的患者的一条有效数据,如果有返回id和押金余额,没有返回0
+// 判断押金表是否存在当前的患者的一条有效数据,如果有返回id和押金余额,没有返回0
 func IsHisPatientId(his_patient_id, orgid int64) (int64, decimal.Decimal) {
 	var tmp []models.Deposit
 	XTReadDB().Model(&models.Deposit{}).Where("user_org_id = ? and his_patient_id = ? and status = 1", orgid, his_patient_id).Find(&tmp)
@@ -131,7 +131,7 @@ func IsHisPatientId(his_patient_id, orgid int64) (int64, decimal.Decimal) {
 	return tmp[0].ID, tmp[0].Deposit
 }
 
-//查询押金编号是否重复
+// 查询押金编号是否重复
 func FindDecimalCode(orgid int64, code string) bool {
 	var total int
 	XTReadDB().Model(&models.DepositHistory{}).Where("user_org_id = ? and deposit_code = ? and status = 1", orgid, code).Count(&total)
@@ -142,7 +142,7 @@ func FindDecimalCode(orgid int64, code string) bool {
 	}
 }
 
-//充值明细列表
+// 充值明细列表
 func DetailsList(orgid, stime, etime int64, keyword string, slicekey []int64) (deposithistory []models.DepositHistoryname, err error) {
 	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and user_org_id = ? and deposit_status = 1 ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
 	if len(keyword) > 0 {
@@ -159,7 +159,7 @@ func DetailsList(orgid, stime, etime int64, keyword string, slicekey []int64) (d
 	return
 }
 
-//充值汇总列表
+// 充值汇总列表
 func SummaryList(orgid, stime, etime int64, keyword string, slicekey []int64) (deposithistory []models.DepositHistory, err error) {
 	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and trial_status = 1 and user_org_id = ? and deposit_status = 1 ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
 	if len(slicekey) > 0 {
@@ -180,7 +180,7 @@ func SummaryList(orgid, stime, etime int64, keyword string, slicekey []int64) (d
 	return
 }
 
-//获取本周周一和周日的起止时间戳
+// 获取本周周一和周日的起止时间戳
 func GetMondayOfWeek() (int64, int64) {
 	t := time.Now()
 	dayObj := GetZeroTime(t)
@@ -200,7 +200,7 @@ func GetMondayOfWeek() (int64, int64) {
 	return stime.Unix(), stime.Unix() + 604799
 }
 
-//获取本月的起止时间戳
+// 获取本月的起止时间戳
 func GetMonth() (int64, int64) {
 	timeNow := time.Now()
 	timeToday := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location()) // 获取当天0点时间 time类型
@@ -209,7 +209,7 @@ func GetMonth() (int64, int64) {
 	return timeMonthStartUnix1, timeMonthEndUnix1
 }
 
-//获取当天起止时间戳
+// 获取当天起止时间戳
 func GetNowTime() (int64, int64) {
 	t := time.Now()
 	addTime := time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
@@ -217,9 +217,9 @@ func GetNowTime() (int64, int64) {
 	return timesamp, timesamp + 86399
 }
 
-//获取创建者的姓名
-//原先的(sgj_users.sgj_user_admin)
-//新加的(sgj_users.sgj_user_admin_role)
+// 获取创建者的姓名
+// 原先的(sgj_users.sgj_user_admin)
+// 新加的(sgj_users.sgj_user_admin_role)
 func GetCreateidName(id, orgid int64) string {
 	//var tmp models.CreateUser
 	//XTReadDB().Select("name").Where("id = ?", id).Find(&tmp)
@@ -230,7 +230,7 @@ func GetCreateidName(id, orgid int64) string {
 	return tmp.UserName
 }
 
-//审核通过
+// 审核通过
 func UpDecimalHistory(id int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -272,7 +272,7 @@ func UpDecimalHistory(id int64) (err error) {
 	return
 }
 
-//删除本次记录
+// 删除本次记录
 func DelDecimalHistory(id int64) (err error) {
 	err = XTWriteDB().Model(models.DepositHistory{}).Where("id = ?", id).Updates(map[string]interface{}{
 		"status": 0,
@@ -281,13 +281,13 @@ func DelDecimalHistory(id int64) (err error) {
 	return
 }
 
-//根据id获取一条押金历史记录
+// 根据id获取一条押金历史记录
 func GetDecimalHistoryOne(id int64) (history models.DepositHistory, err error) {
 	err = XTReadDB().Model(&models.DepositHistory{}).Where("id = ?", id).Find(&history).Error
 	return
 }
 
-//根据患者id获取该患者当前剩余的押金
+// 根据患者id获取该患者当前剩余的押金
 func GetUserMoney(id, orgid int64) decimal.Decimal {
 	tmp := models.Deposit{}
 	err := XTReadDB().Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&tmp).Error
@@ -297,14 +297,14 @@ func GetUserMoney(id, orgid int64) decimal.Decimal {
 	return tmp.Deposit
 }
 
-//查询时间段内患者的余额
+// 查询时间段内患者的余额
 func GetMoneyforTime(id, orgid, etime int64) decimal.Decimal {
 	tmp := models.DepositHistory{}
 	XTReadDB().Model(&models.DepositHistory{}).Where("his_patient_id = ? and user_org_id = ? and status = 1 and mtime <= ?", id, orgid, etime).Order("mtime").Find(&tmp)
 	return tmp.SurplusDeposit
 }
 
-//押金流水
+// 押金流水
 func GetFlowList(page, limit, id, orgid, stime, etime, deposit_status int64) (deposit []models.DepositHistory, total int64, err error) {
 	s := "status = 1 and trial_status = 1 and user_org_id = ? and his_patient_id = ? and mtime >= ? and mtime <= ?"
 	offset := (page - 1) * limit
@@ -315,7 +315,7 @@ func GetFlowList(page, limit, id, orgid, stime, etime, deposit_status int64) (de
 	return
 }
 
-//获取患者押金列表
+// 获取患者押金列表
 func GetUserList(page, limit, orgid int64, keyword string, slicekey []int64) (m []models.Deposit1, total int64, err error) {
 	db := XTReadDB().Model(&models.Deposit{}).Where("status = 1 and user_org_id = ? ", orgid)
 	offset := (page - 1) * limit
@@ -326,7 +326,7 @@ func GetUserList(page, limit, orgid int64, keyword string, slicekey []int64) (m
 	return
 }
 
-//扣费明细列表
+// 扣费明细列表
 func DeductionList(orgid, stime, etime int64, keyword string, slicekey []int64) (deposithistory []models.DepositHistory, err error) {
 	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and user_org_id = ? and deposit_status = 2 ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
 	if len(keyword) > 0 {
@@ -343,7 +343,7 @@ func DeductionList(orgid, stime, etime int64, keyword string, slicekey []int64)
 	return
 }
 
-//获取医疗费总额
+// 获取医疗费总额
 func MedicalTotal(orgid, id int64) decimal.Decimal {
 	tmp := models.HisChargeSettleOrder{}
 	//and status = 1 and order_status = 2
@@ -351,7 +351,7 @@ func MedicalTotal(orgid, id int64) decimal.Decimal {
 	return decimal.NewFromFloat(tmp.MedfeeSumamt)
 }
 
-//根据就诊号查询出医收费类型
+// 根据就诊号查询出医收费类型
 func CodeToChargetype(orgid int64, code string) (s string) {
 	tmp := models.HisPrintPatient{}
 	tmp_hhcr := models.HisHospitalCheckRecordTwo{}
@@ -385,12 +385,12 @@ func CodeToChargetype(orgid int64, code string) (s string) {
 	return
 }
 
-//扣除患者的押金,并生成一条扣费历史记录
-//orgid 机构id;
-//his_user_id	患者id;
-//create_id		创建者id;
-//code		就诊号;
-//deposit	本次使用的押金金额，支持float64、int、int64、decimal.Decimal类型
+// 扣除患者的押金,并生成一条扣费历史记录
+// orgid 机构id;
+// his_user_id	患者id;
+// create_id		创建者id;
+// code		就诊号;
+// deposit	本次使用的押金金额，支持float64、int、int64、decimal.Decimal类型
 func SpendDeposit(orgid, his_user_id, create_id int64, code string, deposit interface{}) (err error) {
 	tmp_deposit := decimal.Decimal{} //本次患者使用的押金
 	tmp_deposit, err = ToDecimal(deposit)
@@ -445,7 +445,7 @@ func SpendDeposit(orgid, his_user_id, create_id int64, code string, deposit inte
 	return
 }
 
-//新增一条退款申请
+// 新增一条退款申请
 func RefundApplication(orgid, his_patient_id, trial_status, createid int64, code string, deposit decimal.Decimal) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -502,7 +502,7 @@ func RefundApplication(orgid, his_patient_id, trial_status, createid int64, code
 	return
 }
 
-//退款审核通过/拒绝批量处理
+// 退款审核通过/拒绝批量处理
 func RefundReviewMore(orgid, trial_status int64, ids string) (err error) {
 	//处理下字符串
 	t_ids := ""
@@ -537,7 +537,7 @@ func RefundReviewMore(orgid, trial_status int64, ids string) (err error) {
 	return err
 }
 
-//退款审核通过/拒绝
+// 退款审核通过/拒绝
 func RefundReview(orgid, id, trial_status int64, tx *gorm.DB) (err error) {
 	//根据id查询该条历史记录
 	history := models.DepositHistory{}
@@ -593,7 +593,7 @@ func RefundReview(orgid, id, trial_status int64, tx *gorm.DB) (err error) {
 	return err
 }
 
-//退款删除
+// 退款删除
 func DeleteRefund(orgid, id int64) (err error) {
 	//根据id查询历史记录
 	history := models.DepositHistory{}
@@ -615,7 +615,7 @@ func DeleteRefund(orgid, id int64) (err error) {
 	return
 }
 
-//更改退款申请
+// 更改退款申请
 func ChangeRefund(orgid, his_patient_id, trial_status, id int64, code string, deposit decimal.Decimal) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
@@ -671,7 +671,7 @@ func ChangeRefund(orgid, his_patient_id, trial_status, id int64, code string, de
 	return
 }
 
-//退款分页
+// 退款分页
 func RefundList(page, limit, orgid, stime, etime, refundtype, examinetype int64, keyword string, slicekey []int64) (depo []models.RefundList, total int64, err error) {
 	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and user_org_id = ? ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
 	offset := (page - 1) * limit
@@ -710,11 +710,11 @@ func RefundList(page, limit, orgid, stime, etime, refundtype, examinetype int64,
 
 }
 
-//退回患者的押金，并生成一条退费历史记录
-//orgid 机构id
-//his_user_id 患者id
-//code 编号
-//deposit 本次退费的金额，支持float64、int、int64、decimal.Decimal类型
+// 退回患者的押金，并生成一条退费历史记录
+// orgid 机构id
+// his_user_id 患者id
+// code 编号
+// deposit 本次退费的金额，支持float64、int、int64、decimal.Decimal类型
 func MoneyIncrease(orgid, his_user_id int64, code string, deposit interface{}) (err error) {
 	tmp_deposit := decimal.Decimal{}
 	tmp_deposit, err = ToDecimal(deposit)
@@ -768,21 +768,21 @@ func GetorgName(orgid int64) (name string) {
 	return tmp.OrgName
 }
 
-//根据id查询就诊号
+// 根据id查询就诊号
 func FindcodeToid(id int64) (code string) {
 	tmp := models.GetMdtrtId{}
 	XTReadDB().Model(&models.GetMdtrtId{}).Where("id = ?", id).Find(&tmp)
 	return tmp.MdtrtId
 }
 
-//根据id查询就诊号
+// 根据id查询就诊号
 func FindnumberToid(id int64) (number string) {
 	tmp := models.GetMdtrtId{}
 	XTReadDB().Model(&models.GetMdtrtId{}).Where("id = ?", id).Find(&tmp)
 	return tmp.Number
 }
 
-//扣费明细列表，查看详情按钮是否显示，0隐藏，1显示
+// 扣费明细列表，查看详情按钮是否显示，0隐藏，1显示
 func IsButtonShow(code string, orgid, his_patient_id int64) (tmp int64) {
 	var total int
 	XTReadDB().Model(&models.RefundList{}).Where(" user_org_id = ? and his_patient_id = ? and deposit_code = ? and deposit_status = 4 and status = 1", orgid, his_patient_id, code).Count(&total)
@@ -798,7 +798,7 @@ func IsButtonShow(code string, orgid, his_patient_id int64) (tmp int64) {
 	}
 }
 
-//把其他的类型转换成decimal.Decimal类型
+// 把其他的类型转换成decimal.Decimal类型
 func ToDecimal(i interface{}) (d decimal.Decimal, err error) {
 	switch i.(type) {
 	case float64:
@@ -909,8 +909,8 @@ func TypeConversion02(tmp string) (s string) {
 	return s
 }
 
-//获取本段时间内患者退款的总额
-//orgid：机构id，stime：开始时间，etime：结束时间，patient_id：患者id
+// 获取本段时间内患者退款的总额
+// orgid：机构id，stime：开始时间，etime：结束时间，patient_id：患者id
 func RefundListSum(orgid, stime, etime, patient_id int64) (sum decimal.Decimal, err error) {
 	var depo []models.RefundList
 	err = XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and user_org_id = ? and trial_status = 1 and ctime >= ? and ctime <= ? and deposit_status = 3 and his_patient_id = ? ", orgid, stime, etime, patient_id).Find(&depo).Error

service/his_hospital_service.go

@@ -172,7 +172,6 @@ func GetChargeHisHospitalPrescriptionFive(org_id int64, patient_id int64, his_pa
 	return
 }
 
-//
 type VMHospitalPatient 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"`

service/his_project_service.go

@@ -93,11 +93,15 @@ func CreatedProjectTeam(team *models.XtHisProjectTeam) error {
 func GetProjectTeamList(limit int64, page int64, orgid int64, keyword string) (projectTeam []*models.XtHisProjectTeam, total int64, err error) {
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
-	db := XTReadDB().Model(&projectTeam)
+	db := XTReadDB().Model(&projectTeam).Where("status=1")
 	if len(keyword) > 0 {
 		db = db.Where("project_team like ?", likeKey)
 	}
-	err = db.Where("user_org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Order("created_time desc").Find(&projectTeam).Error
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("sort asc").Find(&projectTeam).Error
 	return projectTeam, total, err
 }
 
@@ -110,7 +114,7 @@ func GetProjectTeamDetail(id int64) (models.XtHisProjectTeam, error) {
 
 func UpdatedProjectTeam(id int64, team *models.XtHisProjectTeam) error {
 
-	err := XTWriteDB().Model(&team).Where("id=? and status = 1", id).Updates(map[string]interface{}{"project_team": team.ProjectTeam, "price": team.Price, "pinyin": team.Pinyin, "wubi": team.Wubi, "tube_color": team.TubeColor, "team_type": team.TeamType, "remark": team.Remark, "project_id": team.ProjectId, "item_id": team.ItemId}).Error
+	err := XTWriteDB().Model(&team).Where("id=? and status = 1", id).Updates(map[string]interface{}{"project_team": team.ProjectTeam, "price": team.Price, "pinyin": team.Pinyin, "wubi": team.Wubi, "tube_color": team.TubeColor, "team_type": team.TeamType, "remark": team.Remark, "project_id": team.ProjectId, "item_id": team.ItemId, "sort": team.Sort}).Error
 	return err
 }
 

service/inspection_service.go

@@ -7,14 +7,28 @@ import (
 	"time"
 )
 
-func GetInspectionReference(orgId int64) (reference []*models.InspectionReference, err error) {
-	var count int
-	err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Count(&count).Error
-	if count > 0 {
-		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Order("project_id").Find(&reference).Error
+func GetInspectionReference(orgId int64, inspect_type int64) (reference []*models.InspectionReference, err error) {
+	if inspect_type == 0 {
+		var count int
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Count(&count).Error
+		if count > 0 {
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Order("project_id").Find(&reference).Error
+		} else {
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = 0").Order("project_id").Find(&reference).Error
+		}
+
 	} else {
-		err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1").Order("project_id").Find(&reference).Error
+
+		var count int
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = ?", orgId, inspect_type).Count(&count).Error
+		if count > 0 {
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = ?", orgId, inspect_type).Order("project_id").Find(&reference).Error
+		} else {
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = ?", inspect_type).Order("project_id").Find(&reference).Error
+		}
+
 	}
+
 	return
 }
 
@@ -82,6 +96,15 @@ func CreatePatientInspection(inspectins []models.Inspection) (err error) {
 	return
 }
 
+func SavePatientInspection(inspectin models.Inspection) (err error) {
+	err = writeDb.Save(&inspectin).Error
+	return
+}
+func DeleteInspectionTwo(id int64) {
+	err = writeDb.Model(&models.Inspection{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+	return
+}
+
 func EditPatientInspection(add []models.Inspection, edit []models.Inspection, noDeleteIDs []int64, patientId, orgId, projectId, date int64) (err error) {
 	if len(add) == 0 && len(edit) == 0 && len(noDeleteIDs) == 0 {
 		err = errors.New(" Cant be nil.")
@@ -236,3 +259,8 @@ func GetInspectionReferenceByOrgId(orgid int64) (insepciton []*models.XtInspecti
 	err = readDb.Model(&insepciton).Where("org_id = ? and status = 1 and project_name = '传染病检查'", orgid).Find(&insepciton).Error
 	return insepciton, err
 }
+
+func GetInspectionReferenceTwo(project_id int64) (reference []*models.InspectionReference, err error) {
+	err = readDb.Model(&models.InspectionReference{}).Where("project_id = ? and status = 1", project_id).Order("project_id").Find(&reference).Error
+	return
+}

service/integration_service.go

@@ -12,7 +12,7 @@ func UpdateSysItemIdByID(sysInspection *models.InspectionReference) error {
 	return err
 }
 
-func GetSysInspectionList(orgID int64) (sysInspection []*models.InspectionReference,ownerInspection []*models.InspectionReference, err error) {
+func GetSysInspectionList(orgID int64) (sysInspection []*models.InspectionReference, ownerInspection []*models.InspectionReference, err error) {
 	db := XTReadDB()
 	err = db.Model(&models.InspectionReference{}).Where("org_id= 0 and status=1").Find(&sysInspection).Error
 	err = db.Model(&models.InspectionReference{}).Where("org_id= ? and status=1", orgID).Find(&ownerInspection).Error
@@ -29,7 +29,7 @@ func GetSyncList(orgID int64, page, limit int64) (patients []*models.MiddleSyncI
 
 func SaveInterface(interfaceinfo *models.MiddleInterface) error {
 	db := MiddleWriteDB()
-	if (interfaceinfo.ID > 0 ) {
+	if interfaceinfo.ID > 0 {
 		err := db.Save(&interfaceinfo).Error
 		return err
 	} else {
@@ -38,7 +38,7 @@ func SaveInterface(interfaceinfo *models.MiddleInterface) error {
 	}
 }
 
-func GetInterface(orgID int64) (interfaceinfo models.MiddleInterface, err error){
+func GetInterface(orgID int64) (interfaceinfo models.MiddleInterface, err error) {
 	db := MiddleReadDB()
 	err = db.Model(&models.MiddleInterface{}).Where("org_id=? and status=1", orgID).First(&interfaceinfo).Error
 	return

service/login_service.go

@@ -3,9 +3,9 @@ package service
 import (
 	"XT_New/models"
 	"XT_New/utils"
-	"strconv"
-	"github.com/jinzhu/gorm"
 	"encoding/json"
+	"github.com/jinzhu/gorm"
+	"strconv"
 	"time"
 )
 
@@ -206,7 +206,6 @@ func GetOrgServeSubscibe(orgID int64) (*models.ServeSubscibe, error) {
 	return &model, nil
 }
 
-//
 func GetAppRoleById(id int64) (*models.App_Role, error) {
 	var model models.App_Role
 	err := readUserDb.Model(&models.App_Role{}).Where("id = ? AND status = 1", id).First(&model).Error

service/manage_center_service.go

@@ -406,7 +406,7 @@ func FindAllDiagnoseList(orgId int64, page int64, limit int64) (list []*models.H
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisXtDiagnoseConfig{})
 	db = db.Where("user_org_id = ? AND status = 1", orgId)
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("sort asc").Find(&list).Error
 	return
 }
 

service/manage_service.go

@@ -1046,7 +1046,7 @@ func GetTimeData(equitid int64, orgid int64, timenow int64) (information []*mode
 	//db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
 	//err = db.Raw("select id,date,class,zone,bed_number,patient_id,contagion,dialysis_mode,start_time,end_time,dialysis_hour,hyperfiltratio,weight_loss,warning_value,user_total,move,failure_stage,fault_description,code_information,disinfect_type,disinfectant_type,disinfection,machine_run,fluid_path,disinfectant,disinfection_status,disinfection_residue,long_time,disinfec_startime,disinfec_endtime,dialysis_checked,dialysis_name,norms,dialysis_concentration,germ_checked,germ_name,germ_number,clean,sign_name,status,ctime,mtime,user_org_id,equiment_id,bed,stime from xt_device_information where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= ? and equiment_id = ? and user_org_id = ?",timenow,equitid, orgid).Error
 	day := time.Now().Day()
-	oldMonth := day - 90
+	oldMonth := day - 30
 	t := time.Date(time.Now().Year(), time.Now().Month(), oldMonth, time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
 
 	err = UserReadDB().Model(&information).Where("date>= ? and date <= ? and equiment_id = ? and user_org_id = ? and dialysis_checked = 1 ", t.Unix(), timenow, equitid, orgid).Find(&information).Error
@@ -1729,3 +1729,15 @@ func DeleteObjectTableDisinfect(id int64) error {
 	err := XTWriteDB().Model(&models.XtNewObjectDisinfect{}).Where("id=? and status= 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetAirDisInfectionLongTime(user_org_id int64) (list []*models.XtNewAriDisinfect, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Order("id desc").First(&list).Error
+	return
+}
+
+func GetObjectDisInfectionLongTime(user_org_id int64) (list []*models.XtNewObjectDisinfect, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&list).Error
+	return
+}

service/management_service/management_analyse_service.go

@@ -7,7 +7,7 @@ type ChartDataStruct struct {
 	Value int64  `json:"value"`
 }
 
-//患者统计
+// 患者统计
 func GetPatientChartData(user_org_id int64, start_time int64, end_time int64, statistics_type int) (datas []*ChartDataStruct, total int64, err error) {
 	db := service.XTReadDB()
 	switch statistics_type {

service/mobile_dialysis_service.go

@@ -7239,7 +7239,7 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 
 func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPatientDryweight, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Order("id asc").Limit(6).Find(&weight).Error
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Order("id desc").Limit(6).Find(&weight).Error
 
 	return weight, err
 }

service/patient_dataconfig_service.go

@@ -29,11 +29,61 @@ func GetPatientCourseOfDisease(orgID int64, patientID int64, startTime int64, en
 	return records, nil
 }
 
+func GetPatientSickHistory(orgID int64, patientID int64, startTime int64, endTime int64) ([]*models.XtPatientSickHistory, error) {
+	var records []*models.XtPatientSickHistory
+	err := readDb.Model(&models.XtPatientSickHistory{}).Where("org_id = ? and patient_id = ? and record_time >= ? and record_time <= ? and status = 1", orgID, patientID, startTime, endTime).Order("record_time desc").Find(&records).Error
+	if err != nil {
+		return nil, err
+	}
+	return records, nil
+}
+
+func GetPatientSickHistoryByIds(orgID int64, patientID int64, ids []string) ([]*models.XtPatientSickHistory, error) {
+	var records []*models.XtPatientSickHistory
+	err := readDb.Model(&models.XtPatientSickHistory{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, ids).Order("record_time desc").Find(&records).Error
+	if err != nil {
+		return nil, err
+	}
+	return records, nil
+}
+
+func GetPatienttPhysiqueByIds(orgID int64, patientID int64, ids []string) ([]*models.XtPatientPhysiqueCheck, error) {
+	var records []*models.XtPatientPhysiqueCheck
+	err := readDb.Model(&models.XtPatientPhysiqueCheck{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, ids).Order("record_time desc").Find(&records).Error
+	if err != nil {
+		return nil, err
+	}
+	return records, nil
+}
+
+func GetPatientPhysiqueCheck(orgID int64, patientID int64, startTime int64, endTime int64) ([]*models.XtPatientPhysiqueCheck, error) {
+	var records []*models.XtPatientPhysiqueCheck
+	err := readDb.Model(&models.XtPatientPhysiqueCheck{}).Where("org_id = ? and patient_id = ? and record_time >= ? and record_time <= ? and status = 1", orgID, patientID, startTime, endTime).Order("record_time desc").Find(&records).Error
+	if err != nil {
+		return nil, err
+	}
+	return records, nil
+}
+
+func GetLastPatientPhysiqueCheck(orgID int64, patientID int64, record_date int64) (records models.XtPatientPhysiqueCheck, err error) {
+	err = readDb.Model(&models.XtPatientPhysiqueCheck{}).Where("org_id = ? and patient_id = ? and record_date = ? and status = 1", orgID, patientID, record_date).Order("record_time desc").Last(&records).Error
+	return records, err
+}
+
 func CreatePatientCourseOfDisease(record *models.PatientDiseaseCourse) error {
 	err := writeDb.Model(&models.PatientDiseaseCourse{}).Create(record).Error
 	return err
 }
 
+func CreatePatientSickHistory(record *models.XtPatientSickHistory) error {
+	err := writeDb.Model(&models.XtPatientSickHistory{}).Create(record).Error
+	return err
+}
+
+func CreatePatientPhysiqueCheck(record *models.XtPatientPhysiqueCheck) error {
+	err := writeDb.Model(&models.XtPatientPhysiqueCheck{}).Create(record).Error
+	return err
+}
 func GetPatientRescueRecords(orgID int64, patientID int64, startTime int64, endTime int64) ([]*models.PatientRescueRecord, error) {
 	var records []*models.PatientRescueRecord
 	err := readDb.Model(&models.PatientRescueRecord{}).Where("org_id = ? and patient_id = ? and record_time >= ? and record_time <= ? and status = 1", orgID, patientID, startTime, endTime).Order("record_time desc").Find(&records).Error
@@ -53,12 +103,33 @@ func ModifyPatientCourses(record *models.PatientDiseaseCourse) error {
 	return err
 }
 
+func ModifyPatientSickHistory(record *models.XtPatientSickHistory) error {
+	err := writeDb.Save(record).Error
+	//err := writeDb.Model(&models.XtPatientSickHistory{}).Where("org_id = ? and patient_id = ? and status = 1 and id = ?", record.OrgId, record.PatientId, record.ID).Updates(map[string]interface{}{"content": record.Content, "record_time": record.RecordTime, "mtime": time.Now().Unix(), "title": record.Title}).Error
+	return err
+}
+
+func ModifyPatientPhysiqueCheck(record *models.XtPatientPhysiqueCheck) error {
+	err := writeDb.Save(record).Error
+	//err := writeDb.Model(&models.XtPatientSickHistory{}).Where("org_id = ? and patient_id = ? and status = 1 and id = ?", record.OrgId, record.PatientId, record.ID).Updates(map[string]interface{}{"content": record.Content, "record_time": record.RecordTime, "mtime": time.Now().Unix(), "title": record.Title}).Error
+	return err
+}
 func DeletePatientCoursesInBatch(orgID int64, patientID int64, recordIDs []int64) error {
 	err := writeDb.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, recordIDs).Updates(map[string]interface{}{"status": 2, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
+func DeletePatientSickHistoryInBatch(orgID int64, patientID int64, recordIDs []int64) error {
+	err := writeDb.Model(&models.XtPatientSickHistory{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, recordIDs).Updates(map[string]interface{}{"status": 2, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
 func DeletePatientResuceRecordsInBatch(orgID int64, patientID int64, recordIDs []int64) error {
 	err := writeDb.Model(&models.PatientRescueRecord{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, recordIDs).Updates(map[string]interface{}{"status": 2, "mtime": time.Now().Unix()}).Error
 	return err
 }
+
+func DeletePatientPhysiqueCheckInBatch(orgID int64, patientID int64, recordIDs []int64) error {
+	err := writeDb.Model(&models.XtPatientPhysiqueCheck{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, recordIDs).Updates(map[string]interface{}{"status": 2, "mtime": time.Now().Unix()}).Error
+	return err
+}

service/patient_service.go

@@ -520,9 +520,16 @@ func GetLapsetoPatientCount(orgID int64, lapseto int64) (total int64) {
 
 func ChechLastDialysisNo(orgID int64) (dialysisNo int64) {
 	var patient models.Patients
-	err := readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=?", orgID).Order("dialysis_no desc").First(&patient).Error
-	if err != nil {
-		return
+	if orgID == 10278 {
+		err := readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=?", orgID).Order("id desc").First(&patient).Error
+		if err != nil {
+			return
+		}
+	} else {
+		err := readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=?", orgID).Order("dialysis_no desc").First(&patient).Error
+		if err != nil {
+			return
+		}
 	}
 
 	if patient.ID == 0 {
@@ -609,6 +616,15 @@ func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient mode
 	return
 }
 
+func FindPatientWithDeviceByPatientId(orgID int64, id int64, time int64) (patient models.SchedualPatient2, err error) {
+	err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
+		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 id = ? and status = 1 ", orgID, id).First(&patient).Error
+	return
+}
+
 func CreatePatient(patient *models.Patients, contagions []int64, diseases []int64) (err error) {
 
 	user, _ := GetSgjUserByMobild(patient.Phone)
@@ -1580,11 +1596,21 @@ func FindAllDoctorAdviceByGoroupNo(orgID int64, groupno int64) (advice []models.
 	return
 }
 
+func FindAllDoctorAdviceByGoroupNoTwety(orgID int64, groupno int64) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND groupno = ? AND status = 1 and (drug_id >0 or drug_name_id >0)", orgID, groupno).Find(&advice).Error
+	return
+}
+
 func FindDoctorAdviceByIds(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("id IN (?) AND user_org_id = ? AND status = 1", ids, orgID).Find(&advice).Error
 	return
 }
 
+func FindDoctorAdviceByIdsTwety(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("id IN (?) AND user_org_id = ? AND status = 1 and (drug_id >0 or drug_name_id >0)", ids, orgID).Find(&advice).Error
+	return
+}
+
 func BatchDeleteDoctorAdvice(ids []string, user_id int64) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix(), "modifier": user_id}).Error

service/pharmacy_service.go

@@ -789,7 +789,7 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	var hids []*models.TmpID
 	var xids []*models.TmpID
 	//var hid,xid []int64//查询已发药的药品
-	err = tx.Raw("select id,dispensing_time from his_doctor_advice_info where status = 1 and created_time >= ? and created_time <= ? "+
+	err = tx.Raw("select id,dispensing_time from his_doctor_advice_info where status = 1 and advice_date >= ? and advice_date <= ? "+
 		"and user_org_id = ? and patient_id = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, orgid).Scan(&hids).Error
 	if err != nil {
 		return

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -227,6 +227,7 @@ type PrescriptionVM struct {
 	SodiumBicarbonateFlow      string  `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
 	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 }
 
 func (PrescriptionVM) TableName() string {

service/role_service.go

@@ -500,7 +500,7 @@ func GetAllGeneralPurviewVMsProcessed(module int) ([]*PurviewTreeViewModel, erro
 	return purviewVMs, nil
 }
 
-//用来处理树形结构
+// 用来处理树形结构
 func Totree(map1 map[int64]int64, map2 map[int64]*PurviewTreeViewModel, tmp int64) []*PurviewTreeViewModel {
 	var j int //用来计数
 	var tmp_purview []*PurviewTreeViewModel

service/schedule_service.go

@@ -168,6 +168,7 @@ func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, schedu
 		db = db.Where("s.schedule_week in(?)", WeekDayIds)
 	}
 	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
+		Preload("DialysisSolution", "status= 1 and solution_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").

service/secondary_service.go

@@ -10,14 +10,14 @@ import (
 	"time"
 )
 
-//生成编号，规则为:"SH-"+4位随机数
+// 生成编号，规则为:"SH-"+4位随机数
 func CreateCode() string {
 	s := fmt.Sprintf("%04v", rand.New(rand.NewSource(time.Now().UnixNano())).Int63n(10000))
 	code := "SH-" + s
 	return code
 }
 
-//查询仓库名称是否重复(用于修改)
+// 查询仓库名称是否重复(用于修改)
 func IsStorehouseNameUp(orgid, id int64, storehouse_name string) (bool, error) {
 	var total int
 	var tmp bool
@@ -30,7 +30,7 @@ func IsStorehouseNameUp(orgid, id int64, storehouse_name string) (bool, error) {
 	return tmp, err
 }
 
-//查询仓库地址是否重复（用于修改）
+// 查询仓库地址是否重复（用于修改）
 func IsStorehouseAddressUp(orgid, id int64, storehouse_address string) (bool, error) {
 	var total int
 	var tmp bool
@@ -43,7 +43,7 @@ func IsStorehouseAddressUp(orgid, id int64, storehouse_address string) (bool, er
 	return tmp, err
 }
 
-//查询编号是否重复
+// 查询编号是否重复
 func FindStorehouseCode(orgid int64, code string) bool {
 	var total int
 	XTReadDB().Model(&models.Storehouse{}).Where(" storehouse_code = ? and user_org_id = ? and status = 1", code, orgid).Count(&total)
@@ -54,7 +54,7 @@ func FindStorehouseCode(orgid int64, code string) bool {
 	}
 }
 
-//判断仓库的库存是否为零 true为零，false不为零
+// 判断仓库的库存是否为零 true为零，false不为零
 func IsStorehouseNil(id, orgid int64) bool { //根据 id gro_id 查为零的库存
 	var h, y int
 	//判断耗材是否为零
@@ -70,19 +70,19 @@ func IsStorehouseNil(id, orgid int64) bool { //根据 id gro_id 查为零的库
 	return true
 }
 
-//修改仓库状态
+// 修改仓库状态
 func UpdateStorehouseStatus(id int64) error {
 	err := XTWriteDB().Exec("UPDATE xt_storehouse,(SELECT CASE storehouse_status WHEN 1 THEN 0 WHEN 0 THEN 1 END AS tt FROM xt_storehouse WHERE id=?)tmp SET storehouse_status = tmp.tt where id=?", id, id).Error
 	return err
 }
 
-//删除仓库
+// 删除仓库
 func DeleteStorehouse(id int64) error {
 	err := XTWriteDB().Model(&models.Storehouse{}).Where("id = ?", id).Update("status", 0).Error
 	return err
 }
 
-//查询仓库名称是否重复
+// 查询仓库名称是否重复
 func IsStorehouseName(orgid int64, storehouse_name string) (bool, error) {
 	var total int
 	var tmp bool
@@ -95,7 +95,7 @@ func IsStorehouseName(orgid int64, storehouse_name string) (bool, error) {
 	return tmp, err
 }
 
-//查询仓库地址是否重复
+// 查询仓库地址是否重复
 func IsStorehouseAddress(orgid int64, storehouse_address string) (bool, error) {
 	var total int
 	var tmp bool
@@ -108,7 +108,7 @@ func IsStorehouseAddress(orgid int64, storehouse_address string) (bool, error) {
 	return tmp, err
 }
 
-//新增仓库
+// 新增仓库
 func AddStroehouse(storehouse models.Storehouse) (shiwu string, err error) {
 	tx := XTWriteDB().Begin()
 	defer func() {
@@ -150,7 +150,7 @@ func AddStroehouse(storehouse models.Storehouse) (shiwu string, err error) {
 	return shiwu, err
 }
 
-//修改仓库
+// 修改仓库
 func UpdateStroehouse(storehouse models.Storehouse) error {
 	err := XTWriteDB().Model(&models.Storehouse{}).Where("id = ? and status = 1", storehouse.ID).Updates(
 		map[string]interface{}{
@@ -163,13 +163,13 @@ func UpdateStroehouse(storehouse models.Storehouse) error {
 	return err
 }
 
-//查询一条仓库的信息
+// 查询一条仓库的信息
 func GetOneStorehouse(id, orgid int64) (storehouse models.Storehouse, err error) {
 	err = XTReadDB().Model(&models.Storehouse{}).Where("id = ? and user_org_id = ?", id, orgid).Find(&storehouse).Error
 	return
 }
 
-//分页
+// 分页
 func StorehouseList(page, limit, orgid int64, keyword string, slicekey []int64) (storehouse []models.Storehouse, total int64, err error) {
 	db := XTReadDB().Model(&storehouse).Where("status = 1 and user_org_id = ?", orgid)
 	offset := (page - 1) * limit
@@ -187,13 +187,13 @@ func StorehouseList(page, limit, orgid int64, keyword string, slicekey []int64)
 	return storehouse, total, err
 }
 
-//获取当前机构所有可用的仓库名字
+// 获取当前机构所有可用的仓库名字
 func GetAllStorehouseName(orgid int64) (storehouse []models.Storehouse, err error) {
 	err = XTReadDB().Model(&models.Storehouse{}).Where("storehouse_status = 1 and status = 1 and user_org_id = ?", orgid).Find(&storehouse).Error
 	return
 }
 
-//根据机构id,生成一个默认仓库
+// 根据机构id,生成一个默认仓库
 func GetDefaultStorehouse(orgid int64) error {
 	var code string
 	for a := true; a == true; {
@@ -222,7 +222,7 @@ func GetDefaultStorehouse(orgid int64) error {
 	return err
 }
 
-//查找该机构id是否有仓库存在,ture存在，false不存在
+// 查找该机构id是否有仓库存在,ture存在，false不存在
 func IsStorehouse(orgid int64) bool {
 	var total int
 	XTReadDB().Model(&models.Storehouse{}).Where("user_org_id = ?", orgid).Count(&total)
@@ -233,7 +233,7 @@ func IsStorehouse(orgid int64) bool {
 	}
 }
 
-//查找该机构id是否有仓库配置存在,ture存在，false不存在
+// 查找该机构id是否有仓库配置存在,ture存在，false不存在
 func IsStorehouseconfigXT(orgid int64, tx *gorm.DB) bool {
 	var total int
 	tx.Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Count(&total)
@@ -244,17 +244,18 @@ func IsStorehouseconfigXT(orgid int64, tx *gorm.DB) bool {
 	}
 }
 
-//  根据机构id查询仓库配置
-//storehouse_info:耗材 自动入库 的仓库id
-//storehouse_out_info:耗材 自动出库 的仓库id
-//drug_storehouse_info:药品 自动入库 的仓库id
-//drug_storehouse_out:药品 自动出库 的仓库id
+//	根据机构id查询仓库配置
+//
+// storehouse_info:耗材 自动入库 的仓库id
+// storehouse_out_info:耗材 自动出库 的仓库id
+// drug_storehouse_info:药品 自动入库 的仓库id
+// drug_storehouse_out:药品 自动出库 的仓库id
 func FindStorehouseConfig(orgid int64) (storehouse_config models.StorehouseConfig, err error) {
 	err = XTReadDB().Model(&models.StorehouseConfig{}).Where("status = 1 and user_org_id = ?", orgid).Find(&storehouse_config).Error
 	return
 }
 
-//根据机构id,仓库id新建一个仓库配置
+// 根据机构id,仓库id新建一个仓库配置
 func CreateStorehouseConfig(orgid, id int64) (err error) {
 	storeconfig := models.StorehouseConfig{
 		UserOrgId:          orgid,
@@ -269,7 +270,7 @@ func CreateStorehouseConfig(orgid, id int64) (err error) {
 	return
 }
 
-//根据机构id,仓库id新建一个仓库配置,带事务
+// 根据机构id,仓库id新建一个仓库配置,带事务
 func CreateStorehouseConfigXT(orgid, id int64, tx *gorm.DB) (err error) {
 	storeconfig := models.StorehouseConfig{
 		UserOrgId:          orgid,
@@ -284,41 +285,41 @@ func CreateStorehouseConfigXT(orgid, id int64, tx *gorm.DB) (err error) {
 	return
 }
 
-//更改耗材自动入库仓库
+// 更改耗材自动入库仓库
 func UpdateInfo(orgid, id int64) (err error) {
 	mtime := time.Now().Unix()
 	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"storehouse_info": id, "mtime": mtime}).Error
 	return
 }
 
-//更改耗材自动出库仓库
+// 更改耗材自动出库仓库
 func UpdateOutInfo(orgid, id int64) (err error) {
 	mtime := time.Now().Unix()
 	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"storehouse_out_info": id, "mtime": mtime}).Error
 	return
 }
 
-//更改药品自动入库仓库
+// 更改药品自动入库仓库
 func UpdateDrugInfo2(orgid, id int64) (err error) {
 	mtime := time.Now().Unix()
 	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"drug_storehouse_info": id, "mtime": mtime}).Error
 	return
 }
 
-//更改药品自动出库仓库
+// 更改药品自动出库仓库
 func UpdateDrugOut(orgid, id int64) (err error) {
 	mtime := time.Now().Unix()
 	err = XTWriteDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"drug_storehouse_out": id, "mtime": mtime}).Error
 	return
 }
 
-//根据id查询仓库名称
+// 根据id查询仓库名称
 func FindStorehouseName(id int64) (storehouse models.Storehouse, err error) {
 	err = XTReadDB().Model(&models.Storehouse{}).Where("id = ?", id).Find(&storehouse).Error
 	return
 }
 
-//判断该仓库是否在仓库配置表中
+// 判断该仓库是否在仓库配置表中
 func IsInConfig(orgid, id int64) bool {
 	var total int
 	XTReadDB().Model(&models.StorehouseConfig{}).Where("user_org_id = ? and status = 1", orgid).Where(
@@ -330,7 +331,7 @@ func IsInConfig(orgid, id int64) bool {
 	}
 }
 
-//兼容旧数据
+// 兼容旧数据
 func Byliinit() (err error) {
 	tx := XTWriteDB().Begin()
 	defer func() {
@@ -449,13 +450,13 @@ func Byliinit() (err error) {
 	return
 }
 
-//初始化管理员名字
+// 初始化管理员名字
 func initsgj_user_admin(tx *gorm.DB) (err error) {
 	err = tx.Exec("update sgj_users.sgj_user_admin set name = \"超级管理员\" where name is null or name = \"\"").Error
 	return
 }
 
-//根据xt_gobal_template 获取的机构id减去仓库表存在的机构id，把结果插入到仓库表
+// 根据xt_gobal_template 获取的机构id减去仓库表存在的机构id，把结果插入到仓库表
 func StoreReduceOrg(tx *gorm.DB) (err error) {
 	err = tx.Exec("INSERT INTO sgj_xt.xt_storehouse(storehouse_code,storehouse_name,user_org_id,ctime)" +
 		"SELECT CONCAT(\"SH-\",FLOOR(RAND()*9000+1000)),\"默认仓库\",tmp.id,UNIX_TIMESTAMP()" +
@@ -470,7 +471,7 @@ func StoreReduceOrg(tx *gorm.DB) (err error) {
 	return
 }
 
-//查找仓库表的orgid 减去仓库配置表的orgid，把结果插入到仓库配置表
+// 查找仓库表的orgid 减去仓库配置表的orgid，把结果插入到仓库配置表
 func StoreReduceConfig(tx *gorm.DB) (err error) {
 	err = tx.Exec("INSERT INTO sgj_xt.xt_storehouse_config(user_org_id,storehouse_info,storehouse_out_info,drug_storehouse_info,drug_storehouse_out,ctime)" +
 		"SELECT tmp.user_org_id,tmp.id,tmp.id,tmp.id,tmp.id,UNIX_TIMESTAMP()" +
@@ -479,7 +480,7 @@ func StoreReduceConfig(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_storehouse 管理员的名字
+// 初始化 xt_storehouse 管理员的名字
 func initxt_storehouse(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_storehouse as t," +
 		"(SELECT o.id,o.creator from sgj_users.sgj_user_org as o," +
@@ -490,7 +491,7 @@ func initxt_storehouse(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_stock_flow（完成）
+// 初始化 xt_stock_flow（完成）
 func initxt_stock_flow(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_stock_flow as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -501,7 +502,7 @@ func initxt_stock_flow(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_drug_flow（完成）
+// 初始化 xt_drug_flow（完成）
 func initxt_drug_flow(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_drug_flow as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -512,7 +513,7 @@ func initxt_drug_flow(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 dialysis_before_prepare（完成）
+// 初始化 dialysis_before_prepare（完成）
 func initdialysis_before_prepare(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.dialysis_before_prepare as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -523,7 +524,7 @@ func initdialysis_before_prepare(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_automatic_reduce_detail（完成）
+// 初始化 xt_automatic_reduce_detail（完成）
 func initxt_automatic_reduce_detail(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_automatic_reduce_detail as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -534,7 +535,7 @@ func initxt_automatic_reduce_detail(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_drug_automatic_reduce_detail（完成）
+// 初始化 xt_drug_automatic_reduce_detail（完成）
 func initxt_drug_automatic_reduce_detail(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_drug_automatic_reduce_detail as t," +
 		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
@@ -545,7 +546,7 @@ func initxt_drug_automatic_reduce_detail(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_warehouse（完成）
+// 初始化 xt_warehouse（完成）
 func initxt_warehouse(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_warehouse as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -556,7 +557,7 @@ func initxt_warehouse(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_warehouse_info（完成）
+// 初始化 xt_warehouse_info（完成）
 func initxt_warehouse_info(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_info as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -567,7 +568,7 @@ func initxt_warehouse_info(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_warehouse_out（完成）
+// 初始化 xt_warehouse_out（完成）
 func initxt_warehouse_out(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_out as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -578,7 +579,7 @@ func initxt_warehouse_out(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_warehouse_out_info（完成）
+// 初始化 xt_warehouse_out_info（完成）
 func initxt_warehouse_out_info(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_warehouse_out_info as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -589,7 +590,7 @@ func initxt_warehouse_out_info(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_drug_warehouse（完成）
+// 初始化 xt_drug_warehouse（完成）
 func initxt_drug_warehouse(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse as t," +
 		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -600,7 +601,7 @@ func initxt_drug_warehouse(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_drug_warehouse_info（完成）
+// 初始化 xt_drug_warehouse_info（完成）
 func initxt_drug_warehouse_info(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_info as t," +
 		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -611,7 +612,7 @@ func initxt_drug_warehouse_info(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_drug_warehouse_out（完成）
+// 初始化 xt_drug_warehouse_out（完成）
 func initxt_drug_warehouse_out(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_out as t," +
 		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
@@ -622,7 +623,7 @@ func initxt_drug_warehouse_out(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_drug_warehouse_out_info（完成）
+// 初始化 xt_drug_warehouse_out_info（完成）
 func initxt_drug_warehouse_out_info(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_drug_warehouse_out_info as t," +
 		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
@@ -633,7 +634,7 @@ func initxt_drug_warehouse_out_info(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_cancel_stock（完成）
+// 初始化 xt_cancel_stock（完成）
 func initxt_cancel_stock(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_cancel_stock as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -644,7 +645,7 @@ func initxt_cancel_stock(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_cancel_stock_info（完成）
+// 初始化 xt_cancel_stock_info（完成）
 func initxt_cancel_stock_info(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_cancel_stock_info as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -655,7 +656,7 @@ func initxt_cancel_stock_info(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_drug_cancel_stock（完成）
+// 初始化 xt_drug_cancel_stock（完成）
 func initxt_drug_cancel_stock(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_drug_cancel_stock as t," +
 		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
@@ -666,7 +667,7 @@ func initxt_drug_cancel_stock(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_drug_cancel_stock_info（完成）
+// 初始化 xt_drug_cancel_stock_info（完成）
 func initxt_drug_cancel_stock_info(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_drug_cancel_stock_info as t," +
 		"(SELECT t1.user_org_id as orgid,t1.drug_storehouse_out as id from sgj_xt.xt_storehouse_config as t1," +
@@ -677,7 +678,7 @@ func initxt_drug_cancel_stock_info(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_supplier_warehouse_info（完成）
+// 初始化 xt_supplier_warehouse_info（完成）
 func initxt_supplier_warehouse_info(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_info as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -688,7 +689,7 @@ func initxt_supplier_warehouse_info(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_supplier_warehousing_info_order（完成）
+// 初始化 xt_supplier_warehousing_info_order（完成）
 func initxt_supplier_warehousing_info_order(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_info_order as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -699,7 +700,7 @@ func initxt_supplier_warehousing_info_order(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_supplier_warehouse_out（完成）
+// 初始化 xt_supplier_warehouse_out（完成）
 func initxt_supplier_warehouse_out(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_out as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_out_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -710,7 +711,7 @@ func initxt_supplier_warehouse_out(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_supplier_warehousing_out_order（完成）
+// 初始化 xt_supplier_warehousing_out_order（完成）
 func initxt_supplier_warehousing_out_order(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_out_order as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -721,7 +722,7 @@ func initxt_supplier_warehousing_out_order(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_supplier_warehouse_cancel（完成）
+// 初始化 xt_supplier_warehouse_cancel（完成）
 func initxt_supplier_warehouse_cancel(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehouse_cancel as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -732,7 +733,7 @@ func initxt_supplier_warehouse_cancel(tx *gorm.DB) (err error) {
 	return
 }
 
-//初始化 xt_supplier_warehousing_cancel_order（完成）
+// 初始化 xt_supplier_warehousing_cancel_order（完成）
 func initxt_supplier_warehousing_cancel_order(tx *gorm.DB) (err error) {
 	err = tx.Exec("UPDATE sgj_xt.xt_supplier_warehousing_cancel_order as t," +
 		"(SELECT t1.user_org_id as orgid,t1.storehouse_info as id from sgj_xt.xt_storehouse_config as t1," +
@@ -743,13 +744,13 @@ func initxt_supplier_warehousing_cancel_order(tx *gorm.DB) (err error) {
 	return
 }
 
-//查询机构创建者的id
+// 查询机构创建者的id
 func Getcreateid(orgid int64) (createid models.UserOrg, err error) {
 	err = XTReadDB().Select("id,creator").Where("id = ? and status = 1", orgid).Find(&createid).Error
 	return
 }
 
-//根据机构id查询拥有仓库管理权限的角色
+// 根据机构id查询拥有仓库管理权限的角色
 func FindRoles(orgid int64) map[string]int {
 	role := []models.RolePurviews{}
 	tmp := models.PurviewTmp{}
@@ -764,7 +765,7 @@ func FindRoles(orgid int64) map[string]int {
 	return roles
 }
 
-//判断两个切片中的元素是否有重复的，true有重复的元素，false无相同元素
+// 判断两个切片中的元素是否有重复的，true有重复的元素，false无相同元素
 func IsIdentical(str1 []string, str2 []string) (t bool) {
 	t = false
 	if len(str1) == 0 || len(str2) == 0 {
@@ -785,7 +786,6 @@ func IsIdentical(str1 []string, str2 []string) (t bool) {
 	return
 }
 
-//
 func GetAllStoreHouseList(orgid int64) (house []*models.XtStorehouse, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&house).Error

service/sign_weigh_service.go

@@ -27,7 +27,7 @@ func GetSignPatients(orgId int64, keywords string, dateTime, schedule_type int64
 	return
 }
 
-//GetSignPanels  签到称重班次休息
+// GetSignPanels  签到称重班次休息
 func GetSignPanels(orgid, dateTime int64) (map[int64]map[string]int64, error) {
 	fmt.Println(dateTime)
 	fmt.Println("世界的尽头")

service/statistics_service/index_evaluation_service.go

@@ -28,7 +28,7 @@ type ProcessIndexDataStruct struct {
 	Value float64 `json:"value"`
 }
 
-//透析过程统计
+// 透析过程统计
 func GetDialysisProcessIndexChartData(user_org_id int64, patient_id int64, start_time int64, end_time int64, statistics_type int) (datas []*ProcessIndexDataStruct, err error) {
 	db := service.XTReadDB()
 	switch statistics_type {
@@ -176,7 +176,7 @@ func GetAnticoagulantData(user_org_id int64) (config []*models.Dataconfig, tempE
 
 //透析过程统计
 
-//透析监测统计
+// 透析监测统计
 func GetDialysisWatchChartData(user_org_id int64, patient_id int64, start_time int64, end_time int64, statistics_type int) (datas []*ProcessIndexDataStruct, err error) {
 	db := service.XTReadDB()
 	switch statistics_type {
@@ -334,7 +334,7 @@ func GetDialysisWatchTableData(orgID, patientID int64, page, limit, start, end i
 
 //透析监测统计
 
-//透析体重统计
+// 透析体重统计
 func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time int64, statistics_type int) (item []*otherItemAmount, err error) {
 	db := service.XTReadDB()
 	var items []*otherItemAmount
@@ -826,7 +826,7 @@ func GetPatientDialysisWeightChartData(user_org_id int64, patient_id int64, star
 
 //透析体重统计
 
-//透析血压统计
+// 透析血压统计
 func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int64, statistics_type int, patient_id int64) (item []*otherItemAmount, err error) {
 	db := service.XTReadDB()
 	var items []*otherItemAmount
@@ -1157,7 +1157,7 @@ func GetPatientBloodPressureChartData(user_org_id int64, patient_id int64, start
 
 //透析血压统计
 
-//工作量统计
+// 工作量统计
 func GetDoctorWorkloadChartData(user_org_id int64, start_time int64, end_time int64, statistics_type int, admin_user_id int64) (datas []*VMUserAdminRole, err error) {
 	userDb := service.UserReadDB()
 	db := service.XTReadDB()
@@ -1550,7 +1550,7 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 //
 //}
 
-//工作量统计
+// 工作量统计
 type AdminUser struct {
 	ID          int64  `gorm:"column:id" json:"id" form:"id"`
 	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`

service/stock_service.go

@@ -3999,7 +3999,7 @@ func GetHisProjectPrescriptionByPatientIdOne(id int64) (models.HisPrescriptionPr
 
 func GetAllAutoRecordByPatient(patientid int64, recorddate int64) (auto []*models.WarehouseOutInfoNight, err error) {
 
-	err = XTReadDB().Select("count,warehouse_info_id,good_id,org_id,sys_record_time,patient_id,project_id,warehouse_info_id,warehouse_out_order_number,storehouse_id,price,dealer,manufacturer,good_type_id,product_date,expiry_date,number,license_number").Where(" patient_id = ? and sys_record_time = ?  and status = 1 and is_sys = 1 and count>0 and project_id >0", patientid, recorddate).Find(&auto).Error
+	err = XTReadDB().Select("count,warehouse_info_id,good_id,org_id,sys_record_time,patient_id,project_id,warehouse_info_id,warehouse_out_order_number,storehouse_id,price,dealer,manufacturer,good_type_id,product_date,expiry_date,number,license_number").Where(" patient_id = ? and sys_record_time = ?  and status = 1 and is_sys = 1 and count>0", patientid, recorddate).Find(&auto).Error
 	return auto, err
 
 }
@@ -4012,9 +4012,9 @@ func ModefyWarehouseInfo(count int64, id int64) error {
 
 func DeleteAutoWarehouse(patient_id int64, record_time int64) error {
 
-	err := XTWriteDB().Model(models.AutomaticReduceDetail{}).Where("patient_id = ? and record_time = ? and status = 1 and project_id >0", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(models.DialysisBeforePrepare{}).Where("patient_id = ? and record_date = ? and status = 1 and project_id >0", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(models.VmStockFlow{}).Where("patient_id = ? and system_time = ? and status = 1 and project_id >0", patient_id, record_time).Updates(map[string]interface{}{"is_read": 1}).Error
+	err := XTWriteDB().Model(models.AutomaticReduceDetail{}).Where("patient_id = ? and record_time = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DialysisBeforePrepare{}).Where("patient_id = ? and record_date = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.VmStockFlow{}).Where("patient_id = ? and system_time = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"is_read": 1}).Error
 	//err = XTWriteDB().Model(models.WarehouseOutInfoNight{}).Where("patient_id = ? and sys_record_time = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
 
 	return err

service/supply_service.go

@@ -8,13 +8,13 @@ import (
 	"time"
 )
 
-//根据供应商编号获取首要联系人
+// 根据供应商编号获取首要联系人
 func FindName(code string, orgid int64) (fistname models.SpSupplierContacts, err error) {
 	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1 and is_first = 1 and user_org_id = ?", code, orgid).First(&fistname).Error
 	return fistname, err
 }
 
-//供应商分页
+// 供应商分页
 func GetSupplyList(ctype int64, page int64, limit int64, keyword string, orgid int64) (supplylist []*models.SpSupplierName, total int64, err error) {
 	db := XTReadDB().Model(&supplylist).Where("xt_supplier_name.status = 1 and xt_supplier_name.user_org_id = ?", orgid)
 	offset := (page - 1) * limit
@@ -30,7 +30,7 @@ func GetSupplyList(ctype int64, page int64, limit int64, keyword string, orgid i
 	return supplylist, total, err
 }
 
-//修改供应商和联系人
+// 修改供应商和联系人
 func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType, tcreater int64, supplierCode, supplierName, number, bank, bankAccount string, vatRate float64) error {
 	tx := XTWriteDB().Begin()
 	defer func() {
@@ -130,37 +130,37 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 	return err
 }
 
-//更新一条供应商的信息,添加了事务的
+// 更新一条供应商的信息,添加了事务的
 func UpdateSupplyNameTX(upsupply models.SpSupplierName, tx *gorm.DB) error {
 	err := tx.Model(&models.SpSupplierName{}).Where("id = ? and status = 1", upsupply.ID).Updates(map[string]interface{}{"supplier_code": upsupply.SupplierCode, "supplier_name": upsupply.SupplierName, "supplier_type": upsupply.SupplierType, "vat_rate": upsupply.VatRate, "number": upsupply.Number, "bank": upsupply.Bank, "bank_account": upsupply.BankAccount, "user_org_id": upsupply.UserOrgId, "status": upsupply.Status, "contacts_id": upsupply.ContactsId, "mtime": upsupply.Mtime, "modify": upsupply.Modify}).Error
 	return err
 }
 
-//更新一条供应商的信息,没有添加事务
+// 更新一条供应商的信息,没有添加事务
 func UpdateSupplyName(upsupply models.SpSupplierName) error {
 	err := XTWriteDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1", upsupply.ID).Updates(map[string]interface{}{"supplier_code": upsupply.SupplierCode, "supplier_name": upsupply.SupplierName, "supplier_type": upsupply.SupplierType, "vat_rate": upsupply.VatRate, "number": upsupply.Number, "bank": upsupply.Bank, "bank_account": upsupply.BankAccount, "user_org_id": upsupply.UserOrgId, "status": upsupply.Status, "contacts_id": upsupply.ContactsId, "mtime": upsupply.Mtime, "modify": upsupply.Modify}).Error
 	return err
 }
 
-//更新一条联系人的信息
+// 更新一条联系人的信息
 func UpdateContact(updatecontacts models.SpSupplierContacts, tx *gorm.DB) error {
 	err := tx.Model(&models.SpSupplierContacts{}).Where("id = ? and status = 1", updatecontacts.ID).Updates(map[string]interface{}{"name": updatecontacts.Name, "phone": updatecontacts.Phone, "address": updatecontacts.Address, "is_first": updatecontacts.IsFirst, "supplier_code": updatecontacts.SupplierCode, "user_org_id": updatecontacts.UserOrgId, "status": updatecontacts.Status, "mtime": updatecontacts.Mtime}).Error
 	return err
 }
 
-//查询供应商单条记录
+// 查询供应商单条记录
 func GetSupplyOne(id int64) (supply models.SpSupplierName, err error) {
 	err = XTReadDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1", id).First(&supply).Error
 	return supply, err
 }
 
-//删除单条联系人记录
+// 删除单条联系人记录
 func DelContactOne(id int64) error {
 	err := XTWriteDB().Model(&models.SpSupplierContacts{}).Where("id = ?", id).Update("status", 0).Error
 	return err
 }
 
-//获取单条供应商和涉及到的联系人记录
+// 获取单条供应商和涉及到的联系人记录
 func GetSupplyAndContactOne(id, orgId int64) (supply models.SpSupplierName, contact []*models.SpSupplierContacts, err error) {
 	err = XTReadDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1 and user_org_id = ?", id, orgId).First(&supply).Error
 	code := supply.SupplierCode
@@ -168,7 +168,7 @@ func GetSupplyAndContactOne(id, orgId int64) (supply models.SpSupplierName, cont
 	return supply, contact, err
 }
 
-//删除供应商及联系人
+// 删除供应商及联系人
 func DelSupply(supply models.SpSupplierName, orgId int64) (shiwu string, err error) {
 	tx := XTWriteDB().Begin()
 	defer func() {
@@ -197,7 +197,7 @@ func DelSupply(supply models.SpSupplierName, orgId int64) (shiwu string, err err
 	return shiwu, err
 }
 
-//保存供应商和联系人
+// 保存供应商和联系人
 func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreater int64, supplierCode, supplierName, number, bank, bankAccount string, vatRate float64) error {
 	tx := XTWriteDB().Begin()
 	defer func() {
@@ -272,13 +272,13 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 	return err
 }
 
-//获取供应商编码
+// 获取供应商编码
 func GetSuppliyCode(orgId int64) (spcode []*models.SpSupplierName, err error) {
 	err = XTReadDB().Model(&models.SpSupplierName{}).Select("supplier_code").Where("supplier_code like 'gys%' and status = 1 and user_org_id = ? ", orgId).Order("supplier_code desc").First(&spcode).Error
 	return spcode, err
 }
 
-//查询供应商的名字是否有重复
+// 查询供应商的名字是否有重复
 func FindSupplierName(supplierName string, orgId int64) (sbool bool, err error) {
 	var total int
 	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_name = ? and user_org_id = ? and status = 1", supplierName, orgId).Count(&total).Error
@@ -290,7 +290,7 @@ func FindSupplierName(supplierName string, orgId int64) (sbool bool, err error)
 	return sbool, err
 }
 
-//查询供应商的编号是否有重复(用于修改)
+// 查询供应商的编号是否有重复(用于修改)
 func FindSupplierCode(supplierCode string, supplierid, orgid int64) (codebool bool, err error) {
 	var total int
 	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_code = ? and id != ? and user_org_id = ? and status = 1", supplierCode, supplierid, orgid).Count(&total).Error
@@ -302,7 +302,7 @@ func FindSupplierCode(supplierCode string, supplierid, orgid int64) (codebool bo
 	return codebool, err
 }
 
-//查询供应商的编号是否有重复（用于新增）
+// 查询供应商的编号是否有重复（用于新增）
 func FindSupplierCodes(supplierCode string, orgid int64) (codebool bool, err error) {
 	var total int
 	err = XTReadDB().Model(&models.SpSupplierName{}).Where("supplier_code = ? and status = 1 and user_org_id = ?", supplierCode, orgid).Count(&total).Error
@@ -314,25 +314,25 @@ func FindSupplierCodes(supplierCode string, orgid int64) (codebool bool, err err
 	return codebool, err
 }
 
-//保存一条供应商数据加事务的
+// 保存一条供应商数据加事务的
 func SaveSupplyTx(supply models.SpSupplierName, tx *gorm.DB) error {
 	err := tx.Create(&supply).Error
 	return err
 }
 
-//保存一条供应商数据没有事务的
+// 保存一条供应商数据没有事务的
 func SaveSupply(supply models.SpSupplierName) error {
 	err := XTWriteDB().Create(&supply).Error
 	return err
 }
 
-//获取联系人的id
+// 获取联系人的id
 func SaveContactsId(tx *gorm.DB, orgid int64) (spconid []*models.SpSupplierContacts, err error) {
 	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Where("status = 1 and user_org_id = ?", orgid).Order("id desc").First(&spconid).Error
 	return
 }
 
-//保存一条联系人数据
+// 保存一条联系人数据
 func SaveContacts(spcontacts models.SpSupplierContacts, tx *gorm.DB) error {
 	err := tx.Create(&spcontacts).Error
 	return err

service/user_service.go

@@ -68,6 +68,26 @@ func GetAllDoctorAndNurseSix(orgId int64, appid int64) (doctors []AdminUserList,
 	return
 }
 
+func GetAllDoctorAndNurseSeven(orgId int64) (doctors []AdminUserList, nurses []AdminUserList, err error) {
+
+	var users []AdminUserList
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("org_id=?  and uar.user_type IN (2,3)", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&users).Error
+	if err != nil {
+		return
+	}
+	if len(users) == 0 {
+		return
+	}
+	for _, item := range users {
+		if item.UserType == 2 {
+			doctors = append(doctors, item)
+		} else {
+			nurses = append(nurses, item)
+		}
+	}
+	return
+}
+
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error

service/verify_login_token_service.go

@@ -130,7 +130,6 @@ func VerifyToken(token string, ip string, sessionID string) (*AdminUserInfo, err
 		return nil, err, 0
 	}
 
-
 	if respJSON["state"].(float64) != 1 {
 		msg := respJSON["msg"].(string)
 		utils.ErrorLog("验证 sso token 接口请求失败: %v", msg)
@@ -204,9 +203,10 @@ func processOrgIds(data map[string]interface{}) []int64 {
 }
 
 // "orgs": { (org_id: Org_Obj)
-// 	1: { Org's json },
-// 	2: { Org's json },
-// },
+//
+//		1: { Org's json },
+//		2: { Org's json },
+//	},
 func processOrgs(data map[string]interface{}) map[int64]*models.Org {
 	orgJSONs := data["orgs"].(map[string]interface{})
 	orgs := make(map[int64]*models.Org)
@@ -220,9 +220,10 @@ func processOrgs(data map[string]interface{}) map[int64]*models.Org {
 }
 
 // "org_app_ids": { (org_id: org_app_ids)
-// 	1: [11, 12, 13],
-// 	2: [21, 22, 23],
-// },
+//
+//		1: [11, 12, 13],
+//		2: [21, 22, 23],
+//	},
 func processOrgAppIds(data map[string]interface{}) map[int64][]int64 {
 	orgAppIdStrs := data["org_app_ids"].(map[string]interface{})
 	orgAppIds := make(map[int64][]int64)
@@ -239,15 +240,16 @@ func processOrgAppIds(data map[string]interface{}) map[int64][]int64 {
 }
 
 // "org_apps": { (org_id: {app_id: OrgApp_Obj})
-// 	1: {
-// 		11: { OrgApp's json },
-// 		12: { OrgApp's json },
-// 	},
-// 	2: {
-// 		21: { OrgApp's json },
-// 		22: { OrgApp's json },
-// 	},
-// },
+//
+//		1: {
+//			11: { OrgApp's json },
+//			12: { OrgApp's json },
+//		},
+//		2: {
+//			21: { OrgApp's json },
+//			22: { OrgApp's json },
+//		},
+//	},
 func processOrgApps(data map[string]interface{}) map[int64]map[int64]*models.OrgApp {
 	orgAppJSONs := data["org_apps"].(map[string]interface{})
 	orgApps := make(map[int64]map[int64]*models.OrgApp)
@@ -269,11 +271,12 @@ func processOrgApps(data map[string]interface{}) map[int64]map[int64]*models.Org
 }
 
 // "app_to_org_ids": { (app_id: org_id)
-// 	11: 1,
-// 	12: 1,
-// 	21: 2,
-// 	22: 2,
-// },
+//
+//		11: 1,
+//		12: 1,
+//		21: 2,
+//		22: 2,
+//	},
 func processApp2OrgIds(data map[string]interface{}) map[int64]int64 {
 	app2OrgIdStrs := data["app_to_org_ids"].(map[string]interface{})
 	app2OrgIds := make(map[int64]int64)
@@ -286,10 +289,11 @@ func processApp2OrgIds(data map[string]interface{}) map[int64]int64 {
 }
 
 // "app_roles": { (app_id: App_Role Obj)
-// 	11: {App_Role's json},
-// 	12: {App_Role's json},
-// 	21: {App_Role's json},
-// },
+//
+//		11: {App_Role's json},
+//		12: {App_Role's json},
+//		21: {App_Role's json},
+//	},
 func processAppRoles(data map[string]interface{}) map[int64]*models.App_Role {
 	appRoleJSONs := data["app_roles"].(map[string]interface{})
 	appRoles := make(map[int64]*models.App_Role)
@@ -303,18 +307,19 @@ func processAppRoles(data map[string]interface{}) map[int64]*models.App_Role {
 }
 
 // "purviews": { (app_id: [processed Purviews' json])
-// 	11: [
-// 		{Purview's json .childs[
-// 			{Purview's json},
-// 			{Purview's json},
-// 		]},
-// 		{Purview's json},
-// 	],
-// 	12: [
-// 		{Purview's json},
-// 		{Purview's json},
-// 	],
-// },
+//
+//		11: [
+//			{Purview's json .childs[
+//				{Purview's json},
+//				{Purview's json},
+//			]},
+//			{Purview's json},
+//		],
+//		12: [
+//			{Purview's json},
+//			{Purview's json},
+//		],
+//	},
 func processPurviews(data map[string]interface{}) map[int64][]*models.Purview {
 	appPurviewJSONsStrs := data["purviews"].(map[string]interface{})
 	appPurviews := make(map[int64][]*models.Purview)
@@ -345,13 +350,14 @@ func processPurviews(data map[string]interface{}) map[int64][]*models.Purview {
 // }
 
 // "purview_urlfors": { (app_id: [url_for])
-// 	11: [
-// 		"Controller1.Action1",
-// 		"Controller1.Action2",
-// 		"Controller2.Action1",
-// 		"Controller2.Action2",
-// 	],
-// }
+//
+//		11: [
+//			"Controller1.Action1",
+//			"Controller1.Action2",
+//			"Controller2.Action1",
+//			"Controller2.Action2",
+//		],
+//	}
 func processPurviewUrlfors(data map[string]interface{}) map[int64][]string {
 	appUrlforsStrs := data["purview_urlfors"].(map[string]interface{})
 	appUrlfors := make(map[int64][]string)
@@ -365,8 +371,9 @@ func processPurviewUrlfors(data map[string]interface{}) map[int64][]string {
 }
 
 // "org_subscibes": { (org_id: ServeSubscibe)
-//  11: {ServeSubscibe's json}
-// },
+//
+//	 11: {ServeSubscibe's json}
+//	},
 func processOrgSubscibes(data map[string]interface{}) map[int64]*models.ServeSubscibe {
 	subscibeJSONs := data["org_subscibes"].(map[string]interface{})
 	subscibes := make(map[int64]*models.ServeSubscibe)

service/warhouse_service.go

@@ -83,6 +83,21 @@ func DrugsDelivery(orgID int64, creater int64, advice *models.DoctorAdvice) (err
 // 药品自动出库 递归方式
 func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DoctorAdvice) (err error) {
 
+	drugError := models.XtDrugError{
+		ID:                    0,
+		UserOrgId:             advice.UserOrgId,
+		DrugId:                advice.DrugId,
+		RecordDate:            advice.AdviceDate,
+		PatientId:             advice.PatientId,
+		Remark:                "恒泰中医院出库进来",
+		Status:                1,
+		Ctime:                 time.Now().Unix(),
+		Mtime:                 0,
+		Prescribingnumber:     advice.PrescribingNumber,
+		PrescribingNumberUnit: advice.PrescribingNumberUnit,
+		SumCount:              0,
+	}
+	CreateDrugError(drugError)
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -249,6 +264,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			IsCheck:                 1,
 			OverCount:               sum_count,
+			AdviceId:                advice.ID,
 		}
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
@@ -282,6 +298,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
 			LastPrice:               warehouse.Price,
 			OverCount:               sum_count,
+			AdviceId:                advice.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -302,6 +319,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			CountUnit:               drup.MinUnit,
 			WarehouseInfoId:         warehouse.ID,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -346,6 +364,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			IsCheck:                 1,
+			AdviceId:                advice.ID,
 		}
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
@@ -366,6 +385,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			CountUnit:               drup.MinUnit,
 			WarehouseInfoId:         warehouse.ID,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
@@ -455,6 +475,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			WarehouseOutDetailId:    lastDrugOutInfo.ID,
 			LastPrice:               warehouse.Price,
 			OverCount:               sum_count,
+			AdviceId:                advice.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -4005,6 +4026,12 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 
 		AddWarehosingInfo(warehouseInfo)
 
+		//查询剩余库存
+		goodListOne, _ := GetAllGoodSumCount(goods.GoodId, orgID, warehouseInfo.StorehouseId)
+		var sum_count_one int64
+		for _, item := range goodListOne {
+			sum_count_one += item.StockCount
+		}
 		stockInfoFlow := models.VmStockFlow{
 			WarehousingId:           warehouseInfo.WarehousingId,
 			GoodId:                  goods.GoodId,
@@ -4038,6 +4065,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            warehouseInfo.StorehouseId,
 			SecondWarehouseInfoId:   warehouseInfo.SecondWarehouseInfoId,
+			OverCount:               sum_count_one,
 		}
 
 		//创建入库流水
@@ -4178,6 +4206,12 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 
 		AddWarehosingInfo(warehouseInfo)
 
+		//查询剩余库存
+		goodListOne, _ := GetAllGoodSumCount(goods.GoodId, orgID, warehouseInfo.StorehouseId)
+		var sum_count_one int64
+		for _, item := range goodListOne {
+			sum_count_one += item.StockCount
+		}
 		stockInfoFlow := models.VmStockFlow{
 			WarehousingId:           warehouseInfo.WarehousingId,
 			GoodId:                  goods.GoodId,
@@ -4211,6 +4245,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            warehouseInfo.StorehouseId,
 			SecondWarehouseInfoId:   warehouseInfo.SecondWarehouseInfoId,
+			OverCount:               sum_count_one,
 		}
 
 		//创建出库流水
@@ -4246,8 +4281,8 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 	//开启事物
 	//storeConfig, _ := GetAllStoreHouseConfig(orgID)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
-	fmt.Println("lastWarehouse.StockMinNumber", lastWarehouse.StockMinNumber)
-	fmt.Println("drup.MinNumber", drup.MinNumber)
+	//fmt.Println("lastWarehouse.StockMinNumber", lastWarehouse.StockMinNumber)
+	//fmt.Println("drup.MinNumber", drup.MinNumber)
 	if lastWarehouse.StockMinNumber >= drup.MinNumber {
 		var stockMax int64
 		var stockMin int64
@@ -4268,8 +4303,8 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
-	fmt.Println("stock23233233232", stock_number)
-	fmt.Println("deliver_number", deliver_number)
+	//fmt.Println("stock23233233232", stock_number)
+	//fmt.Println("deliver_number", deliver_number)
 
 	// 出库完成后，要减去对应批次的库存数量
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
@@ -4434,6 +4469,15 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 		CreateDrugWarehouseInfo(drugInfo)
 
+		//查询剩余库存
+		stockInfoOne, _ := GetDrugAllStockInfo(drugWarehouse.StorehouseId, orgID, advice.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfoOne {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count_one += its.StockMaxNumber + its.StockMinNumber
+		}
 		flow := models.DrugFlow{
 			WarehousingId:           drugWarehouse.WarehousingId,
 			DrugId:                  warehouse.DrugId,
@@ -4470,6 +4514,7 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			StockMinNumber:          deliver_number,
 			StorehouseId:            drugWarehouse.StorehouseId,
 			SecondWarehouseInfoId:   drugWarehouse.SecondWarehouseInfoId,
+			OverCount:               sum_count_one,
 		}
 
 		CreateDrugFlowOne(flow)
@@ -4602,6 +4647,15 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 		CreateDrugWarehouseInfo(drugInfo)
 
+		//查询剩余库存
+		stockInfoTwo, _ := GetDrugAllStockInfo(drugWarehouse.StorehouseId, orgID, advice.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfoTwo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count_one += its.StockMaxNumber + its.StockMinNumber
+		}
 		flow := models.DrugFlow{
 			WarehousingId:           drugWarehouse.WarehousingId,
 			DrugId:                  warehouse.DrugId,
@@ -7489,3 +7543,12 @@ func UpdateHisAdviceById(id int64) error {
 	err := XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"execution_time": "", "execution_staff": "", "execution_state": 2}).Error
 	return err
 }
+
+func GetAdviceIsOut(advice_id int64, user_org_id int64, patient_id int64, advice_date int64, drug_id int64) (models.DrugWarehouseOutInfo, error) {
+
+	advice := models.DrugWarehouseOutInfo{}
+
+	err := XTReadDB().Where("advice_id = ? and org_id = ? and patient_id = ? and sys_record_time = ? and status=1 and drug_id = ?", advice_id, user_org_id, patient_id, advice_date, drug_id).Find(&advice).Error
+
+	return advice, err
+}

src/golang.org/x/sync

@@ -1 +0,0 @@
-Subproject commit f12130a5280420d36872ab0a7717d160c768df46

tests/default_test.go

@@ -1,4 +1,5 @@
 package test
+
 //
 //import (
 //	_ "XT_New/routers"

utils/tools.go

@@ -72,7 +72,7 @@ func TimeAgo(timeUnix int64) string {
 	return ""
 }
 
-//Signature sha1签名
+// Signature sha1签名
 func Signature(params ...string) string {
 	sort.Strings(params)
 	h := sha1.New()
@@ -82,7 +82,7 @@ func Signature(params ...string) string {
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
 
-//RandomStr 随机生成字符串
+// RandomStr 随机生成字符串
 func RandomStr(length int) string {
 	str := "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 	bytes := []byte(str)
@@ -94,7 +94,7 @@ func RandomStr(length int) string {
 	return string(result)
 }
 
-//GetCurrTs return current timestamps
+// GetCurrTs return current timestamps
 func GetCurrTs() int64 {
 	return time.Now().Unix()
 }
@@ -154,7 +154,7 @@ type jSapiConfig struct {
 	Signature string `json:"signature"`
 }
 
-//GetAJTConfig jsapi_ticket config
+// GetAJTConfig jsapi_ticket config
 func GetAJTConfig(jsapiTicket, uri string) (jSapiConfig, error) {
 	var config jSapiConfig
 	nonceStr := RandomStr(16)