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

controllers/dialysis_api_controller.go

 	//push_the_protamine := c.GetString("push_the_protamine")
 	//fmt.Println("下机前推注鱼精蛋白",push_the_protamine)
 	// var prescription_doctor int64
+	blood := c.GetString("blood")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
 		PreImpulse:                 preImpules,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
+		Blood:                      blood,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
 
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
-
+	blood := c.GetString("blood")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
+		Blood:                     blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	assessment.SupineDiastolicBloodPressure = data.SupineDiastolicBloodPressure
 	assessment.DiastolicPressure = data.DiastolicPressure
 	assessment.AdditionalWeight = data.AdditionalWeight
+	assessment.OtherComplication = data.OtherComplication
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
 	edema := c.GetString("edema")
 	urine_volume, _ := c.GetFloat("urine_volume", 0)
 	special_treatment := c.GetString("special_treatment")
+	catheter_maintenance := c.GetString("catheter_maintenance")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
 		Edema:                          edema,
 		UrineVolume:                    urine_volume,
 		SpecialTreatment:               special_treatment,
+		CatheterMaintenance:            catheter_maintenance,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/his_api_controller.go

 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
 
 	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
 	beego.Router("/api/doctorworkstation/casehistory/get", &HisApiController{}, "get:GetHisPatientCaseHistory")
-	beego.Router("/api/doctorworkstation/casehistory/create", &HisApiController{}, "post:CreateHisPatientCaseHistory")
-	beego.Router("/api/doctorworkstation/casehistorytemplate/create", &HisApiController{}, "post:CreateCaseHistoryTemplate")
+	beego.Router("/api/doctorworkstation/casehistory/create", &HisApiController{}, "get:CreateHisPatientCaseHistory")
+	beego.Router("/api/doctorworkstation/casehistorytemplate/create", &HisApiController{}, "get:CreateCaseHistoryTemplate")
 	beego.Router("/api/doctorworkstation/casehistorytemplate/get", &HisApiController{}, "get:GetCaseHistoryTemplate")
-	beego.Router("/api/doctorworkstation/printcasehistory/get", &HisApiController{}, "get:GetPrintHisPatientCaseHistory")
+	//beego.Router("/api/doctorworkstation/printcasehistory/get", &HisApiController{}, "get:GetPrintHisPatientCaseHistory")
 
 	beego.Router("/api/hisorder/list", &HisApiController{}, "get:GetHisOrderList")
 
 }
 
 func (c *HisApiController) CreateHisPatientCaseHistory() {
-	diagnostic := c.GetString("diagnostic")
-	temperature, _ := c.GetFloat("temperature")
-	blood_sugar, _ := c.GetFloat("blood_sugar")
-	pulse, _ := c.GetFloat("pulse")
-	sbp, _ := c.GetFloat("sbp")
-	dbp, _ := c.GetFloat("dbp")
-	blood_fat, _ := c.GetFloat("blood_fat")
-	height, _ := c.GetFloat("height")
-	sick_type, _ := c.GetInt64("sick_type")
-	symptom := c.GetString("symptom")
-	sick_date := c.GetString("sick_date")
-	is_infect, _ := c.GetInt64("is_infect")
+
+	blood_fat := c.GetString("blood_fat")
+	bloodfatfloat, _ := strconv.ParseFloat(blood_fat, 64)
+	fmt.Println("33333333", bloodfatfloat)
+	blood_sugar := c.GetString("blood_sugar")
+	bloodsugarfloat, _ := strconv.ParseFloat(blood_sugar, 64)
+	fmt.Println(bloodsugarfloat)
 	chief_conplaint := c.GetString("chief_conplaint")
+
+	dbp := c.GetString("dbp")
+	dbpfloat, _ := strconv.ParseFloat(dbp, 64)
+	delivery_way, _ := c.GetInt64("delivery_way")
+	diagnostic := c.GetString("diagnostic")
+	fmt.Println("diagnostic", diagnostic)
+	family_history := c.GetString("family_history")
+	fmt.Println(family_history)
+	height := c.GetString("height")
 	history_of_present_illness := c.GetString("history_of_present_illness")
+	is_infect, _ := c.GetInt64("is_infect")
+	fmt.Println("is", is_infect)
 	past_history := c.GetString("past_history")
+	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	fmt.Println("patient_id", patient_id)
 	personal_history := c.GetString("personal_history")
-	family_history := c.GetString("family_history")
+	pulse := c.GetString("pulse")
+	pulsefloat, _ := strconv.ParseFloat(pulse, 64)
+	sbp := c.GetString("sbp")
+	sbpfloat, _ := strconv.ParseFloat(sbp, 64)
+	heightfloat, _ := strconv.ParseFloat(height, 64)
+	sicktype := c.GetString("sick_type")
+	fmt.Println("sicketype", sicktype)
+	sick_type, _ := strconv.ParseInt(sicktype, 10, 64)
+	symptom := c.GetString("symptom")
+	sick_date := c.GetString("sick_date")
+	temperatures := c.GetString("temperature")
+	fmt.Println("temperatures", temperatures)
+	temperature, _ := strconv.ParseFloat(temperatures, 64)
 	record_date := c.GetString("record_date")
-	patient_id, _ := c.GetInt64("patient_id")
+	breathing := c.GetString("breathing")
+	doctor_advice := c.GetString("doctor_advice")
+	remark := c.GetString("remark")
+	breathingfloat, _ := strconv.ParseFloat(breathing, 64)
+	fmt.Println("breathingfloat", breathingfloat)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	sickTimes := sickTime.Unix()
 	ctime := time.Now().Unix()
 	caseHistory := models.HisPatientCaseHistory{
-		HisPatientId:            patient_id,
+		HisPatientId:            his_patient_id,
+		PatientId:               patient_id,
 		Temperature:             temperature,
-		BloodSugar:              blood_sugar,
-		Pulse:                   pulse,
-		Sbp:                     sbp,
-		Dbp:                     dbp,
-		Height:                  height,
-		BloodFat:                blood_fat,
+		BloodSugar:              bloodsugarfloat,
+		Pulse:                   pulsefloat,
+		Sbp:                     sbpfloat,
+		Dbp:                     dbpfloat,
+		Height:                  heightfloat,
+		BloodFat:                bloodfatfloat,
 		SickType:                sick_type,
 		Symptom:                 symptom,
 		SickDate:                sickTimes,
 		Ctime:                   ctime,
 		Mtime:                   ctime,
 		RecordDate:              recordDateTime,
+		DeliveryWay:             delivery_way,
+		Breathing:               breathingfloat,
+		DoctorAdvice:            doctor_advice,
+		Remark:                  remark,
 	}
-	err = service.SaveHisPatientCaseHistory(caseHistory)
-	if err != nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "保存成功",
-		})
+
+	//查询该患者是否有病历
+	_, errcode := service.GetHisPatientCaseHistoryById(his_patient_id)
+	if errcode == gorm.ErrRecordNotFound {
+		err = service.SaveHisPatientCaseHistory(caseHistory)
+		if err != nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "保存成功",
+			})
+		}
+	} else if errcode == nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
 	}
+
 }
 func (c *HisApiController) GetHisPatientCaseHistoryList() {
 	patient_id, _ := c.GetInt64("patient_id", 0)
 }
 func (c *HisApiController) CreateCaseHistoryTemplate() {
 	template_name := c.GetString("template_name")
+	fmt.Println("template_name22222222222222", template_name)
 	template_remark := c.GetString("template_remark")
 	doctor := c.GetAdminUserInfo().AdminUser.Id
 	diagnostic := c.GetString("diagnostic")
-	chief_conplaint := c.GetString("chief_conplaint")
+	chief_conplaint := c.GetString("chief_conplain")
 	history_of_present_illness := c.GetString("history_of_present_illness")
 	past_history := c.GetString("past_history")
 	personal_history := c.GetString("personal_history")
 	family_history := c.GetString("family_history")
-	record_date := c.GetString("record_date")
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-
-	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	recordDateTime := theTime.Unix()
+	user_name := c.GetString("user_name")
+	//record_date := c.GetString("record_date")
+	//fmt.Println("record_date--------",record_date)
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//
+	//theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	//if err != nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	//recordDateTime := theTime.Unix()
 
 	ctime := time.Now().Unix()
 
 		Status:                  1,
 		Ctime:                   ctime,
 		Mtime:                   ctime,
-		RecordDate:              recordDateTime,
+		RecordDate:              time.Now().Unix(),
 		TemplateName:            template_name,
 		TemplateRemark:          template_remark,
 		Creator:                 doctor,
 		Modifier:                doctor,
+		UserName:                user_name,
 	}
 
-	err = service.SaveHisPatientCaseHistoryTemplate(template)
+	err := service.SaveHisPatientCaseHistoryTemplate(template)
 
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 
 }
 func (c *HisApiController) GetCaseHistoryTemplate() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := c.GetString("keyword")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	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)
 	admin := c.GetAdminUserInfo()
-	template, _ := service.GetHisPatientCaseHistoryTemplate(admin.CurrentOrgId)
+	template, _ := service.GetHisPatientCaseHistoryTemplate(admin.CurrentOrgId, startTime.Unix(), endTime.Unix(), keyword)
+	history, _ := service.GetHisPatientCaseHistory(admin.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"template": template,
+		"history":  history,
 	})
 
 }
 
 }
 
-func (c *HisApiController) GetPrintHisPatientCaseHistory() {
-
-}
+//func (c *HisApiController) GetPrintHisPatientCaseHistory() {
+//
+//}
 func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo, json map[string]interface{}) int {
 
 	if json["drug_name"] == nil || reflect.TypeOf(json["drug_name"]).String() != "string" {

controllers/his_project_api_controller.go

 	beego.Router("/api/his/getprojectlistbyid", &HisProjectApiController{}, "Get:GetProjectListById")
 	beego.Router("/api/his/gethispatienthistory", &HisProjectApiController{}, "Get:GetHisPatientHistory")
 	beego.Router("/api/patient/changepatient", &HisProjectApiController{}, "Get:ChangePatient")
+
+	beego.Router("/api/patient/getpatientcasehistory", &HisProjectApiController{}, "Get:GetPatientcaseHistory")
+	beego.Router("/api/doctorworkstation/gettemplatedetail", &HisProjectApiController{}, "Get:GetTemplateDetail")
+	beego.Router("/api/doctorworkstation/updaterecordtemplate", &HisProjectApiController{}, "Get:UpdateRecordTemplate")
 }
 
 func (this *HisProjectApiController) SaveProject() {
 		})
 		return
 	} else if errcode == nil {
-		fmt.Println("3333")
+
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	is_charge, _ := this.GetInt64("is_charge")
+	fmt.Println("is_charge====================", is_charge)
 	is_start, _ := this.GetInt64("is_start")
+	fmt.Println("is_start--------------------", is_start)
 	keyword := this.GetString("keyword")
 	projecList, total, err := service.GetHisProjectList(orgId, limit, page, is_charge, is_start, keyword)
 	fmt.Println("err", err)
 	}
 
 }
+
+func (this *HisProjectApiController) GetPatientcaseHistory() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	patient, _ := service.GetBloodPatientInfoById(patient_id)
+	history, err := service.GetPatientCaseHistory(patient_id)
+	hispatient, _ := service.GetHisPatientById(patient_id)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient":    patient,
+		"history":    history,
+		"hispatient": hispatient,
+	})
+}
+
+func (this *HisProjectApiController) GetTemplateDetail() {
+
+	id, _ := this.GetInt64("id")
+	templateDetail, err := service.GetTemplateDetail(id)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"templateDetail": templateDetail,
+	})
+}
+
+func (this *HisProjectApiController) UpdateRecordTemplate() {
+	id, _ := this.GetInt64("id")
+	template_name := this.GetString("template_name")
+	fmt.Println("template_name22222222222222", template_name)
+	template_remark := this.GetString("template_remark")
+
+	diagnostic := this.GetString("diagnostic")
+	chief_conplaint := this.GetString("chief_conplaint")
+	history_of_present_illness := this.GetString("history_of_present_illness")
+	past_history := this.GetString("past_history")
+	personal_history := this.GetString("personal_history")
+	family_history := this.GetString("family_history")
+	adminUserInfo := this.GetAdminUserInfo()
+	creater := adminUserInfo.AdminUser.Id
+	historyTemplate := models.HisCaseHistoryTemplate{
+		HistoryOfPresentIllness: history_of_present_illness,
+		PastHistory:             past_history,
+		ChiefConplaint:          chief_conplaint,
+		PersonalHistory:         personal_history,
+		FamilyHistory:           family_history,
+		Diagnostic:              diagnostic,
+		Status:                  1,
+		Mtime:                   time.Now().Unix(),
+		RecordDate:              time.Now().Unix(),
+		TemplateName:            template_name,
+		TemplateRemark:          template_remark,
+		Modifier:                creater,
+	}
+	err := service.UpdateCaseHistoryTemplate(&historyTemplate, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"templateDetail": historyTemplate,
+	})
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

 		"servicetime": serviceTime,
 	})
 }
+
+func (c *CheckWeightApiController) GetPatientListForSchedules() {
+	thisTime := time.Now()
+	scheduleDateStart := thisTime.Format("2006-01-02") + " 00:00:00"
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStartTime, _ := time.ParseInLocation(timeLayout, scheduleDateStart, loc)
+	syncTime := theStartTime.Unix()
+	adminUserInfo := c.GetMobileAdminUserInfo()
+	patientList, total, error := service.GetPatientListBySchedules(adminUserInfo.Org.Id, syncTime)
+	patientSchedule := make([]map[string]interface{},0)
+	for _, item := range patientList {
+		patientTemp := make(map[string]interface{})
+		patientTemp["patient_id"] = item.PatientId
+		patientTemp["patient_name"] = item.Patient.Name
+		patientTemp["schedule_type"] = item.ScheduleType
+		patientSchedule = append(patientSchedule, patientTemp)
+	}
+
+	if error != nil {
+		c.ErrorLog("获取病人列表失败:%v", error)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	serviceTime := time.Now().Unix()
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patientlist": patientSchedule,
+		"total":       total,
+		"servicetime": serviceTime,
+	})
+}
+
+
 func (c *CheckWeightApiController) GetPatientListById() {
 	patientId, _ := c.GetInt64("patient_id", 0)
 	if patientId <= 0 {

controllers/mobile_api_controllers/dialysis_api_controller.go

 	setting_pressure := c.GetString("setting_pressure")
 	supine_diastolic_blood_pressure := c.GetString("supine_diastolic_blood_pressure")
 	diastolic_pressure := c.GetString("diastolic_pressure")
+	other_complication := c.GetString("other_complication")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 		SupineSystolicBloodPressure:  supine_systolic_blood_pressure,
 		SettingPressure:              setting_pressure,
 		DiastolicPressure:            diastolic_pressure,
+		OtherComplication:            other_complication,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	fmt.Println("预冲量====", pre_impulse)
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
-
+	blood := c.GetString("blood")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
 		PreImpulse:                 pre_impulse,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
+		Blood:                      blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
-
+	blood := c.GetString("blood")
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
 		ALiquid:                   a_liquid,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
+		Blood:                     blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)

controllers/mobile_api_controllers/mobile_api_router_register.go

 	beego.Router("/m/api/savebloodpressure", &CheckWeightApiController{}, "Post:SaveBloodPressure")
 	beego.Router("/m/api/checkbeforedialysis", &CheckWeightApiController{}, "get:GetPatientInfoBeforeDialysis")
 	beego.Router("/m/api/getpatientlist", &CheckWeightApiController{}, "get:GetPatientList")
+	beego.Router("/m/api/getschedulepatient", &CheckWeightApiController{}, "get:GetPatientListForSchedules")
 	beego.Router("/m/api/getpatientinfo", &CheckWeightApiController{}, "get:GetPatientListById")
 	beego.Router("/m/api/checkdialysis", &CheckWeightApiController{}, "get:GetPatientInfoDialysis")
 	beego.Router("/m/api/savecheckdialysis", &CheckWeightApiController{}, "Post:SavePatientInfoDialysis")

controllers/mobile_api_controllers/patient_api_controller.go

 		evaluation.SpecialTreatment = specialTreatment
 	}
 
+	if dataBody["catheter_maintenance"] != nil && reflect.TypeOf(dataBody["catheter_maintenance"]).String() == "string" {
+		catheter_maintenance := dataBody["catheter_maintenance"].(string)
+		evaluation.CatheterMaintenance = catheter_maintenance
+	}
+
 	return
 }
 

models/dialysis.go

 	UrineVolume                    float64 `gorm:"column:urine_volume" json:"urine_volume" form:"urine_volume"`
 	Edema                          string  `gorm:"column:edema" json:"edema" form:"edema"`
 	SpecialTreatment               string  `gorm:"column:special_treatment" json:"special_treatment" form:"special_treatment"`
+	CatheterMaintenance            string  `gorm:"column:catheter_maintenance" json:"catheter_maintenance" form:"catheter_maintenance"`
 }
 
 func (PredialysisEvaluation) TableName() string {
 	SettingPressure                 string  `gorm:"column:setting_pressure" json:"setting_pressure" form:"setting_pressure"`
 	SupineDiastolicBloodPressure    string  `gorm:"column:supine_diastolic_blood_pressure" json:"supine_diastolic_blood_pressure" form:"supine_diastolic_blood_pressure"`
 	DiastolicPressure               string  `gorm:"column:diastolic_pressure" json:"diastolic_pressure" form:"diastolic_pressure"`
+	OtherComplication               string  `gorm:"column:other_complication" json:"other_complication" form:"other_complication"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
 }
 
 type QueueCallConfig struct {
-	ID         	int64 `gorm:"column:id" json:"id" form:"id"`
-	OrgId     	int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Qhsj  		int64 `gorm:"column:qhsj" json:"qhsj" form:"qhsj"`
-	Jzdcbbcs	int64 `gorm:"column:jzdcbbcs" json:"jzdcbbcs" form:"jzdcbbcs"`
-	Jzbbsy		int64 `gorm:"column:jzbbsy" json:"jzbbsy" form:"jzbbsy"`
-	Jzjhyc		int64 `gorm:"column:jzjhyc" json:"jzjhyc" form:"jzjhyc"`
-	Sjdcbbcs 	int64 `gorm:"column:sjdcbbcs" json:"sjdcbbcs" form:"sjdcbbcs"`
-	Sjbbsy 		int64 `gorm:"column:sjbbsy" json:"sjbbsy" form:"sjbbsy"`
-	Sjjhyc		int64 `gorm:"column:sjjhyc" json:"sjjhyc" form:"sjjhyc"`
-	Txxqyxs		int64 `gorm:"column:txxqyxs" json:"txxqyxs" form:"txxqyxs"`
-	Txglsyxs	int64 `gorm:"column:txglsyxs" json:"txglsyxs" form:"txglsyxs"`
-	CreateTime	int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
-	UpdateTime  int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
-
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Qhsj       int64 `gorm:"column:qhsj" json:"qhsj" form:"qhsj"`
+	Jzdcbbcs   int64 `gorm:"column:jzdcbbcs" json:"jzdcbbcs" form:"jzdcbbcs"`
+	Jzbbsy     int64 `gorm:"column:jzbbsy" json:"jzbbsy" form:"jzbbsy"`
+	Jzjhyc     int64 `gorm:"column:jzjhyc" json:"jzjhyc" form:"jzjhyc"`
+	Sjdcbbcs   int64 `gorm:"column:sjdcbbcs" json:"sjdcbbcs" form:"sjdcbbcs"`
+	Sjbbsy     int64 `gorm:"column:sjbbsy" json:"sjbbsy" form:"sjbbsy"`
+	Sjjhyc     int64 `gorm:"column:sjjhyc" json:"sjjhyc" form:"sjjhyc"`
+	Txxqyxs    int64 `gorm:"column:txxqyxs" json:"txxqyxs" form:"txxqyxs"`
+	Txglsyxs   int64 `gorm:"column:txglsyxs" json:"txglsyxs" form:"txglsyxs"`
+	CreateTime int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
 }
 
 func (QueueCallConfig) TableName() string {

models/his_models.go

 	TemplateRemark          string `gorm:"column:template_remark" json:"template_remark" form:"template_remark"`
 	Creator                 int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier                int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	UserName                string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 }
 
 func (HisCaseHistoryTemplate) TableName() string {
-	return "his_patient"
+	return "his_case_history_template"
 }
 
 type HisDoctorAdviceInfo struct {
 	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	RecordDate              int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DeliveryWay             int64   `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	Breathing               float64 `gorm:"column:breathing" json:"breathing" form:"breathing"`
+	DoctorAdvice            string  `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (HisPatientCaseHistory) TableName() string {

models/patient_models.go

 	PreImpulse                 float64       `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
 	AnticoagulantStopTimeMin   int64         `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
 	AnticoagulantStopTimeHour  int64         `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+	Blood                      string        `gorm:"column:blood" json:"blood"`
 }
 
 func (DialysisPrescription) TableName() string {

models/schedule_models.go

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

service/gdyb_service.go

 	return str
 }
 
+//  门诊结算撤销
+func Gdyb4101(psnNo string, mdtrtId string, setlId string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4101" // 交易编码
+
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID  必填（来自2201接口返回）
+	inputData["setl_id"] = setlId   // 结算 ID  必填
+	inputData["fixmedins_name"] = ""   // 定点医药机构名称  必填
+	inputData["fixmedins_code"] = ""   // 定点医药机构编码  必填
+	inputData["hi_setl_lv"] = ""   // 医保结算等级
+	inputData["hi_no"] = ""   // 医保编号
+	inputData["medcasno"] = ""   // 病案号  必填
+	inputData["dcla_time"] = ""   // 申报时间  必填
+	inputData["psn_name"] = ""   // 人员姓名  必填
+	inputData["gend"] = ""   // 性别  必填
+	inputData["brdy"] = ""   // 出生日期  必填
+	inputData["age"] = ""   // 年龄  必填
+	inputData["ntly"] = ""   // 国籍  必填
+	inputData["nwb_age"] = ""   // 年龄  必填
+	inputData["naty"] = ""   // 民族  必填
+	inputData["patn_cert_type"] = ""   // 患者证件类别  必填
+	inputData["certno"] = ""   // 证件号码  必填
+	inputData["prfs"] = ""   // 职业  必填
+	inputData["curr_addr"] = ""   // 现住址  必填
+	inputData["emp_name"] = ""   // 单位名称  必填
+	inputData["emp_addr"] = ""   // 单位地址  必填
+	inputData["emp_tel"] = ""   // 单位电话  必填
+	inputData["poscode"] = ""   // 邮编  必填
+	inputData["coner_name"] = ""   // 联系人姓名  必填
+	inputData["patn_rlts"] = ""   // 与患者关系  必填
+	inputData["coner_addr"] = ""   // 联系人地址  必填
+	inputData["coner_tel"] = ""   // 联系人电话  必填
+	inputData["hi_type"] = ""   // 医保类型  必填
+	inputData["insuplc"] = ""   // 参保地  必填
+	inputData["sp_psn_type"] = ""   // 特殊人员类型  必填
+	inputData["nwb_adm_type"] = ""   // 新生儿入院类型  必填
+	inputData["nwb_bir_wt"] = ""   // 新生儿出生体重  必填
+	inputData["nwb_adm_wt"] = ""   // 新生儿入院体重  必填
+	inputData["opsp_diag_caty"] = ""   // 门诊慢特病诊断  必填
+	inputData["opsp_mdtrt_date"] = ""   // 门诊慢特病就诊日期  必填
+	inputData["ipt_med_type"] = ""   // 住院医疗类型  必填
+	inputData["adm_way"] = ""   // 入院途径  必填
+	inputData["trt_type"] = ""   // 治疗类别  必填
+	inputData["adm_time"] = ""   // 入院时间  必填
+	inputData["adm_caty"] = ""   // 入院科别  必填
+	inputData["refldept_dept"] = ""   // 转科科别  必填
+	inputData["dscg_time"] = ""   // 出院时间  必填
+	inputData["dscg_caty"] = ""   // 出院科别  必填
+	inputData["act_ipt_days"] = ""   // 实际住院天数  必填
+	inputData["otp_wm_dise"] = ""   // 门（急） 诊西医诊断  必填
+	inputData["wm_dise_code"] = ""   // 门（急） 诊中医诊断  必填
+	inputData["otp_tcm_dise"] = ""   // 西医诊断疾病代码  必填
+	inputData["tcm_dise_code"] = ""   // 中医诊断代码  必填
+	inputData["oprn_oprt_code_cnt"] = ""   // 手术操作代码计数  必填
+	inputData["vent_used_dura"] = ""   // 呼吸机使用时长  必填
+	inputData["pwcry_bfadm_coma_dura"] = ""   // 颅脑损伤患者入院前昏迷时长  必填
+	inputData["pwcry_afadm_coma_dura"] = ""   // 颅脑损伤患者入院后昏迷时长  必填
+	inputData["bld_cat"] = ""   // 输血品种  必填
+	inputData["bld_amt"] = ""   // 输血量  必填
+	inputData["bld_unt"] = ""   // 输血计量单位  必填
+	inputData["spga_nurscare_days"] = ""   // 特级护理天数  必填
+	inputData["lv1_nurscare_days"] = ""   // 一级护理天数  必填
+	inputData["scd_nurscare_days"] = ""   // 二级护理天数  必填
+	inputData["lv3_nurscare_days"] = ""   // 三级护理天数  必填
+	inputData["acp_medins_name"] = ""   // 拟接收机构名称  必填
+	inputData["acp_optins_code"] = ""   // 拟接收机构代码  必填
+	inputData["bill_code"] = ""   // 票据代码  必填
+	inputData["bill_no"] = ""   // 票据号码  必填
+	inputData["biz_sn"] = ""   // 业务流水号  必填
+	inputData["days_rinp_flag_31"] = ""   // 出院 31 天内再住院计划标志  必填
+	inputData["days_rinp_pup_31"] = ""   // 出院 31 天内再住院目的  必填
+	inputData["chfpdr_name"] = ""   // 主诊医师姓名  必填
+	inputData["chfpdr_code"] = ""   // 主诊医师代码  必填
+	inputData["setl_begn_date"] = ""   // 结算开始日期  必填
+	inputData["setl_end_date"] = ""   // 结算结束日期  必填
+	inputData["psn_selfpay"] = ""   // 个人自付  必填
+	inputData["psn_ownpay"] = ""   // 个人自费  必填
+	inputData["acct_pay"] = ""   // 个人账户支出  必填
+	inputData["hi_paymtd"] = ""   // 医保支付方式  必填
+	inputData["hsorg"] = ""   // 医保机构  必填
+	inputData["hsorg_opter"] = ""   // 医保机构经办人  必填
+	inputData["medins_fill_dept"] = ""   // 医疗机构填报部门  必填
+	inputData["medins_fill_psn"] = ""   // 医疗机构填报人  必填
+
+	payinfo := make([]map[string]interface{},0)  // 基金支付信息
+	payinfotemp := make(map[string]interface{})
+	payinfotemp["fund_pay_type"] =  "" // 基金支付类型  必填
+	payinfotemp["fund_payamt"] = ""    // 基金支付金额
+	payinfo = append(payinfo,payinfotemp)
+
+	opspdiseinfo := make([]map[string]interface{},0) // 门诊慢特病诊断信息
+	opspdiseinfotemp := make(map[string]interface{})
+	opspdiseinfotemp["diag_name"] =  "" // 诊断名称  必填
+	opspdiseinfotemp["diag_code"] = ""    // 诊断代码 必填
+	opspdiseinfotemp["oprn_oprt_name"] = ""    // 手术操作名称 必填
+	opspdiseinfotemp["oprn_oprt_code"] = ""    // 手术操作代码 必填
+	opspdiseinfo = append(opspdiseinfo,opspdiseinfotemp)
+
+	diseinfo := make([]map[string]interface{},0) // 住院诊断信息
+	diseinfotemp := make(map[string]interface{})
+	diseinfotemp["diag_type"] =  "" // 诊断类别  必填
+	diseinfotemp["diag_code"] = ""    // 诊断代码 必填
+	diseinfotemp["diag_name"] = ""    // 诊断名称 必填
+	diseinfotemp["adm_cond_type"] = ""    // 入院病情类型 必填
+	diseinfo = append(diseinfo,diseinfotemp)
+
+	iteminfo := make([]map[string]interface{},0) // 住院诊断信息
+	iteminfotemp := make(map[string]interface{})
+	iteminfotemp["med_chrgitm"] =  "" // 医疗收费项目  必填
+	iteminfotemp["amt"] = ""    // 金额 必填
+	iteminfotemp["claa_sumfee"] = ""    // 甲类费用合计 必填
+	iteminfotemp["clab_amt"] = ""    // 乙类金额 必填
+	iteminfotemp["fulamt_ownpay_amt"] = ""    // 全自费金额 必填
+	iteminfotemp["oth_amt"] = ""    // 其他金额 必填
+	iteminfo = append(iteminfo,iteminfotemp)
+
+	oprninfo := make([]map[string]interface{},0) // 手术操作信息
+	oprninfotemp := make(map[string]interface{})
+	oprninfotemp["oprn_oprt_type"] =  "" // 手术操作类别  必填
+	oprninfotemp["oprn_oprt_name"] = ""    // 手术操作名称 必填
+	oprninfotemp["oprn_oprt_code"] = ""    // 手术操作代码 必填
+	oprninfotemp["oprn_oprt_date"] = ""    // 手术操作日期 必填
+	oprninfotemp["anst_way"] = ""    // 麻醉方式 必填
+	oprninfotemp["oper_dr_name"] = ""    // 术者医师姓名 必填
+	oprninfotemp["oper_dr_code"] = ""    // 术者医师代码 必填
+	oprninfotemp["anst_dr_name"] = ""    // 麻醉医师姓名 必填
+	oprninfotemp["anst_dr_code"] = ""    // 麻醉医师代码 必填
+	oprninfo = append(oprninfo,iteminfotemp)
+
+	icuinfo := make([]map[string]interface{},0) // 重症监护信息
+	icuinfotemp := make(map[string]interface{})
+	icuinfotemp["scs_cutd_ward_type"] =  "" // 重症监护病房类型  必填
+	icuinfotemp["scs_cutd_inpool_time"] = ""    // 重症监护进入时间 必填
+	icuinfotemp["scs_cutd_exit_time"] = ""    // 重症监护退出时间 必填
+	icuinfotemp["scs_cutd_sum_dura"] = ""    // 重症监护合计时长 必填
+	icuinfo = append(icuinfo,iteminfotemp)
+
+
+
+
+	input["setlinfo"] = inputData
+	input["payinfo"] = payinfo
+	input["opspdiseinfo"] = opspdiseinfo
+	input["diseinfo"] = diseinfo
+	input["iteminfo"] = iteminfo
+	input["oprninfo"] = oprninfo
+	input["icuinfo"] = icuinfo
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2208"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+
 // 生成签名
 func setSignature(timestamp int64, nonce string) string {
 	str := strconv.FormatInt(timestamp, 10) + SceretKey + nonce + strconv.FormatInt(timestamp, 10)

service/his_project_service.go

 		db = db.Where("x.user_org_id = ?", orgid)
 	}
 	if start > 0 {
-		db = db.Where("x.medical_status = ?", start)
+		db = db.Where("x.medical_status = ?", charge)
 	}
 	if charge > 0 {
-		db = db.Where("x.is_charge = ? ", charge)
+		db = db.Where("x.is_charge = ? ", start)
 	}
 	if len(keyword) > 0 {
 		db = db.Where("x.project_name like ?", likeKey)
 	err := XTWriteDB().Model(&hisPatient).Where("id = ? and user_org_id = ? and record_date = ?", hispatientid, orgid, recorddate).Updates(map[string]interface{}{"is_return": 3}).Error
 	return err
 }
+
+func GetBloodPatientInfoById(patientid int64) (models.XtPatients, error) {
+
+	patients := models.XtPatients{}
+	err := XTReadDB().Model(&patients).Where("id = ? and status = 1", patientid).Find(&patients).Error
+	return patients, err
+}
+
+func GetPatientCaseHistory(patientid int64) (models.HisPatientCaseHistory, error) {
+
+	history := models.HisPatientCaseHistory{}
+	err := XTReadDB().Model(&history).Where("patient_id = ? and status = 1", patientid).Find(&history).Error
+	return history, err
+}
+
+func GetHisPatientById(patientid int64) (models.HisPatient, error) {
+	patient := models.HisPatient{}
+	err := XTReadDB().Model(&patient).Where("patient_id = ? and status = 1", patientid).Find(&patient).Error
+	return patient, err
+}
+
+func GetTemplateDetail(id int64) (models.HisCaseHistoryTemplate, error) {
+
+	template := models.HisCaseHistoryTemplate{}
+	err := XTReadDB().Model(&template).Where("id= ? and status = 1", id).Find(&template).Error
+	return template, err
+}
+
+func UpdateCaseHistoryTemplate(tem *models.HisCaseHistoryTemplate, id int64) error {
+
+	err := XTWriteDB().Model(&tem).Where("id = ? ", id).Updates(map[string]interface{}{"history_of_present_illness": tem.HistoryOfPresentIllness, "past_history": tem.PastHistory, "chief_conplaint": tem.ChiefConplaint, "personal_history": tem.PersonalHistory, "family_history": tem.FamilyHistory, "diagnostic": tem.Diagnostic, "template_name": tem.TemplateName, "template_remark": tem.TemplateRemark, "modifier": tem.Modifier}).Error
+	return err
+}

service/his_service.go

 	return
 }
 
-func GetHisPatientCaseHistoryTemplate(org_id int64) (caseHistorys []*models.HisCaseHistoryTemplate, err error) {
+func GetHisPatientCaseHistoryTemplate(org_id int64, startime int64, endtime int64, keyword string) (caseHistorys []*models.HisCaseHistoryTemplate, err error) {
+	likekey := "%" + keyword + "%"
 	db := readDb.Model(&models.HisCaseHistoryTemplate{}).Where("user_org_id = ? AND status = 1", org_id)
+	if startime > 0 {
+		db = db.Where("record_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("record_date<=?", endtime)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("template_name like ? ", likekey)
+	}
 	err = db.Find(&caseHistorys).Error
 	return
 }
 
+func GetHisPatientCaseHistory(org_id int64) (caseHistory []*models.HisPatientCaseHistory, err error) {
+
+	err = readDb.Model(&models.HisPatientCaseHistory{}).Where("user_org_id = ? and status = 1", org_id).Find(&caseHistory).Error
+	return caseHistory, err
+}
+
 func SaveHisPatientCaseHistoryTemplate(template models.HisCaseHistoryTemplate) (err error) {
 	err = writeDb.Create(&template).Error
 	return
 }
 
+func GetHisPatientCaseHistoryById(hispatientid int64) (*models.HisPatientCaseHistory, error) {
+	history := models.HisPatientCaseHistory{}
+	err := XTReadDB().Model(&history).Where("his_patient_id = ? and status = 1", hispatientid).Find(&history).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, err
+		} else {
+			return nil, err
+		}
+	}
+	return &history, nil
+}
+
 func SaveHisPatientCaseHistory(caseHistory models.HisPatientCaseHistory) (err error) {
 	err = writeDb.Create(&caseHistory).Error
 	return

service/patient_service.go

 	return
 }
 
+func GetPatientListBySchedules(orgID int64, syncTime int64) (patients []*models.SchedulePatients, total int64, err error) {
+	db := readDb.Model(&models.SchedulePatients{}).Where("user_org_id=?  AND  status=1  AND  schedule_date = ?", orgID,syncTime).Preload("Patient", "status = 1 AND user_org_id = ? ", orgID,)
+	err = db.Count(&total).Find(&patients).Error
+	return
+}
+
 func GetPatientListById(orgID int64, patientId int64) (patients models.PatientListForFace, err error) {
 	err = readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=? and id = ? and status=1", orgID, patientId).First(&patients).Error
 	return