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

controllers/data_api_controller.go

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

controllers/doctors_api_controller.go

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

controllers/his_api_controller.go

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

controllers/his_config_api_controller.go

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

controllers/inspection_api_controller.go

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

controllers/mobile_api_controllers/check_api_controller.go

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

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

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

controllers/patient_dataconfig_api_controller.go

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

controllers/public_api_controller.go

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

models/his_charge_models.go

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

models/his_hospital_models.go

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

models/his_models.go

@@ -507,16 +507,17 @@ type TempHisOrder struct {
 	FaPiaoCode            string  `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber          string  `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
 
-	AdminUser         AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
-	IsUploadDiagnose  int64     `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
-	IsUploadOrderInfo int64     `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
-	IsUploadSuccess   int64     `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 
 	SettleType      int64  `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
 	SettleStartTime int64  `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
 	SettleEndTime   int64  `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
 	IsPre           int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	Diagnosis       string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 }
 
 func (TempHisOrder) TableName() string {

models/inspection_models.go

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

models/patient_models.go

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

service/app_version.go

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

service/device_service.go

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

service/his_config_service.go

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

service/inspection_service.go

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

service/patient_dataconfig_service.go

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

service/user_service.go

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