拉取

.idea/.gitignore

-# Default ignored files
-/workspace.xml

.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

.idea/vcs.xml

 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/golang.org/x/net" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/qiniupkg.com/x" vcs="Git" />
   </component>
 </project>

conf/app.conf

 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 
-readmysqlhost = shengws1.mysql.rds.aliyuncs.com
+readmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh
-readmysqlpass = xhPECP2nFObR8aUK
+readmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmysqlname = sgj_xt
 
-writemysqlhost = shengws1.mysql.rds.aliyuncs.com
+
+
+readmysqlhost2 = read-kuyicloud2024lt.mysql.rds.aliyuncs.com
+readmysqlport2 = 3306
+readmysqluser2 = syh
+readmysqlpass2 = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
+readmysqlname2 = sgj_xt
+
+writemysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = syh
-writemysqlpass = xhPECP2nFObR8aUK
+writemysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writemysqlname = sgj_xt
 
 
-readuserhost = shengws1.mysql.rds.aliyuncs.com
+readuserhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = syh
-readuserpass = xhPECP2nFObR8aUK
+readuserpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readusername = sgj_users
 
-writeuserhost = shengws1.mysql.rds.aliyuncs.com
+writeuserhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = syh
-writeuserpass = xhPECP2nFObR8aUK
+writeuserpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writeusername = sgj_users
 
-readmiddlehost = shengws1.mysql.rds.aliyuncs.com
+readmiddlehost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readmiddleport = 3306
 readmiddleuser = syh
-readmiddlepass = xhPECP2nFObR8aUK
+readmiddlepass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmiddlename = ky_xt_middle
 
-writemiddlehost = shengws1.mysql.rds.aliyuncs.com
+writemiddlehost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writemiddleport = 3306
 writemiddleuser = syh
-writemiddlepass = xhPECP2nFObR8aUK
+writemiddlepass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writemiddlename = ky_xt_middle
 
 
-readsgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
+readsgjpatientmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readsgjpatientmysqlport = 3306
 readsgjpatientmysqluser = syh
-readsgjpatientmysqlpass = xhPECP2nFObR8aUK
+readsgjpatientmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readsgjpatientmysqlname = sgj_patient
 
-writesgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
+writesgjpatientmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writesgjpatientmysqlport = 3306
 writesgjpatientmysqluser = syh
-writesgjpatientmysqlpass = xhPECP2nFObR8aUK
+writesgjpatientmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writesgjpatientmysqlname = sgj_patient
 
 
-readpatienthost = shengws1.mysql.rds.aliyuncs.com
+readpatienthost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readpatientport = 3306
 readpatientuser = syh
-readpatientpass = xhPECP2nFObR8aUK
+readpatientpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readpatientname = sgj_cdm
 
-writepatienthost = shengws1.mysql.rds.aliyuncs.com
+writepatienthost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writepatientport = 3306
 writepatientuser = syh
-writepatientpass = xhPECP2nFObR8aUK
+writepatientpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writepatientname = sgj_cdm
 
-
-readswshost = shengws1.mysql.rds.aliyuncs.com
-readswsport = 3306
-readswsuser = syh
-readswspass = xhPECP2nFObR8aUK
-readswsname = shengws
-
-
-
-writeswshost = shengws1.mysql.rds.aliyuncs.com
-writeswsport = 3306
-writeswsuser = syh
-writeswspass = xhPECP2nFObR8aUK
-writeswsname = shengws
-
-redishost = 349e580b2a524290.redis.rds.aliyuncs.com
+redishost = kuyicloud.redis.rds.aliyuncs.com
 redisport = 6379
-redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP
-redisdb = 0
-
-
-
-
-
-
+redispasswrod = 1Q2W3e4r!@#$
+redisdb = 1
 
+EnableRender= false
 niprocart =  63
 jms = 58
 fistula_needle_set = 65
 
 [dev]
 mobile_token_expiration_second = 604800
-httpdomain = http://new_mobile.xt.api.sgjyun.com
+# httpdomain = http://new_mobile.xt.api.sgjyun.com
+httpdomain = https://api.xt.test.sgjyun.com
 sso_domain = https://testsso.sgjyun.com
 call_domain = http://hf.szjkhd.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
+sign_appid ="eac17a142dd046"
+serviceKye = "da8b09dce3684e6ebfbb7f70dba707a0"
+#serviceCode ="msg0001"
+
+serviceCode ="signSDK0001S"
+
+
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 writeusername = sgj_users
 
 
-
 readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmiddleport = 3306
 readmiddleuser = root
 writemiddlename = ky_xt_middle
 
 
-
 readpatienthost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readpatientport = 3306
 readpatientuser = root
 
 #redishost = 120.77.235.13
 #redishost = 112.74.16.180
-redishost = localhost
+redishost = kuyi6666.redis.rds.aliyuncs.com
 redisport = 6379
-redispasswrod = syh@#$%123456!
-redisdb = 0
+redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP
+redisdb = 7
 
 niprocart =  83
 jms = 80

conf/接口.txt

-
-//新增临时
-/m/api/dialysis/dialysisPrescription?mode=1
-修改临处
-/m/api/dialysis/dialysisPrescription?mode=2
-修改他人临处
-/m/api/dialysis/dialysisPrescription?mode=3
-
-
-新增接诊评估
-/m/api/dialysis/acceptsAssessment?mode=1
-修改接诊评估
-/m/api/dialysis/acceptsAssessment?mode=2
-修改他人接诊评估
-/m/api/dialysis/acceptsAssessment?mode=3
-
-新增透前评估
-/m/api/assessmentbefore/commit?mode=1
-修改透前评估
-/m/api/assessmentbefore/commit?mode=2
-修改他人透前评估
-/m/api/assessmentbefore/commit?mode=3
-
-执行上机
-/m/api/dialysis/start?mode=1
-修改执行上机
-/m/api/startOrder/edit?mode=2
-修改他人执行上机
-/m/api/startOrder/edit?mode=3
-
-新增透析监测
-/m/api/monitor/add?mode=1
-修改透析监测
-/m/api/monitor/edit?mode=2
-修改他人透析监测
-/m/api/monitor/edit?mode=3
-删除透析监测
-/m/api/monitor/delete?mode=4
-删除他人透析监测
-/m/api/monitor/delete?mode=5
-
-执行下机
-/m/api/dialysis/finish?mode=1
-修改执行下机
-/m/api/finishOrder/edit?mode=2
-修改他人执行下机
-/m/api/finishOrder/edit?mode=3
-
-新增透后评估
-/m/api/dialysis/assessmentAfterDislysis?mode=1
-修改透后评估
-/m/api/dialysis/assessmentAfterDislysis?mode=2
-修改他人透后评估
-/m/api/dialysis/assessmentAfterDislysis?mode=3
-
-新增治疗小结
-/m/api/dialysis/treatmentSummary?mode=1
-修改治疗小结
-/m/api/dialysis/treatmentSummary?mode=2
-修改他人治疗小结
-/m/api/dialysis/treatmentSummary?mode=3
-
-新增透析临时医嘱
-/m/api/advice/creategroup?mode=1
-修改透析临时医嘱
-/m/api/advice/edit?mode=2
-修改他人透析临时医嘱
-/m/api/advice/edit?mode=3
-删除透析临时医嘱
-/m/api/newadvice/delete?mode=4
-删除他人透析临时医嘱
-/m/api/newadvice/delete?mode=5
-执行透析临时医嘱
-/m/api/advice/exec?mode=6
-核对透析临时医嘱
-/m/api/advice/check?mode=7
-修改已执行医嘱
-/m/api/advice/exec/modify?mode=8
-
-
-移动端 ： /m/api/permission/get      get 请求
-参数1: create_url
-参数2:modify_url
-
-参数3:modify_other_url
-
-参数4:del_url
-
-参数5:del_other_url
-
-参数6:exce_url
-
-参数7:check_url
-
-参数8:modify_exce_url
-参数9:module
-
-返回值1:is_has_create
-返回值2:is_has_modify
-
-返回值3:is_has_modify_other
-
-返回值4:is_has_del
-
-返回值5:is_has_del_other
-
-返回值6:is_has_exce
-
-返回值7:is_has_check
-
-返回值8:is_has_modify_exce
-
-返回值9:module
-
-

controllers/dialysis_api_controller.go

 	remark := c.GetString("remark")
 	puncture_method := c.GetString("puncture_method")
 
-	dialysis_count, _ := c.GetInt64("dialysis_count", 0)
+	dialysis_count := c.GetString("dialysis_count")
 	emergency_treatment, _ := c.GetInt64("emergency_treatment", 0)
 	emergency_treatment_other := c.GetString("emergency_treatment_other")
 	ductus_arantii := c.GetString("ductus_arantii")
 	ductus_arantii_other := c.GetString("ductus_arantii_other")
 	machine_type := c.GetString("machine_type")
 	puncture_needle := c.GetString("puncture_needle")
-	humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
+	humor_excessive_symptom := c.GetString("humor_excessive_symptom")
 	phinholing := c.GetString("pinholing")
 
 	catheter_suture := c.GetString("catheter_suture")
 	operate_time, _ := c.GetInt64("operate_time", 0)
 	// monitoring_time := c.GetString("monitoring_time")
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
-	breathing_rated, _ := c.GetFloat("breathing_rated", 0)
+	// breathing_rated, _ := c.GetFloat("breathing_rated", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 	blood_pressure_type, _ := c.GetInt64("blood_pressure_type", 0)
 		DialysisOrderId: dialysis_order_id,
 		OperateTime:     operate_time,
 		// MonitoringTime:            monitoring_time,
-		PulseFrequency:            pulse_frequency,
-		BreathingRate:             breathing_rated,
+		PulseFrequency: pulse_frequency,
+		// BreathingRate:             breathing_rated,
 		SystolicBloodPressure:     systolic_blood_pressure,
 		DiastolicBloodPressure:    diastolic_blood_pressure,
 		BloodPressureType:         blood_pressure_type,

controllers/dialysis_record_api_controller.go

 			MonitoringDate:  monitorParam.MonitoringDate,
 			OperateTime:     monitorParam.OperateTime,
 			// MonitoringTime:         monitorParam.MonitoringTime,
-			PulseFrequency:              monitorParam.PulseFrequency,
-			BreathingRate:               monitorParam.BreathingRated,
+			PulseFrequency: monitorParam.PulseFrequency,
+			// BreathingRate:               monitorParam.BreathingRated,
 			SystolicBloodPressure:       monitorParam.SystolicBP,
 			DiastolicBloodPressure:      monitorParam.DiastolicBP,
 			BloodFlowVolume:             monitorParam.BloodFlowVolume,
 
 		monitor.OperateTime = monitorParam.OperateTime
 		monitor.PulseFrequency = monitorParam.PulseFrequency
-		monitor.BreathingRate = monitorParam.BreathingRated
+		// monitor.BreathingRate = monitorParam.BreathingRated
 		monitor.SystolicBloodPressure = monitorParam.SystolicBP
 		monitor.DiastolicBloodPressure = monitorParam.DiastolicBP
 		monitor.BloodFlowVolume = monitorParam.BloodFlowVolume
 	if fmonitorRecords.ID > 0 && endmonitorRecords.ID > 0 {
 		tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		tempassessmentAfterDislysis.PulseFrequency = endmonitorRecords.PulseFrequency
-		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
+		// tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		if adminUserInfo.CurrentOrgId == 10101 {

controllers/mobile_api_controllers/dialysis_api_controller.go

 	weightReduce, _ := c.GetFloat("weight_loss", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
-	breathing_rate, _ := c.GetFloat("breathing_rate", 0)
+	// breathing_rate, _ := c.GetFloat("breathing_rate", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 	actual_ultrafiltration, _ := c.GetFloat("actual_ultrafiltration", 0)
 	catheter := c.GetString("catheter")
 	complications := c.GetString("complication")
 	remark := c.GetString("remark")
-	dialysateVolume, _ := c.GetInt64("dialysis_intakes", 0)
+	//dialysateVolume, _ := c.GetInt64("dialysis_intakes", 0)
 
 	dialysis_intakes_unit, _ := c.GetInt64("dialysis_intakes_unit", 0)
 
 	//_, evaluation := service.FindPredialysisEvaluationByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 
 	assessmentAfterDislysis := models.AssessmentAfterDislysis{
-		UserOrgId:                    adminUserInfo.Org.Id,
-		PatientId:                    id,
-		AssessmentDate:               recordDate.Unix(),
-		Temperature:                  temperature,
-		PulseFrequency:               pulse_frequency,
-		BreathingRate:                breathing_rate,
-		SystolicBloodPressure:        systolic_blood_pressure,
-		DiastolicBloodPressure:       diastolic_blood_pressure,
-		ActualUltrafiltration:        actual_ultrafiltration,
-		ActualDisplacement:           actual_displacement,
-		ActualTreatmentHour:          actualtreatHour,
-		ActualTreatmentMinute:        actualtreatmin,
-		WeightAfter:                  weightAfter,
-		AdditionalWeight:             additionalWeight,
-		WeightLoss:                   weightReduce,
-		Cruor:                        cruor,
-		SymptomAfterDialysis:         symptomsAfterDialysi,
-		InternalFistula:              internalFistula,
-		Catheter:                     catheter,
-		Complication:                 complications,
-		DialysisIntakes:              dialysateVolume,
+		UserOrgId:      adminUserInfo.Org.Id,
+		PatientId:      id,
+		AssessmentDate: recordDate.Unix(),
+		Temperature:    temperature,
+		PulseFrequency: pulse_frequency,
+		// BreathingRate:          breathing_rate,
+		SystolicBloodPressure:  systolic_blood_pressure,
+		DiastolicBloodPressure: diastolic_blood_pressure,
+		ActualUltrafiltration:  actual_ultrafiltration,
+		ActualDisplacement:     actual_displacement,
+		ActualTreatmentHour:    actualtreatHour,
+		ActualTreatmentMinute:  actualtreatmin,
+		WeightAfter:            weightAfter,
+		AdditionalWeight:       additionalWeight,
+		WeightLoss:             weightReduce,
+		Cruor:                  cruor,
+		SymptomAfterDialysis:   symptomsAfterDialysi,
+		InternalFistula:        internalFistula,
+		Catheter:               catheter,
+		Complication:           complications,
+		//DialysisIntakes:              dialysateVolume,
 		CreatedTime:                  time.Now().Unix(),
 		Status:                       1,
 		Remark:                       remark,
 
 		tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		tempassessmentAfterDislysis.PulseFrequency = endmonitorRecords.PulseFrequency
-		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
+		// tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 		if errcode == nil {
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
-			record.BreathingRate = befor.BreathingRate
+			// record.BreathingRate = befor.BreathingRate
 			record.PulseFrequency = befor.PulseFrequency
 			record.Temperature = befor.Temperature
 		}
 	return
 }
 
-//当前数据比上一次出库数据少
+// 当前数据比上一次出库数据少
 func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, creater int64, count int64) (err error) {
 
 	fmt.Println("w我的中国馆公共区发电房阿道夫安抚安抚安抚安抚安抚安抚阿道夫阿道夫阿凡达阿道夫a", count)
 	return nil
 }
 
-//耗材出库删除
+// 耗材出库删除
 func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut, patient_id int64, creater int64, count int64) (err error) {
 
 	fmt.Println("count2323223884584854854854u5454785487547845785478758487545475475487,count", count)
 	return nil
 }
 
-//耗材出库删除
+// 耗材出库删除
 func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut) (err error) {
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockOne(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time)

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

 	fmt.Println(operateTime)
 
 	pulseFrequency, _ := this.GetFloat("pulse_frequency")
-	breathingRated, _ := this.GetFloat("breathing_rated")
+	// breathingRated, _ := this.GetFloat("breathing_rated")
 	systolicBP, _ := this.GetFloat("systolic_bp")
 	diastolicBP, _ := this.GetFloat("diastolic_bp")
 	BPType, _ := this.GetInt("bp_type")
 		MonitoringDate:  date,
 		OperateTime:     operateTime,
 		// MonitoringTime:            recordTime,
-		PulseFrequency:              pulseFrequency,
-		BreathingRate:               breathingRated,
+		PulseFrequency: pulseFrequency,
+		// BreathingRate:               breathingRated,
 		SystolicBloodPressure:       systolicBP,
 		DiastolicBloodPressure:      diastolicBP,
 		BloodPressureType:           int64(BPType),
 		operateTime = 0
 	}
 	pulseFrequency, _ := this.GetFloat("pulse_frequency")
-	breathingRated, _ := this.GetFloat("breathing_rated")
+	// breathingRated, _ := this.GetFloat("breathing_rated")
 	systolicBP, _ := this.GetFloat("systolic_bp")
 	diastolicBP, _ := this.GetFloat("diastolic_bp")
 	BPType, _ := this.GetInt("bp_type")
 	monitor.MonitoringDate = date
 	monitor.OperateTime = operateTime
 	monitor.PulseFrequency = pulseFrequency
-	monitor.BreathingRate = breathingRated
+	// monitor.BreathingRate = breathingRated
 	monitor.SystolicBloodPressure = systolicBP
 	monitor.DiastolicBloodPressure = diastolicBP
 	monitor.BloodPressureType = int64(BPType)

controllers/mobile_api_controllers/patient_api_controller.go

 
 	if dataBody["dialysis_count"] != nil && reflect.TypeOf(dataBody["dialysis_count"]).String() == "string" {
 		dialysis_count, _ := dataBody["dialysis_count"].(string)
-		count, _ := strconv.ParseInt(dialysis_count, 10, 64)
-		evaluation.DialysisCount = count
+		// count, _ := strconv.ParseInt(dialysis_count, 10, 64)
+		evaluation.DialysisCount = dialysis_count
 	}
 
 	if dataBody["is_infect"] != nil && reflect.TypeOf(dataBody["is_infect"]).String() == "string" {
 	}
 
 	if dataBody["humor_excessive_symptom"] != nil && reflect.TypeOf(dataBody["humor_excessive_symptom"]).String() == "float64" {
-		humor_excessive_symptom := int64(dataBody["humor_excessive_symptom"].(float64))
+		humor_excessive_symptom := dataBody["humor_excessive_symptom"].(string)
 		evaluation.HumorExcessiveSymptom = humor_excessive_symptom
 	}
 

controllers/patient_api_controller.go

 
 }
 
-//GetPatientsList 取患者列表
+// GetPatientsList 取患者列表
 func (c *PatientApiController) GetPatientsList() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
 
 }
 
-//GetPatientTotal
+// GetPatientTotal
 func (c *PatientApiController) GetPatientTotal() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	return
 }
 
-//GenerateDialysisNo 生成透析号
+// GenerateDialysisNo 生成透析号
 func (c *PatientApiController) GenerateDialysisNo() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	return
 }
 
-//CreatePatient 创建患者
+// CreatePatient 创建患者
 func (c *PatientApiController) CreatePatient() {
 	record_date := c.GetString("record_date")
 	is_infectious, _ := c.GetInt64("is_infectious")
 	return
 }
 
-//EditPatient 修改
+// EditPatient 修改
 func (c *PatientApiController) EditPatient() {
 	id, _ := c.GetInt64("id", 0)
 
 	return
 }
 
-//GetDryWeights 取患者干体重调整铺
+// GetDryWeights 取患者干体重调整铺
 func (c *PatientApiController) GetDryWeights() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
 	return
 }
 
-//GetDoctorAdvices 医嘱列表
+// GetDoctorAdvices 医嘱列表
 func (c *PatientApiController) GetDoctorAdvices() {
 	id, _ := c.GetInt64("id", 0)
 	adviceType, _ := c.GetInt64("advice_type", 0)

controllers/sign_weigh_api_controller.go

 	dry_weight, _ := c.GetFloat("dry_weight", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
-	breathing_rate, _ := c.GetFloat("breathing_rate", 0)
+	// breathing_rate, _ := c.GetFloat("breathing_rate", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 
 	assessmentafterdislysis := &models.AssessmentAfterDislysis{
-		WeightAfter:            weight_after,
-		DryWeight:              dry_weight,
-		Temperature:            temperature,
-		PulseFrequency:         pulse_frequency,
-		BreathingRate:          breathing_rate,
+		WeightAfter:    weight_after,
+		DryWeight:      dry_weight,
+		Temperature:    temperature,
+		PulseFrequency: pulse_frequency,
+		// BreathingRate:          breathing_rate,
 		SystolicBloodPressure:  systolic_blood_pressure,
 		DiastolicBloodPressure: diastolic_blood_pressure,
 	}

controllers/xcx_mobile_api_controller.go/xcx_api_controller.go

 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"github.com/shopspring/decimal"
 	"strconv"
 	"time"
 )
 	////传送codeinit
 	beego.Router("/xcx/m/api/code", &XcxApiController{}, "Get:GetCodeInit")
 	//获取验证码
-	beego.Router("/xcx/api/mobile/code", &XcxApiController{}, "Get:GetCodeInfo")
+	beego.Router("/xcx/api/mobile/code", &XcxApiController{}, "Post:GetCodeInfo")
 	//用户绑定
-	beego.Router("/xcx/api/mobile/register", &XcxApiController{}, "Get:GetUserRegister")
-	//登录
+	beego.Router("/xcx/api/mobile/register", &XcxApiController{}, "Get:GetUserNameRegister")
+	//手机号登录
 	beego.Router("/xcx/api/mobile/login", &XcxApiController{}, "Get:GetLoginInfor")
 
+	//openid登录
+	beego.Router("/xcx/api/openid/login", &XcxApiController{}, "Get:GetLoginInfoByOpenid")
+
 	//获取二维码信息
 	beego.Router("/xcx/api/mobile/patient", &XcxApiController{}, "Get:GetPatientList")
 
 	//获取登录后的信息
 	beego.Router("/xcx/api/mobile/getdatainfo", &XcxApiController{}, "Get:GetDataInfo")
 
+	//获取排班数据
+	beego.Router("/xcx/api/mobile/schedulebyweek", &XcxApiController{}, "Post:GetSchedulesByWeek")
+
 	//获取排班数据
 	beego.Router("/xcx/api/mobile/schedule", &XcxApiController{}, "Get:GetScheduleInfo")
 
 	//获取透析记录
 	beego.Router("/xcx/api/mobile/dialysis", &XcxApiController{}, "Get:GetMobileSchedule")
 
+	//获取体重纪录
+	beego.Router("/xcx/api/mobile/signweight", &XcxApiController{}, "Get:GetSignsByWeight")
+
+	//获取血压纪录
+	beego.Router("/xcx/api/mobile/signblood", &XcxApiController{}, "Get:GetSignsByBlood")
+
 	//获取患者的电子病历
 	beego.Router("/xcx/api/mobile/getpatientinfo", &XcxApiController{}, "Get:GetPatientInfo")
 
 	//获取数据字典数据
 	beego.Router("/xcx/api/mobile/getdataconfig", &XcxApiController{}, "Get:GetDataConfig")
 
-	//检验检查
+	//检验检查列表
 	beego.Router("/xcx/api/mobile/getinspectionlist", &XcxApiController{}, "Get:GetInspectionList")
 
+	//检验检查详情
+	beego.Router("/xcx/api/mobile/getinspectioninfo", &XcxApiController{}, "Get:GetInspectionInfo")
+
 	//肾有杯
 	beego.Router("/xcx/api/mobile/getarticlist", &XcxApiController{}, "Get:GetArticList")
 
 	beego.Router("/xcx/api/mobile/getarticlistdetail", &XcxApiController{}, "Get:GetArticListDetail")
 
 	beego.Router("/xcx/api/mobile/getstoryscore", &XcxApiController{}, "Get:GetStoryScoreList")
+
+	//获取appid
+	beego.Router("/xcx/api/mobile/getappid", &XcxApiController{}, "Get:GetAppId")
+
+	// 获取充值当前余额信息
+	beego.Router("/xcx/api/mobile/getbalance", &XcxApiController{}, "Get:IdToBalance")
+
+	// 获取一段时间内
+	beego.Router("/xcx/api/mobile/getbalanceinfo", &XcxApiController{}, "Get:DepositFlow")
 }
 
 type XcxApiController struct {
 	mobile_api_controllers.MobileBaseAPIController
 }
 
+// 根据id获取押金流水
+func (this *XcxApiController) DepositFlow() {
+	orgid, _ := this.GetInt64("org_id", 0)
+	patient_id, _ := this.GetInt64("patient_id", 0) //患者id
+	//获取当前患者的姓名
+	tmp, _ := service.GetHisUserName(orgid, patient_id)
+	name := tmp.Name
+
+	start_time := this.GetString("start_time", "") //开始时间
+	end_time := this.GetString("end_time", "")     //结束时间
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime int64 //开始时间
+	var etime int64 //结束时间
+	if start_time == "" || end_time == "" {
+		//如果为空则查全部的
+		stime, etime = service.GetMonth()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		stime = stmp.Unix()
+		etime = etmp.Unix()
+	}
+	////获取该角色当前时间段的余额
+	//decimal := service.GetMoneyforTime(id, orgid, etime)
+	//获取列表
+	deposirhistory, errs := service.GetFlowList(patient_id, orgid, stime, etime)
+	if errs != nil {
+		utils.ErrorLog("获取列表失败，原因为:", errs.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
+		return
+	}
+	var expenditure, recharge decimal.Decimal
+
+	for i := 0; i < len(deposirhistory); i++ {
+		//如果为扣费，或退费 则把订单id变为就诊号
+		if deposirhistory[i].DepositStatus == 1 || deposirhistory[i].DepositStatus == 3 || deposirhistory[i].DepositStatus == 4 {
+			recharge = recharge.Add(deposirhistory[i].Deposit)
+		}
+
+		if deposirhistory[i].DepositStatus == 2 {
+			expenditure = expenditure.Add(deposirhistory[i].Deposit)
+		}
+
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":        deposirhistory,
+		"name":        name,
+		"start_time":  time.Unix(stime, 0).Format("2006-01-02"),
+		"end_time":    time.Unix(etime, 0).Format("2006-01-02"),
+		"expenditure": expenditure,
+		"recharge":    recharge,
+	})
+	return
+}
+
+// 根据患者id查询患者的余额
+func (this *XcxApiController) IdToBalance() {
+
+	orgid, _ := this.GetInt64("org_id", 0)
+	his_patient_id, _ := this.GetInt64("patient_id", 0)
+	if orgid <= 0 || his_patient_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"error_code": 1001,
+			"error_msg":  "参数错误",
+		})
+	}
+	balance := service.GetUserMoney(his_patient_id, orgid)
+	patient, _ := service.GetPatientByIdXcx(his_patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"balance": balance,
+		"patient": patient,
+	})
+	return
+}
+
 func (this *XcxApiController) GetCodeInit() {
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
 	//将客户端的ip加密传给前端，作为短信验证的密钥，来验证短信发送的IP地址
 	aespass := utils.AESEncrypt(addr)
 
-	fmt.Println("hhhhhhh3223323232332", aespass)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"aespass": aespass,
 	})
 
 }
 
+func (this *XcxApiController) GetUserNameRegister() {
+	// name := this.GetString("name")
+	// relationship := this.GetString("relationship")
+	id_card_no := this.GetString("id_card_no")
+	mobile := this.GetString("mobile")
+	// code := this.GetString("code")
+	openid := this.GetString("openid")
+
+	if len(mobile) == 0 || len(openid) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	// redisClient := service.RedisClient()
+	// defer redisClient.Close()
+	// cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
+	// utils.TraceLog("cache_code:%v code:%v", cache_code, code)
+	// if cache_code != code {
+	// 	this.ServeSuccessJSON(map[string]interface{}{
+	// 		"err_code": "1001",
+	// 		"err_msg":  "验证码错误",
+	// 	})
+	// 	return
+	// }
+
+	// this.Ctx.SetCookie("mobile", mobile)
+	// // 注册成功后验证码就要使其失效
+	// redisClient.Del("code_msg_" + mobile)
+
+	patient, errcodes := service.GetPatientByIdcardno(id_card_no)
+	if errcodes == nil {
+		role := models.XcxAdminUserRole{
+			PatientName: patient.Name,
+			// Relationship: relationship,
+			IdCardNo: id_card_no,
+			Mobile:   mobile,
+			// Code:         code,
+			PatientId:  patient.ID,
+			UserOrgId:  patient.UserOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Appid:      "",
+			Appsecret:  "",
+			SessionKey: "",
+			Openid:     openid,
+		}
+		err := service.CreateXcxAdminUser(role)
+		if err == nil {
+			//mobilePatient, _ := service.GetNamePatient(name, id_card_no)
+			//template_id, _ := service.GetTemplateMode(mobilePatient.UserOrgId)
+			////处方
+			//prescripition_config, _ := service.GetPrescripionFieldConfig(mobilePatient.UserOrgId)
+			//
+			////接诊评估
+			//receive_treatement_config, _ := service.GetReceiveTreatmentAssess(mobilePatient.UserOrgId)
+			//
+			////透前评估
+			//dialysis_befor, _ := service.GetDialysisBefor(mobilePatient.UserOrgId)
+			//
+			////透析上机
+			//dialysis_order, _ := service.GetDialysisOrderConfig(mobilePatient.UserOrgId)
+			//
+			////透析监测
+			//monitor_record, _ := service.GetMonitorRecordConfig(mobilePatient.UserOrgId)
+			//
+			////透后评估
+			//dialysis_after, _ := service.GetDialysisAfeterConfig(mobilePatient.UserOrgId)
+			//
+			//treate_ment, _ := service.GetTreatMentConfig(mobilePatient.UserOrgId)
+			//var configList interface{}
+			//configList, _ = service.GetConfigList(mobilePatient.UserOrgId)
+			this.ServeSuccessJSON(map[string]interface{}{
+				"role":     role,
+				"is_bind":  true,
+				"err_code": "0",
+				"err_msg":  "",
+				//"patient":                   mobilePatient,
+				//"template_id":               template_id,
+				"user_org_id": patient.UserOrgId,
+				//"prescripition_config":      prescripition_config,
+				//"receive_treatement_config": receive_treatement_config,
+				//"dialysis_befor":            dialysis_befor,
+				//"dialysis_order":            dialysis_order,
+				//"monitor_record":            monitor_record,
+				//"dialysis_after":            dialysis_after,
+				//"treate_ment":               treate_ment,
+				//"configList":                configList,
+				//"result":                    false,
+			})
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"is_bind": false,
+				"msg":     "绑定失败",
+				"result":  false,
+			})
+		}
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"is_bind": false,
+			"msg":     "绑定失败,没有对应的患者信息",
+			"result":  false,
+		})
+	}
+}
+
 func (this *XcxApiController) GetUserRegister() {
 
 	//用户绑定
 
 	mobile := this.GetString("phone")
 	aespass := this.GetString("aespass")
+
 	utils.TraceLog("mobile:%v aespass:%v", mobile, aespass)
+
 	if utils.CellPhoneRegexp().MatchString(mobile) == false {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeMobileFormat)
 		this.ServeJSON()
 	})
 }
 
-func (this *XcxApiController) GetLoginInfor() {
+func (this *XcxApiController) GetLoginInfoByOpenid() {
+	openid := this.GetString("openid")
+	user_admin, errcodes := service.GetXcxOpneidInformation(openid)
+	if errcodes == gorm.ErrRecordNotFound {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patient":     "",
+			"patient_id":  0,
+			"user_org_id": 0,
+			"role":        user_admin,
+			"is_bind":     false,
+		})
+	} else if errcodes == nil {
+		info, _ := service.GetPatientListByPatientId(user_admin.PatientId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patient":     info,
+			"role":        user_admin,
+			"is_bind":     true,
+			"user_org_id": info.UserOrgId,
+			"patient_id":  user_admin.PatientId,
+		})
+	}
+}
 
+func (this *XcxApiController) GetLoginInfor() {
 	mobile := this.GetString("mobile")
-	fmt.Println(mobile)
 	user_admin, errcodes := service.GetXcxMobileInformation(mobile)
 	if errcodes == gorm.ErrRecordNotFound {
-		info, _ := service.GetMobilePatientInfo(mobile)
-		template_id, _ := service.GetTemplateMode(info.UserOrgId)
-		//处方
-		prescripition_config, _ := service.GetPrescripionFieldConfig(info.UserOrgId)
-
-		//接诊评估
-		receive_treatement_config, _ := service.GetReceiveTreatmentAssess(info.UserOrgId)
-
-		//透前评估
-		dialysis_befor, _ := service.GetDialysisBefor(info.UserOrgId)
-
-		//透析上机
-		dialysis_order, _ := service.GetDialysisOrderConfig(info.UserOrgId)
-
-		//透析监测
-		monitor_record, _ := service.GetMonitorRecordConfig(info.UserOrgId)
-
-		//透后评估
-		dialysis_after, _ := service.GetDialysisAfeterConfig(info.UserOrgId)
-
-		treate_ment, _ := service.GetTreatMentConfig(info.UserOrgId)
-		var configList interface{}
-		configList, _ = service.GetConfigList(info.UserOrgId)
 		this.ServeSuccessJSON(map[string]interface{}{
-			"patient":                   info,
-			"template_id":               template_id,
-			"user_org_id":               info.UserOrgId,
-			"prescripition_config":      prescripition_config,
-			"receive_treatement_config": receive_treatement_config,
-			"dialysis_befor":            dialysis_befor,
-			"dialysis_order":            dialysis_order,
-			"monitor_record":            monitor_record,
-			"dialysis_after":            dialysis_after,
-			"treate_ment":               treate_ment,
-			"role":                      user_admin,
-			"is_bind":                   false,
-			"list":                      configList,
+			"patient":     "",
+			"patient_id":  0,
+			"user_org_id": 0,
+			"role":        user_admin,
+			"is_bind":     false,
 		})
 	} else if errcodes == nil {
 		info, _ := service.GetPatientListByPatientId(user_admin.PatientId)
-		template_id, _ := service.GetTemplateMode(info.UserOrgId)
-		//处方
-		prescripition_config, _ := service.GetPrescripionFieldConfig(info.UserOrgId)
-
-		//接诊评估
-		receive_treatement_config, _ := service.GetReceiveTreatmentAssess(info.UserOrgId)
-
-		//透前评估
-		dialysis_befor, _ := service.GetDialysisBefor(info.UserOrgId)
-
-		//透析上机
-		dialysis_order, _ := service.GetDialysisOrderConfig(info.UserOrgId)
-
-		//透析监测
-		monitor_record, _ := service.GetMonitorRecordConfig(info.UserOrgId)
-
-		//透后评估
-		dialysis_after, _ := service.GetDialysisAfeterConfig(info.UserOrgId)
-
-		treate_ment, _ := service.GetTreatMentConfig(info.UserOrgId)
-		var configList interface{}
-		configList, _ = service.GetConfigList(info.UserOrgId)
 		this.ServeSuccessJSON(map[string]interface{}{
-			"patient":                   info,
-			"role":                      user_admin,
-			"is_bind":                   true,
-			"template_id":               template_id,
-			"user_org_id":               info.UserOrgId,
-			"prescripition_config":      prescripition_config,
-			"receive_treatement_config": receive_treatement_config,
-			"dialysis_befor":            dialysis_befor,
-			"dialysis_order":            dialysis_order,
-			"monitor_record":            monitor_record,
-			"dialysis_after":            dialysis_after,
-			"treate_ment":               treate_ment,
-			"list":                      configList,
+			"patient":     info,
+			"role":        user_admin,
+			"is_bind":     true,
+			"user_org_id": info.UserOrgId,
+			"patient_id":  user_admin.PatientId,
 		})
 	}
-
 }
 
 func (this *XcxApiController) GetPatientList() {
-	appid := "wx20b60369111b063a"
+	//appid := "wx20b60369111b063a"
+	appid := "wxcdf53b48b7df107e"
 	key := "Yz1HgsFX3yJvWPJSEdwJDA=="
 	strs := "uSevGQ5ShkiHjQuqz7s36SKZisVGA4fHH/dy+etg0W7ibVeidl6TyFS+kQZ6B9AI2T+1kOtKXeyveQR7q2TXJdu3fhKCFoLKVFzICNEvkiHMnchJ0T0OpRO3oT+icYq80+egvT+jMSgP7yi0cAgmiKaK/4QURD7+nvxRAj9drzz77sbeFt8KElb1LN/+Wn8dIoQzisxbON9G1VJYYtyBkQ=="
 	iv := "JgsbDhJ613uaAgAoBVh0Zw=="
 	})
 }
 
+func (this *XcxApiController) GetSignsByBlood() {
+	start := this.GetString("start", "")
+	end := this.GetString("end", "")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	if len(start) <= 0 || len(end) <= 0 || patient_id <= 0 || org_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "缺少参数",
+			"data":     "",
+		})
+	}
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation("2006-01-02", start, loc)
+	startTimeUnix := startTime.Unix()
+	endTime, _ := time.ParseInLocation("2006-01-02", end, loc)
+	endTimeUinx := endTime.Unix()
+
+	utils.TraceLog("startTime:%v endTime:%v", startTime, endTime)
+	utils.TraceLog("startTimeUnix:%v endTimeUinx:%v", startTimeUnix, endTimeUinx)
+	if startTimeUnix < 0 || endTimeUinx < 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间超出范围",
+			"data":     "",
+		})
+	}
+	if startTimeUnix > endTimeUinx {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "开始时间大于结束时间",
+			"data":     "",
+		})
+	}
+
+	if endTimeUinx-startTimeUnix > 60*60*24*60 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间范围超过60天",
+			"data":     "",
+		})
+	}
+
+	beforeblood, _ := service.GetSignsByBlood(org_id, startTimeUnix, endTimeUinx, patient_id)
+	afterblood, _ := service.GetSignsByAfterBlood(org_id, startTimeUnix, endTimeUinx, patient_id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"err_code":     0,
+		"err_msg":      "",
+		"before_blood": beforeblood,
+		"after_blood":  afterblood,
+	})
+
+	//now := time.Now()
+	//offset := int(time.Monday - now.Weekday())
+	//if offset > 0 {
+	//	offset = -6
+	//}
+	//monday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	//endday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset+6)
+	//startTime := monday.Unix()
+	//endTime := endday.Unix()
+	//
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"monday": startTime,
+	//	"endday": endTime,
+	//})
+}
+
+func (this *XcxApiController) GetSignsByWeight() {
+	start := this.GetString("start", "")
+	end := this.GetString("end", "")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	if len(start) <= 0 || len(end) <= 0 || patient_id <= 0 || org_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "缺少参数",
+			"data":     "",
+		})
+	}
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation("2006-01-02", start, loc)
+	startTimeUnix := startTime.Unix()
+	endTime, _ := time.ParseInLocation("2006-01-02", end, loc)
+	endTimeUinx := endTime.Unix()
+
+	utils.TraceLog("startTime:%v endTime:%v", startTime, endTime)
+	utils.TraceLog("startTimeUnix:%v endTimeUinx:%v", startTimeUnix, endTimeUinx)
+	if startTimeUnix < 0 || endTimeUinx < 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间超出范围",
+			"data":     "",
+		})
+	}
+	if startTimeUnix > endTimeUinx {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "开始时间大于结束时间",
+			"data":     "",
+		})
+	}
+
+	if endTimeUinx-startTimeUnix > 60*60*24*60 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间范围超过60天",
+			"data":     "",
+		})
+	}
+
+	beforeweight, _ := service.GetSignsByWeight(org_id, startTimeUnix, endTimeUinx, patient_id)
+	dryweight, _ := service.GetSignsByDryWeight(org_id, startTimeUnix, endTimeUinx, patient_id)
+	afterweight, _ := service.GetSignsByAfterWeight(org_id, startTimeUnix, endTimeUinx, patient_id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"err_code":       0,
+		"err_msg":        "",
+		"before_eweight": beforeweight,
+		"dry_eweight":    dryweight,
+		"after_eweight":  afterweight,
+	})
+
+	//now := time.Now()
+	//offset := int(time.Monday - now.Weekday())
+	//if offset > 0 {
+	//	offset = -6
+	//}
+	//monday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	//endday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset+6)
+	//startTime := monday.Unix()
+	//endTime := endday.Unix()
+	//
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"monday": startTime,
+	//	"endday": endTime,
+	//})
+}
+
+func (this *XcxApiController) GetSchedulesByWeek() {
+	start := this.GetString("start", "")
+	end := this.GetString("end", "")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	if len(start) <= 0 || len(end) <= 0 || patient_id <= 0 || org_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "缺少参数",
+			"data":     "",
+		})
+	}
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation("2006-01-02", start, loc)
+	startTimeUnix := startTime.Unix()
+	endTime, _ := time.ParseInLocation("2006-01-02", end, loc)
+	endTimeUinx := endTime.Unix()
+
+	utils.TraceLog("startTime:%v endTime:%v", startTime, endTime)
+	utils.TraceLog("startTimeUnix:%v endTimeUinx:%v", startTimeUnix, endTimeUinx)
+	if startTimeUnix < 0 || endTimeUinx < 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间超出范围",
+			"data":     "",
+		})
+	}
+	if startTimeUnix > endTimeUinx {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "开始时间大于结束时间",
+			"data":     "",
+		})
+	}
+
+	if endTimeUinx-startTimeUnix > 60*60*24*60 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间范围超过60天",
+			"data":     "",
+		})
+	}
+
+	schedule, _ := service.GetScheduleByXcx(org_id, startTimeUnix, endTimeUinx, patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"err_code": 0,
+		"err_msg":  "",
+		"data":     schedule,
+	})
+
+	//now := time.Now()
+	//offset := int(time.Monday - now.Weekday())
+	//if offset > 0 {
+	//	offset = -6
+	//}
+	//monday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	//endday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset+6)
+	//startTime := monday.Unix()
+	//endTime := endday.Unix()
+	//
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"monday": startTime,
+	//	"endday": endTime,
+	//})
+}
+
 func (this *XcxApiController) GetScheduleInfo() {
+
 	patient_id, _ := this.GetInt64("patient_id")
 	fmt.Println(patient_id)
 	thisWeekMonday := service.GetFirstDateOfWeek()
 	nextWeekMonday := weekDays.AddDate(0, 0, +13)
 	var weekMonday = lastWeekMonday.Format("2006-01-02")
 	var weekDay = nextWeekMonday.Format("2006-01-02")
-	fmt.Println("weekmodonday", weekMonday)
-	fmt.Println("nextweeekday", weekDay)
+	//fmt.Println("weekmodonday", weekMonday)
+	//fmt.Println("nextweeekday", weekDay)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
 	//获取今日下机日期
 	order, _ := service.GetTodayDialysis(timeNowUnix.Unix(), patient_id)
-
+	devicenumber, _ := service.GetAllBedNumberListTwo(schedule[0].UserOrgId)
 	//获取今日的处方
 	prescription, _ := service.GetTodayPrescription(timeNowUnix.Unix(), patient_id)
 
 		return
 	}
 
-	var one = startTime.Unix() + 86400
+	var one = startTime.Unix()
 	fmt.Println("one2322332", one)
 	var two = one + 86400
 	var three = two + 86400
 	var lastsix = lastfive + 86400
 	var lastseven = lastsix + 86400
 
-	fmt.Println("各地好当家232332323232", lastseven)
 	array := []interface{}{
 		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(one, 10), "schedule_week": "1", "mode_id": "", "name": ""},
 		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(one, 10), "schedule_week": "1", "mode_id": "", "name": ""},
 		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(lastseven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
 		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(lastseven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
 	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":            schedule,
 		"array":           array,
 		"order":           order,
 		"patientSchedule": patientSchedule,
 		"prescription":    prescription,
+		"devicenumber":    devicenumber,
 	})
 }
 
 func (this *XcxApiController) GetMobileSchedule() {
 
 	patientID, _ := this.GetInt64("patient_id")
-	fmt.Println("1", patientID)
 	info, _ := service.GetXcxPatientInfo(patientID)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	time_now := time.Now().Format("2006-01-02")
 	timeNowUnix, _ := time.ParseInLocation(timeLayout+"15:04:05", time_now+"00:00:00", loc)
-
-	fmt.Println("timeNowUnix", timeNowUnix.Unix())
 	//获取该患者最后一次排班
 	list, _ := service.GetLastScheduleListOne(patientID, timeNowUnix.Unix())
-	fmt.Println("hh2332323232323223", list)
-	fmt.Println("list233232232332", list.ScheduleDate)
+
 	patient, getPatientErr := service.MobileGetPatientDetail(info.UserOrgId, patientID)
 	if getPatientErr != nil {
 		this.ErrorLog("获取患者信息失败：%v", getPatientErr)
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
 	info, _ := service.GetXcxPatientInfo(patient_id)
-	config, _ := service.GetDoctorAdviceConfig(info.UserOrgId)
-	fmt.Println(startTime, endTime, config.IsOpenRemind)
-	if config.IsOpenRemind == 0 || config.IsOpenRemind == 2 {
+	_, config := service.FindXTHisRecordByOrgId(info.UserOrgId)
+	fmt.Println(startTime, endTime, config.IsOpen)
+	if config.IsOpen == 0 {
 		list, _ := service.GetDoctorAdviceGroup(patient_id, startTime.Unix(), endTime.Unix())
 		advice, _ := service.GetDoctorAdvice(patient_id, startTime.Unix(), endTime.Unix())
 		for _, item := range list {
 		})
 	}
 
-	if config.IsOpenRemind == 1 {
+	if config.IsOpen == 1 {
 		list, _ := service.GetHisDoctorAdviceGroup(patient_id, startTime.Unix(), endTime.Unix())
 		advice, _ := service.GetHisDoctorAdvice(patient_id, startTime.Unix(), endTime.Unix())
 		for _, item := range list {
 
 func (this *XcxApiController) GetInspectionList() {
 
-	start_time := this.GetString("start_time")
-	end_time := this.GetString("end_time")
-	patient_id, _ := this.GetInt64("patient_id")
-	fmt.Println("patient_id", patient_id)
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	page, _ := this.GetInt64("page", 0)
+	number, _ := this.GetInt64("number", 10)
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	//fmt.Println("patient_id", patient_id)
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	//endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 
-	list, _ := service.GetInspectionGroupList(patient_id, startTime.Unix(), endTime.Unix())
+	list, err := service.GetInspectionGroupListByXcx(patient_id, page, number)
 
-	insepctionList, _ := service.GetInsepctionList(patient_id, startTime.Unix(), endTime.Unix())
+	if err == gorm.ErrRecordNotFound {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"error_code": "1001",
+			"error_msg":  "没有更多数据",
+		})
+	}
 
-	for _, item := range list {
-		for _, it := range insepctionList {
-			if item.ProjectId == it.ProjectId && item.InspectDate == it.InspectDate {
-				item.Childs = append(item.Childs, it)
-			}
-		}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"error_code": "0",
+		"error_msg":  "",
+		"list":       list,
+	})
+}
+
+func (this *XcxApiController) GetInspectionInfo() {
+
+	project_id, _ := this.GetInt64("project_id", 0)
+	inspect_date, _ := this.GetInt64("inspect_date", 0)
+	patient_id, _ := this.GetInt64("patient_id", 0)
+
+	if project_id <= 0 || inspect_date <= 0 || patient_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"error_code": 1001,
+			"error_msg":  "缺少参数",
+		})
 	}
 
+	list, _ := service.GetInspectionInfoByXcx(patient_id, project_id, inspect_date)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
 		"total": total,
 	})
 }
+
+func (this *XcxApiController) GetAppId() {
+
+	var appid = "wxcdf53b48b7df107e"
+	var secret = "94e944a69ad1d43ac447f5a8769ab801"
+	var grant_type = "authorization_code"
+	code := this.GetString("js_code")
+	//var code = "041pXnGa1eLxTB0iypFa1W6USs1pXnGK"
+
+	openId, _ := service.SendWxAuthAPI(appid, secret, grant_type, code)
+	//session_key, _ := service.SendWxAuthAPIOne(appid, secret, grant_type, code)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data": openId,
+		//"session_key": session_key,
+	})
+}

main.go

 }
 
 func main() {
-	//service.BeginAutoCreateWeekSchedulesJob()
-	//service.BeginAutoCreateWeekDisinfectionJob()
-	//service.BeginAutoCreatePlanJob()
-	//service.AutoClearSchedules()
-	//service.BeginAutoCreateStaffScheduleJob()
 	beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 60
 	beego.Run()
 }

models/dialysis.go

 	return "xt_schedule"
 }
 
+type PredialysisEvaluationOne struct {
+	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightBefore   float64 `gorm:"column:weight_before" json:"weight_before"`
+}
+
+func (PredialysisEvaluationOne) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+type PredialysisEvaluationThree struct {
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+}
+
+func (PredialysisEvaluationThree) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+type PredialysisEvaluationTwo struct {
+	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	DryWeight      float64 `gorm:"column:dry_weight" json:"dry_weight"`
+}
+
+func (PredialysisEvaluationTwo) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
 type PredialysisEvaluation struct {
 	ID                          int64   `gorm:"column:id" json:"id"`
 	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id"`
 	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii"`
 	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment"`
 	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other"`
-	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count"`
+	DialysisCount                  string  `gorm:"column:dialysis_count" json:"dialysis_count"`
 	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type"`
 	LastPostDialysisOther          string  `gorm:"column:last_post_dialysis_other" json:"last_post_dialysis_other"`
 	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other"`
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other"`
-	HumorExcessiveSymptom          int64   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
+	HumorExcessiveSymptom          string  `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
 	Phinholing                     string  `gorm:"column:pinholing" json:"pinholing" form:"pinholing"`
 	CatheterSuture                 string  `gorm:"column:catheter_suture" json:"catheter_suture" form:"catheter_suture"`
 	CatheterSutureOther            string  `gorm:"column:catheter_suture_other" json:"catheter_suture_other" form:"catheter_suture_other"`
 	return "xt_assessment_before_dislysis"
 }
 
-//更改的地方
+// 更改的地方
 type DoctorAdvices struct {
 	ID                         int64           `gorm:"column:id" json:"id" form:"id"`
 	GroupNo                    int64           `gorm:"column:groupno" json:"groupno" form:"groupno"`
 	return "xt_double_check"
 }
 
+type AssessmentAfterDislysisOne struct {
+	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightAfter    float64 `gorm:"column:weight_after" json:"weight_after"`
+}
+
+func (AssessmentAfterDislysisOne) TableName() string {
+	return "xt_assessment_after_dislysis"
+}
+
+type AssessmentAfterDislysisTwo struct {
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+}
+
+func (AssessmentAfterDislysisTwo) TableName() string {
+	return "xt_assessment_after_dislysis"
+}
+
 type AssessmentAfterDislysis struct {
 	ID                     int64   `gorm:"column:id" json:"id"`
 	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id"`
 	DialysisOrderId        int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
 	Temperature            float64 `gorm:"column:temperature" json:"temperature"`
 	PulseFrequency         float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate          float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	BreathingRate          string  `gorm:"column:breathing_rate" json:"breathing_rate"`
 	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	BloodPressureType      int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
 	Complication                    string  `gorm:"column:complication" json:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`
 	OperateTime                 int64   `gorm:"column:operate_time" json:"operate_time"`
 	MonitoringTime              string  `gorm:"column:monitoring_time" json:"monitoring_time"`
 	PulseFrequency              float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate               float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	BreathingRate               string  `gorm:"column:breathing_rate" json:"breathing_rate"`
 	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	BloodPressureType           int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`

models/schedule_models.go

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

models/xcx_user_models.go

 package models
 
+import "github.com/shopspring/decimal"
+
 type XcxAdminUserRole struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	PatientName string `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
-	IdCardNo    string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	Mobile      string `gorm:"column:mobile" json:"mobile" form:"mobile"`
-	Code        string `gorm:"column:code" json:"code" form:"code"`
-	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_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"`
-	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Appid       string `gorm:"column:appid" json:"appid" form:"appid"`
-	Appsecret   string `gorm:"column:appsecret" json:"appsecret" form:"appsecret"`
-	SessionKey  string `gorm:"column:session_key" json:"session_key" form:"session_key"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientName  string `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
+	Relationship string `gorm:"column:relationship" json:"relationship" form:"relationship"`
+	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Mobile       string `gorm:"column:mobile" json:"mobile" form:"mobile"`
+	Code         string `gorm:"column:code" json:"code" form:"code"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_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"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Appid        string `gorm:"column:appid" json:"appid" form:"appid"`
+	Appsecret    string `gorm:"column:appsecret" json:"appsecret" form:"appsecret"`
+	SessionKey   string `gorm:"column:session_key" json:"session_key" form:"session_key"`
+	Openid       string `gorm:"column:openid" json:"openid" form:"openid"`
 }
 
 func (XcxAdminUserRole) TableName() string {
 	ScheduleWeek int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
 	ModeId       int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 	Name         string `json:"name" form:"name"`
+	BedId        int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 }
 
 type BloodSchedule struct {
 	return "xt_gobal_template"
 }
 
+type GetHisName struct {
+	ID   int64  `gorm:"column:id" json:"id" form:"id"`
+	Name string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (GetHisName) TableName() string {
+	return "sgj_xt.xt_patients"
+}
+
+type Deposit 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
+	HisPatientId int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	Ctime        int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status       int64           `gorm:"column:status" json:"status" form:"status"`
+	Deposit      decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"` //押金
+}
+
+func (Deposit) TableName() string {
+	return "sgj_xt.his_deposit"
+}
+
+type DepositHistory 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
+	HisPatientId   int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	DepositCode    string          `gorm:"column:deposit_code" json:"deposit_code" form:"deposit_code"`
+	Deposit        decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"`                         //本次操作金额
+	SurplusDeposit decimal.Decimal `gorm:"column:surplus_deposit" json:"surplus_deposit" form:"surplus_deposit"` //剩余金额
+	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退款,4：退费
+	Status         int64           `gorm:"column:status" json:"status" form:"status"`
+	CreateId       int64           `gorm:"column:create_id" json:"create_id" form:"create_id"`
+	Ctime          int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	TrialStatus    int64           `gorm:"column:trial_status" json:"trial_status" form:"trial_status"` //审核状态0：未审核 ，1：已审核
+	Remarks        string          `gorm:"column:remarks" json:"remarks" form:"remarks"`                //备注
+}
+
+func (DepositHistory) TableName() string {
+	return "sgj_xt.his_deposit_history"
+}
+
 type XcxSchedule 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"`
 	return "xt_schedule"
 }
 
+type XcxInspectionTwo struct {
+	ID                  int64               `gorm:"column:id" json:"id" form:"id"`
+	PatientId           int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId               int64               `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId           int64               `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId              int64               `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName            string              `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName         string              `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType         int64               `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue        string              `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectTips         string              `gorm:"column:inspect_tips" json:"inspect_tips" form:"inspect_tips"`
+	InspectDate         int64               `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	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"`
+	InspectionReference InspectionReference `json:"inspection_reference" gorm:"foreignkey:OrgId,ProjectId,ItemId;AssociationForeignKey:OrgId,ProjectId,ItemId;"`
+}
+
+func (XcxInspectionTwo) TableName() string {
+	return "xt_inspection"
+}
+
 type XcxInspection struct {
 	ID           int64            `gorm:"column:id" json:"id" form:"id"`
 	PatientId    int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`

routers/router.go

 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		// AllowAllOrigins:  true,
-		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com", "http://xcx.sgjyun.com"},
+		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com", "https://api.shengws.com", "http://xcx.sgjyun.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission"},

service/auto_create_stock.go

 	//spec := "0 55 23 * * ?" // 每天23点55执行一次
 	//spec := "0 0 0 ? * Sun"
 	createStockCronJob.AddFunc(spec, func() {
+		utils.InfoLog("开启自动更新耗材库存定时任务1111111111111")
 		AutoCreateStockJob()
 	})
 }

service/dialysis_service.go

 	"github.com/jinzhu/gorm"
 )
 
-//GetPatientList 返回患者的列表
+// GetPatientList 返回患者的列表
 func GetSchedualPatientList(orgID int64, schedulDate int64, schedulType int64, partitionType int64, keywords string, page int64, limit int64) (schedule []*models.DialysisSchedule, err error) {
 	var total int64
 	//if len(keywords) > 0 {
 	return schedule, errors
 }
 
-//用户基本信息
+// 用户基本信息
 func FindPatientInfoById(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", "status = 1 AND org_id = ?", orgID).Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).Where("patient_id = ? AND user_org_id = ? AND schedule_date = ? ", id, orgID, time)
 	return
 }
 
-//透析处方
+// 透析处方
 func FindPatientPrescribeById(orgID int64, patientsId int64, recordDate int64) (patient models.DialysisPrescription, err error) {
 	err = readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id=? and status=1 and  record_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//透析方案中的透析处方
+// 透析方案中的透析处方
 func FindDialysisSolution(orgID int64, patientsId int64) (patient models.DialysisSolution, err error) {
 	err = readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id=? and status=1", patientsId, orgID).Last(&patient).Error
 	return
 }
 
-//透析方案中的透析模式
+// 透析方案中的透析模式
 func FindTreatmentModeById(modeId int64) (mode models.TreatmentMode, err error) {
 	err = readDb.Model(&models.TreatmentMode{}).Where("id = ? AND status=1", modeId).First(&mode).Error
 	return
 }
 
-//接诊评估
+// 接诊评估
 func FindReceiverTreatmentAccessRecordById(orgID int64, patientsId int64, recordDate int64) (receiveTreatmentAsses models.ReceiveTreatmentAsses, err error) {
 	err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id=? and status=1 and record_date = ?", patientsId, orgID, recordDate).First(&receiveTreatmentAsses).Error
 	return
 }
 
-//透前评估
+// 透前评估
 func FindPredialysisEvaluationById(orgID int64, patientsId int64, recordDate int64) (patient models.PredialysisEvaluation, err error) {
 	err = readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date = ?", patientsId, orgID, recordDate).First(&patient).Error
 	return
 	return dataconfig, err
 }
 
-//临时医嘱
+// 临时医嘱
 func FindDoctorAdviceById(orgID int64, patientsId int64, recordDate int64) (patient []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? AND  advice_type = 2", patientsId, orgID, recordDate).Find(&patient).Error
 	return
 	return order, total, err
 }
 
-//临时医嘱
+// 临时医嘱
 func FindDoctorAdviceOrderById(orgID int64, patientsId int64, recordDate int64) (patient []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? and advice_type = 2", patientsId, orgID, recordDate).
 	return
 }
 
-//双人核对
+// 双人核对
 func FindDoubleCheckById(orgID int64, patientsId int64, recordDate int64) (patient models.DoubleCheck, err error) {
 	err = readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? and user_org_id=? and status=1 and check_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//透析监测
+// 透析监测
 func FindAllMonitorRecord(orgID int64, patientsId int64, recordDate int64) (record []*models.MonitoringRecord, err error) {
 	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id=? and status=1 and monitoring_date = ?", patientsId, orgID, recordDate).Order("operate_time ASC").Find(&record).Error
 	return
 	return
 }
 
-//透后评估
+// 透后评估
 func FindAssessmentAfterDislysisById(orgID int64, patientsId int64, recordDate int64) (patient models.AssessmentAfterDislysis, err error) {
 	err = readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date =?", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//治疗小结
+// 治疗小结
 func FindTreatmentSummaryById(orgID int64, patientsId int64, recordDate int64) (patient models.TreatmentSummary, err error) {
 	err = readDb.Model(&models.TreatmentSummary{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//机构叫号配置
+// 机构叫号配置
 func FindQueueCallInfo(orgID int64) (queueConfig models.QueueCallConfig, err error) {
 	err = readDb.Model(&models.QueueCallConfig{}).Where("org_id=? ", orgID).First(&queueConfig).Error
 	return
 }
 
-//修改机构叫号配置
+// 修改机构叫号配置
 func UpDateQueueCallInfo(queueConfig models.QueueCallConfig) error {
 	err := writeDb.Save(&queueConfig).Error
 	return err
 }
 
-//所有设备信息
+// 所有设备信息
 func FindAllDeviceInfo(orgID int64) (device []*models.Device, err error) {
 	err = readDb.Model(&models.Device{}).Where("org_id=? and status=1 and device_type = 1", orgID).Find(&device).Error
 	return device, err
 }
 
-//所有设备区域
+// 所有设备区域
 func GetAllDeviceZone(orgId int64) (error, []*models.DeviceZone) {
 	var zone []*models.DeviceZone
 	err := readDb.Model(&zone).Where("org_id = ? AND status = 1", orgId).Find(&zone).Error
 	return err, zone
 }
 
-//获取所有子药物
+// 获取所有子药物
 func FindAllSubDoctorAdvice(id int64, parentId int64) (error, []models.DoctorAdvice) {
 	var subAdvies []models.DoctorAdvice
 	err := readDb.Model(&subAdvies).Where("patient_id = ? AND parent_id = ?", id, parentId).Find(&subAdvies).Error
 
 func FindAdivceById(orgId int64, patientId int64, id int64) (error, models.DoctorAdvice) {
 	advices := models.DoctorAdvice{}
-	err := readDb.Model(&advices).Where("user_org_id = ? AND patient_id = ? AND id = ? AND status = 1", orgId, patientId, id).Find(&advices).Error
+	err := readDb.Model(&advices).Where("user_org_id = ? AND patient_id = ? AND id = ? AND status = 6", orgId, patientId, id).Find(&advices).Error
 	return err, advices
 }
 
 	return errors
 }
 
-//修改透析处方
+// 修改透析处方
 func UpDateDialysisPrescription(dialysisPrescription *models.DialysisPrescription) error {
 	err := writeDb.Save(&dialysisPrescription).Error
 	return err
 }
 
-//修改接诊评估
+// 修改接诊评估
 func UpadateReceiveTreatmentAsses(receiveTreatmentAsses *models.ReceiveTreatmentAsses) error {
 	err := writeDb.Save(receiveTreatmentAsses).Error
 	return err
 }
 
-//修改透前评估
+// 修改透前评估
 func UpadatePredialysisEvaluation(predialysisEvaluation *models.PredialysisEvaluation) error {
 	err := writeDb.Save(&predialysisEvaluation).Error
 	return err
 }
 
-//修改双人核对
+// 修改双人核对
 func UpdateDoubleCheck(check *models.DoubleCheck) error {
 	err := writeDb.Save(&check).Error
 	return err
 }
 
-//修改透后评估
+// 修改透后评估
 func UpdateAssessmentAfterDislysisRecord(assessmentAfterDislysis *models.AssessmentAfterDislysis) error {
 	err := writeDb.Save(&assessmentAfterDislysis).Error
 	return err
 	return err
 }
 
-//修改
+// 修改
 func UpdateSummeRecord(treatmentSummary *models.TreatmentSummary) error {
 	err := writeDb.Save(&treatmentSummary).Error
 	return err
 }
 
-// func UpdateDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
-// 	tx := writeDb.Begin()
-// 	err := tx.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND id = ? AND status = 1 ", patientId, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1, "checker": m.Checker}).Error
-// 	if err != nil {
-// 		tx.Rollback()
-// 	}
-// 	tx.Commit()
-// 	return err
-// }
+//	func UpdateDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
+//		tx := writeDb.Begin()
+//		err := tx.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND id = ? AND status = 1 ", patientId, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1, "checker": m.Checker}).Error
+//		if err != nil {
+//			tx.Rollback()
+//		}
+//		tx.Commit()
+//		return err
+//	}
 func ExceDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	return err
 
 }
 
-//创建长期处方
+// 创建长期处方
 func CreateSolution(solution *models.DialysisSolution) {
 	writeDb.Create(&solution)
 }
 	return
 }
 
-//透析处方
+// 透析处方
 func FindDialysisPrescriptionByReordDate(id int64, recordDate int64, orgId int64) (error, *models.DialysisPrescription) {
 	dialysisPrescription := models.DialysisPrescription{}
 	err := readDb.Model(&dialysisPrescription).Where("patient_id = ? AND  record_date = ? AND status = 1 AND user_org_id = ? ", id, recordDate, orgId).Find(&dialysisPrescription).Error
 	return err, &receiveTreatmentAsses
 }
 
-//透前评估
+// 透前评估
 func FindPredialysisEvaluationByReordDate(id int64, recordDate int64, orgId int64) (error, *models.PredialysisEvaluation) {
 	dialysisEvaluation := models.PredialysisEvaluation{}
 	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? AND  assessment_date = ? AND status = 1 AND user_org_id = ?", id, recordDate, orgId).First(&dialysisEvaluation).Error
 	return err, &dialysisEvaluation
 }
 
-//双人核对
+// 双人核对
 func FindDoubleCheckByReordDate(id int64, recordDate int64, orgId int64) (error, *models.DoubleCheck) {
 	check := models.DoubleCheck{}
 	err := readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? AND  check_date = ? AND status = 1 AND user_org_id = ?", id, recordDate, orgId).First(&check).Error
 
 }
 
-//更新透析处方记录ID
+// 更新透析处方记录ID
 func UpDateRecordIdToDialysisPrescription(patientId int64, orgId int64, recordTime int64, recordId int64) error {
 	errors := writeDb.Model(&models.DialysisPrescription{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? ", orgId, patientId, recordTime).Updates(map[string]interface{}{"record_id": recordId}).Error
 	return errors
 	return errors
 }
 
-//透析处方
+// 透析处方
 func FindPatientPrescribeWidyDevideById(orgID int64, patientsId int64, recordDate int64) (patient models.DialysisPrescriptionAddtional, err error) {
 	err = readDb.Preload("Device", "status = 1 AND org_id = ?", orgID).
 		Model(&models.DialysisPrescriptionAddtional{}).
 	return role, err
 }
 
-/////////////// 新 18-10-22
+// ///////////// 新 18-10-22
 func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisScheduleVM, error) {
 	var vms []*MDialysisScheduleVM
 	db := readDb.
 }
 
 func FindLastMonitorRecordToday(patient_id int64, org_id int64, monitoring_date int64) (record models.MonitoringRecord, err error) {
-	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? AND status = 1 AND user_org_id = ? AND monitoring_date = ?", patient_id, org_id, monitoring_date).Last(&record).Error
+	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? AND status = 6 AND user_org_id = ? AND monitoring_date = ?", patient_id, org_id, monitoring_date).Last(&record).Error
 	return
 }
 
 func FindFirstMonitorRecordToday(patient_id int64, org_id int64, monitoring_date int64) (record models.MonitoringRecord, err error) {
-	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? AND status = 1 AND user_org_id = ? AND monitoring_date = ?", patient_id, org_id, monitoring_date).First(&record).Error
+	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? AND status = 6 AND user_org_id = ? AND monitoring_date = ?", patient_id, org_id, monitoring_date).First(&record).Error
 	return
 }
 
 func ExceDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_id int64) (err error) {
 	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ? AND status = 1 AND execution_state = 2", groupNo, org_id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ? AND status = 6 AND execution_state = 2", groupNo, org_id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	if err != nil {
 		ut.Rollback()
 		return
 func ExceOldDoctorAdvice(m *models.DoctorAdvice, advice_id int64) (err error) {
 
 	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id = ?", advice_id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 6   AND id = ?", advice_id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	if err != nil {
 		ut.Rollback()
 		return
 	}
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id = ?", advice_id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 6  AND parent_id = ?", advice_id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	if err != nil {
 		ut.Rollback()
 		return
 
 func CheckDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_id int64) (err error) {
 	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ?  AND status = 1 AND check_state = 0", groupNo, org_id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ?  AND status = 6 AND check_state = 0", groupNo, org_id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	if err != nil {
 		ut.Rollback()
 		return
 }
 
 func GetLastLongAdviceByGroupNo(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
-	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 6 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
 	return
 }
 
 func GetLastLongAdviceByGroupNoThree(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
-	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 6 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
 	return
 }
 

service/mobile_dialysis_service.go

 // 透析记录
 func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder
-	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
+	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 6", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 // 透析方案
 func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
 	var record models.DialysisSolution
-	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 6 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 
 func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
-	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 6  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 
 func MobileGetSystemDialysisPrescribeByModeId(orgID int64, mode_id int64) (*models.SystemPrescription, error) {
 	var record models.SystemPrescription
-	err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).First(&record).Error
+	err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 6  AND mode_id = ?", orgID, mode_id).First(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil

service/new_sms_service.go

 	redisClient := RedisClient()
 	defer redisClient.Close()
 	bytesPass, err := base64.StdEncoding.DecodeString(aespass)
+	utils.TraceLog("bytesPass:%v err:%v", bytesPass, err)
+	utils.TraceLog("aespass:%v", aespass)
 	if err != nil {
-		return &SMSServiceError{Err: "缺少关键参数"}
+		return &SMSServiceError{Err: "缺少关键参数1"}
 	}
 	tpass := utils.AESDecrypt(bytesPass)
 	if len(tpass) == 0 {
-		return &SMSServiceError{Err: "缺少关键参数"}
+		return &SMSServiceError{Err: "缺少关键参数2"}
 	}
 
 	cur_date := time.Now().Format("2006-01-02")
 	add_redis, err := redisClient.Get("ip:host_" + cur_date + "_" + tpass).Result()
 	if err != nil {
-		return &SMSServiceError{Err: "缺少关键参数"}
+		return &SMSServiceError{Err: "缺少关键参数3"}
 	}
 	ip_max_send_count, _ := beego.AppConfig.Int("ip_max_send_count")
 	if add_count, _ := strconv.Atoi(add_redis); add_count >= ip_max_send_count {

service/patientmanage_service.go

 func GetLastPassWayAssessment(orgid int64, patientId int64) (models.XtPatientVascularAccess, error) {
 
 	assessment := models.XtPatientVascularAccess{}
-	err := XTReadDB().Model(&assessment).Where("user_org_id = ? and patient_id = ? and status =1 and user_status = 1", orgid, patientId).Order("start_time desc").Last(&assessment).Error
+	err := XTReadDB().Model(&assessment).Where("user_org_id = ? and patient_id = ? and status =6 and user_status = 1", orgid, patientId).Order("start_time desc").Last(&assessment).Error
 	return assessment, err
 }
 

service/xcx_mobile_api_service.go

 	"errors"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"github.com/shopspring/decimal"
+	"net/http"
 	"time"
 )
 
+// 根据患者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
+	if err != nil {
+		return decimal.NewFromFloat(0)
+	}
+	return tmp.Deposit
+}
+
 func GetXcxMobileInformation(mobile string) (*models.XcxAdminUserRole, error) {
 	role := models.XcxAdminUserRole{}
 
 	return &role, nil
 }
 
+func GetXcxOpneidInformation(openid string) (*models.XcxAdminUserRole, error) {
+	role := models.XcxAdminUserRole{}
+
+	err := UserReadDB().Model(&role).Where("openid = ? and status = 1", openid).Find(&role).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	return &role, nil
+}
+
 func CreateXcxAdminUser(role models.XcxAdminUserRole) error {
 
 	err := UserReadDB().Create(&role).Error
 	return
 }
 
+// 获取本月的起止时间戳
+func GetMonth() (int64, int64) {
+	timeNow := time.Now()
+	timeToday := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location()) // 获取当天0点时间 time类型
+	timeMonthStartUnix1 := timeToday.AddDate(0, 0, -timeToday.Day()+1).Unix()                              // 获取本月第一天0点 时间戳类型
+	timeMonthEndUnix1 := timeToday.AddDate(0, 1, -timeToday.Day()+1).Unix() - 1                            // 获取下个月第一天/ 本月最后一天24点 时间戳类型
+	return timeMonthStartUnix1, timeMonthEndUnix1
+}
+
+// 押金流水
+func GetFlowList(patient_id, orgid, stime, etime int64) (deposit []models.DepositHistory, err error) {
+	err = XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and trial_status = 1 and user_org_id = ? and his_patient_id = ? and mtime >= ? and mtime <= ?", orgid, patient_id, stime, etime).Order("mtime desc").Find(&deposit).Error
+	return
+}
+
+// 获取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 GetPatientByIdXcx(patient_id int64) (*models.XcxPatients, error) {
+	patient := models.XcxPatients{}
+	err := XTReadDB().Model(&patient).Where("id =? and status = 1", patient_id).Find(&patient).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &patient, nil
+}
+
 func GetMobilePatient(mobile string, idcard string) (*models.XcxPatients, error) {
+	patient := models.XcxPatients{}
+	err := XTReadDB().Model(&patient).Where("(phone = ? or relative_phone =?) and id_card_no =?", mobile, mobile, idcard).Find(&patient).Error
+	//err := XTReadDB().Model(&patient).Where("id_card_no = ? and status = 1", mobile).Find(&patient).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &patient, nil
+}
 
+func GetPatientByIdcardno(idcard string) (*models.XcxPatients, error) {
 	patient := models.XcxPatients{}
-	err := XTReadDB().Model(&patient).Where("(phone = ? or relative_phone =?) and id_card_no = ?", mobile, mobile, idcard).Find(&patient).Error
+	err := XTReadDB().Model(&patient).Where("id_card_no =?", idcard).Find(&patient).Error
+	//err := XTReadDB().Model(&patient).Where("id_card_no = ? and status = 1", mobile).Find(&patient).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &patient, nil
+}
+
+func GetNamePatient(name string, idcard string) (*models.XcxPatients, error) {
 
+	patient := models.XcxPatients{}
+	err := XTReadDB().Model(&patient).Where("name = ? and id_card_no =?", name, idcard).Find(&patient).Error
+	//err := XTReadDB().Model(&patient).Where("id_card_no = ? and status = 1", mobile).Find(&patient).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
 	return encryptData, nil
 }
 
-//去除填充
+// 去除填充
 func PKCS7UnPadding(origData []byte) []byte {
 	length := len(origData)
 	unpadding := int(origData[length-1])
 	return origData[:(length - unpadding)]
 }
 
+func GetScheduleByXcx(orgID, start, end, patientID int64) (schedule []*models.ScheduleXcx, err error) {
+	err = readDb.Model(&models.ScheduleXcx{}).Where("user_org_id=? and patient_id=? and schedule_date>=? and schedule_date<=? and status=1", orgID, patientID, start, end).Find(&schedule).Error
+	return
+}
+
+func GetSignsByBlood(orgID, start, end, patientID int64) (schedule []*models.PredialysisEvaluationThree, err error) {
+	err = readDb.Model(&models.PredialysisEvaluationThree{}).Where("user_org_id=? and patient_id=? and assessment_date>=? and assessment_date<=? and status=1", orgID, patientID, start, end).Find(&schedule).Error
+	return
+}
+
+func GetSignsByWeight(orgID, start, end, patientID int64) (schedule []*models.PredialysisEvaluationOne, err error) {
+	err = readDb.Model(&models.PredialysisEvaluationOne{}).Where("user_org_id=? and patient_id=? and assessment_date>=? and assessment_date<=? and status=1", orgID, patientID, start, end).Find(&schedule).Error
+	return
+}
+
+func GetSignsByDryWeight(orgID, start, end, patientID int64) (schedule []*models.PredialysisEvaluationTwo, err error) {
+	err = readDb.Model(&models.PredialysisEvaluationTwo{}).Where("user_org_id=? and patient_id=? and assessment_date>=? and assessment_date<=? and status=1", orgID, patientID, start, end).Find(&schedule).Error
+	return
+}
+
+func GetSignsByAfterWeight(orgID, start, end, patientID int64) (record []*models.AssessmentAfterDislysisOne, err error) {
+	err = readDb.Model(&models.AssessmentAfterDislysisOne{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date >=?  and assessment_date <=?", patientID, orgID, start, end).Find(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return
+}
+
+func GetSignsByAfterBlood(orgID, start, end, patientID int64) (record []*models.AssessmentAfterDislysisTwo, err error) {
+	err = readDb.Model(&models.AssessmentAfterDislysisTwo{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date >=?  and assessment_date <=?", patientID, orgID, start, end).Find(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return
+}
+
 func GetScheduleInfo(startime int64, endtime int64, patient_id int64) (schedule []*models.VmBloodSchedule, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 		db = db.Where("x.patient_id = ?", patient_id)
 	}
 
-	err = db.Select("x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,t.name").Joins("left join xt_patients as t on t.id = x.patient_id").Scan(&schedule).Error
+	err = db.Select("x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,t.name,x.bed_id,x.user_org_id").Joins("left join xt_patients as t on t.id = x.patient_id").Scan(&schedule).Error
 	return schedule, err
 }
 
+func GetAllBedNumberListTwo(user_org_id int64) (list []*models.DeviceNumber, err error) {
+
+	err = XTReadDB().Where("org_id =? and status=1", user_org_id).Find(&list).Error
+
+	return list, err
+}
+
 func GetTodayDialysis(recordDate int64, patient_id int64) (models.XcXDialysisOrder, error) {
 
 	order := models.XcXDialysisOrder{}
 
 func GetDoctorAdviceGroup(patient_id int64, startime int64, endtime int64) (advice []*models.XcxDoctorAdvice, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and advice_date >=? and advice_date<=? and status = 1", patient_id, startime, endtime).Group("advice_date").Order("advice_date desc").Find(&advice).Error
+	err = XTReadDB().Where("patient_id = ? and advice_date >=? and advice_date<=? and status = 6", patient_id, startime, endtime).Group("advice_date").Order("advice_date desc").Find(&advice).Error
 	return advice, err
 }
 
 
 func GetDoctorAdvice(patient_id int64, startime int64, endtime int64) (advice []*models.XcxDoctorAdvice, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and advice_date >=? and advice_date<=? and status = 1", patient_id, startime, endtime).Find(&advice).Error
+	err = XTReadDB().Where("patient_id = ? and advice_date >=? and advice_date<=? and status = 6", patient_id, startime, endtime).Find(&advice).Error
 	return advice, err
 }
 
 	var vm MDialysisScheduleVM
 	err := readDb.
 		Table("xt_schedule").
-		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 6 AND org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ? AND patient_id = ?", orgID, patientID).
 		First(&vm).Error
 	if err != nil {
 // 接诊评估
 func MobileGetReceiverTreatmentAccessRecordOne(orgID int64, patientID int64, record_date int64) (*models.ReceiveTreatmentAsses, error) {
 	var record models.ReceiveTreatmentAsses
-	err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, record_date).Find(&record).Error
+	err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id = ? and status = 6 and record_date = ?", patientID, orgID, record_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 // 透前评估
 func MobileGetPredialysisEvaluationOne(orgID int64, patientID int64, assessment_date int64) (*models.PredialysisEvaluation, error) {
 	var record models.PredialysisEvaluation
-	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, assessment_date).Find(&record).Error
+	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 6 and assessment_date = ?", patientID, orgID, assessment_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 // 获取 maxDate 之前一次的透前评估记录
 func MobileGetLastTimePredialysisEvaluationOne(orgID int64, patientID int64) (*models.PredialysisEvaluation, error) {
 	var record models.PredialysisEvaluation
-	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Order("assessment_date desc").Last(&record).Error
+	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 6", patientID, orgID).Order("assessment_date desc").Last(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 	var records []*models.DoctorAdvice
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
-		Where("patient_id = ? and user_org_id = ? and status = 1  and (advice_type = 2 || advice_type = 3) and advice_date = ?", patientID, orgID, advicedate).
+		Where("patient_id = ? and user_org_id = ? and status = 6  and (advice_type = 2 || advice_type = 3) and advice_date = ?", patientID, orgID, advicedate).
 		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id,drug_name_id, IF(parent_id > 0, parent_id, id) as advice_order").
 		Order("start_time asc, groupno desc, advice_order desc, id asc").
 		Scan(&records).Error
 // 透析记录
 func MobileGetSchedualDialysisRecordOne(orgID int64, patientID int64, dialysis_date int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder
-	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1 ", orgID).Where("user_org_id = ? AND patient_id = ? and dialysis_date = ? ", orgID, patientID, dialysis_date).Find(&record).Error
+	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? and dialysis_date = ? and status =6", orgID, patientID, dialysis_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 // 双人核对
 func MobileGetDoubleCheckOne(orgID int64, patientID int64, check_date int64) (*models.DoubleCheck, error) {
 	var record models.DoubleCheck
-	err := readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? and user_org_id = ? and status = 1 and check_date = ?", patientID, orgID, check_date).Find(&record).Error
+	err := readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? and user_org_id = ? and status = 6 and check_date = ?", patientID, orgID, check_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 // 透析监测记录
 func MobileGetMonitorRecordsOne(orgID int64, patientID int64, monitoring_date int64) ([]*models.MonitoringRecord, error) {
 	var records []*models.MonitoringRecord
-	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, monitoring_date).Order("operate_time asc").Find(&records).Error
+	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 6 and monitoring_date = ?", patientID, orgID, monitoring_date).Order("operate_time asc").Find(&records).Error
 	if err != nil {
 		return nil, err
 	}
 
 func MobileGetLastMonitorRecordOne(orgID int64, patientID int64) (*models.MonitoringRecord, error) {
 	var record models.MonitoringRecord
-	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Order("operate_time desc").Last(&record).Error
+	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 6", patientID, orgID).Order("operate_time desc").Last(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 // 透后评估
 func MobileGetAssessmentAfterDislysisOne(orgID int64, patientID int64, assessment_date int64) (*models.AssessmentAfterDislysis, error) {
 	var record models.AssessmentAfterDislysis
-	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date =? ", patientID, orgID, assessment_date).Find(&record).Error
+	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 6 and assessment_date =? ", patientID, orgID, assessment_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 // 治疗小结
 func MobileGetTreatmentSummaryOne(orgID int64, patientID int64, assessment_date int64) (*models.TreatmentSummary, error) {
 	var record models.TreatmentSummary
-	err := readDb.Model(&models.TreatmentSummary{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date= ?", patientID, orgID, assessment_date).Find(&record).Error
+	err := readDb.Model(&models.TreatmentSummary{}).Where("patient_id = ? and user_org_id = ? and status = 6 and assessment_date= ?", patientID, orgID, assessment_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 
 func MobileGetDialysisPrescribeByModeIdFive(orgID int64, patientID int64, record_date int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
-	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, record_date).Find(&record).Error
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 6 and record_date = ?", patientID, orgID, record_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 	return schedule, err
 }
 
+func GetInspectionGroupListByXcx(patientid int64, page int64, number int64) (inspection []*models.XcxInspectionTwo, err error) {
+
+	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	offset := (page - 1) * number
+	//if startime > 0 {
+	//	db = db.Where("x.inspect_date >= ?", startime)
+	//}
+	//if endtime > 0 {
+	//	db = db.Where("x.inspect_date <= ?", endtime)
+	//}
+	err = db.Group("x.inspect_date,x.project_id").Order("x.created_time").Offset(offset).Limit(number).Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetInspectionInfoByXcx(patientid int64, project_id int64, inspect_date int64) (inspection []*models.XcxInspectionTwo, err error) {
+	err = XTReadDB().Model(&inspection).Where("(patient_id = ? and project_id = ? and inspect_date=?) and status = 1", patientid, project_id, inspect_date).Preload("InspectionReference", "status = 1").Find(&inspection).Error
+	return inspection, err
+}
+
 func GetInspectionGroupList(patientid int64, startime int64, endtime int64) (inspection []*models.XcxInspection, err error) {
 
 	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
 	err = UserReadDB().Model(&score).Where("activity_id = ?", activityID).Count(&total).Offset(offset).Limit(limit).Preload("SybStory").Find(&score).Error
 	return score, total, err
 }
+
+func SendWxAuthAPI(appID string, appSecret string, grant_type string, code string) (map[string]string, error) {
+
+	var code2sessionURL = "https://api.weixin.qq.com/sns/jscode2session?appid=" + appID + "&secret=" + appSecret + "&js_code=" + code + "&grant_type=" + grant_type
+	var url = fmt.Sprintf(code2sessionURL, appID, appSecret, code)
+	fmt.Println("url233232323322323", url)
+	resp, err := http.DefaultClient.Get(code2sessionURL)
+	fmt.Println("resp32332232332322", resp)
+
+	var wxMap map[string]string
+	err = json.NewDecoder(resp.Body).Decode(&wxMap)
+	if err != nil {
+		return wxMap, err
+	}
+	defer resp.Body.Close()
+
+	return wxMap, err
+}
+
+func SendWxAuthAPIOne(appID string, appSecret string, grant_type string, code string) (string, error) {
+	var code2sessionURL = "https://api.weixin.qq.com/sns/jscode2session?appid=" + appID + "&secret=" + appSecret + "&js_code=" + code + "&grant_type=" + grant_type
+	var url = fmt.Sprintf(code2sessionURL, appID, appSecret, code)
+	fmt.Println(url)
+	resp, err := http.DefaultClient.Get(code2sessionURL)
+	if err != nil {
+		return "", err
+	}
+	var wxMap map[string]string
+	err = json.NewDecoder(resp.Body).Decode(&wxMap)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+	fmt.Println("2333232232", wxMap)
+	return wxMap["session_key"], nil
+}