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

controllers/base_api_controller.go

 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 841
+		userAdmin.Id = 796
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 841 //4，809
+		userAdmin.Id = 796 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10537 //机构id 10344
+		subscibe.OrgId = 10138 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10537 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 841
+		userAdmin.Id = 796
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 841 //4，809
+		userAdmin.Id = 796 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10537 //机构id小英10344或4
+		subscibe.OrgId = 10138 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10537 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/dialysis_api_controller.go

 	}
 }
 
+func (c *DialysisAPIController) GetPrescriptionList() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	schedulelist, _ := service.GetMobileScheduleListOne(startTime, endTime, orgId)
+
+	fmt.Println("schedulelist22222222", schedulelist)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": schedulelist,
+	})
+	return
+
+}
+
 func (c *DialysisAPIController) BatchDeleteMonitor() {
 
 	ids := c.GetString("ids")

controllers/mobile_api_controllers/mobile_api_router_register.go

 
 	beego.Router("/m/api/getmobileprintstockgood", &DialysisAPIController{}, "Get:GetMobilePrintStockGood")
 
+	beego.Router("/m/api/getprescriptionlist", &DialysisAPIController{}, "Get:GetPrescriptionList")
+
 	//批量删除监测
 	beego.Router("/m/api/batchdeletemonitor", &DialysisAPIController{}, "Get:BatchDeleteMonitor")
 	//获取单个患者1年的透析日期

controllers/new_mobile_api_controllers/new_common_api_controller.go

 	})
 }
 
-func (this *NewCommonApiController) GetPrescriptionlist() {
+func (this *NewCommonApiController) GetPrescriptionlistOne() {
 
 	startime := this.GetString("startime")
 
 	startime := this.GetString("startime")
 
 	endtime := this.GetString("endtime")
-	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
-	fmt.Println("parseDateErr", parseDateErr)
+	startDate, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
+
 	statime := startDate.Unix()
 
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
 
 	entime := endDate.Unix()
 
-	fmt.Println(endtime)
 	limit, _ := this.GetInt64("limit")
 
 	page, _ := this.GetInt64("page")
 
 	patients, total, err := service.GetDialysisDetailById(id, orgId, statime, entime, limit, page)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

controllers/new_mobile_api_controllers/new_common_api_router.go

 	beego.Router("/m/api/getmobiletotalagecount", &NewCommonApiController{}, "Get:GetMobileTotalAgeCount")
 	beego.Router("/m/api/getmobiletotaldialysiscount", &NewCommonApiController{}, "Get:GetMobileTotalDialysisCount")
 	beego.Router("/m/api/gemobilepatientlist", &NewCommonApiController{}, "Get:GetMobilePatientList")
-	beego.Router("/m/api/getprescriptionlist", &NewCommonApiController{}, "Get:GetPrescriptionlist")
+	beego.Router("/m/api/getprescriptionlist/one", &NewCommonApiController{}, "Get:GetPrescriptionlistOne")
 	beego.Router("/m/api/getmobilepatientdetail", &NewCommonApiController{}, "Get:GetMobilePatientDetail")
 	beego.Router("/m/api/tosearchpatient", &NewCommonApiController{}, "Get:ToSearchPatient")
 	beego.Router("/m/api/getallpatientsmode", &NewCommonApiController{}, "Get:GetAllPatientsMode")

controllers/patient_dataconfig_api_controller.go

 
 	beego.Router("/api/patient/getpatientsitemap", &PatientDataConfigAPIController{}, "Get:GetPatientSitemap")
 
+	beego.Router("/api/patient/getpatientdetailinformedconsent", &PatientDataConfigAPIController{}, "Get:GetPatientDetailInformedConsent")
+
 }
 
 type PatientDataConfigAPIController struct {
 	})
 
 }
+
+func (this *PatientDataConfigAPIController) GetPatientDetailInformedConsent() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	patients, _ := service.GetPatientDetailInformedConsent(patient_id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+
+		"patients": patients,
+	})
+}

controllers/sign_api_controller.go

 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jung-kurt/gofpdf"
-	"github.com/mozillazg/go-pinyin"
 	"io/ioutil"
 	"time"
 )
 func (this *SignApiController) UploadPrintOrder() {
 
 	fmt.Println("WOOWOWOWOWOWOWOWOWOWOWWOOWOWWO")
-	list, _ := service.GetAllPatientNew(10567)
-	for _, item := range list {
-
-		hans := item.Name // 要转换的汉字字符串
-		// 创建一个拼音转换器
-		p := pinyin.NewArgs()
-
-		// 将汉字转为拼音
-		pinyinSlice := pinyin.Pinyin(hans, p)
-
-		// 输出拼音
-		fmt.Println("Pinyin:", pinyinSlice)
-
-		// 获取首字母
-		firstLetter := ""
-		for _, py := range pinyinSlice {
-			if len(py) > 0 {
-				firstLetter += string(py[0][0])
-			}
-		}
-
-		item.FirstLetter = firstLetter
-		service.UpdatePatientNew(item.ID, item.FirstLetter)
-		// 输出首字母
-		//fmt.Println("First Letter:", firstLetter)
-	}
+	//list, _ := service.GetAllPatientNew(10567)
+	//for _, item := range list {
+	//
+	//	hans := item.Name // 要转换的汉字字符串
+	//	// 创建一个拼音转换器
+	//	p := pinyin.NewArgs()
+	//
+	//	// 将汉字转为拼音
+	//	pinyinSlice := pinyin.Pinyin(hans, p)
+	//
+	//	// 输出拼音
+	//	fmt.Println("Pinyin:", pinyinSlice)
+	//
+	//	// 获取首字母
+	//	firstLetter := ""
+	//	for _, py := range pinyinSlice {
+	//		if len(py) > 0 {
+	//			firstLetter += string(py[0][0])
+	//		}
+	//	}
+	//
+	//	item.FirstLetter = firstLetter
+	//	service.UpdatePatientNew(item.ID, item.FirstLetter)
+	//	// 输出首字母
+	//	//fmt.Println("First Letter:", firstLetter)
+	//}
 
-	baseList, _ := service.GeteAllBaseList(10567)
-	for _, item := range baseList {
-		hans := item.DrugName // 要转换的汉字字符串
-		// 创建一个拼音转换器
-		p := pinyin.NewArgs()
-		// 将汉字转为拼音
-		pinyinSlice := pinyin.Pinyin(hans, p)
-		// 获取首字母
-		firstLetter := ""
-		for _, py := range pinyinSlice {
-			if len(py) > 0 {
-				firstLetter += string(py[0][0])
-			}
-		}
-		item.FirstLetter = firstLetter
-		service.UpdateBaseList(item.ID, item.FirstLetter)
-	}
+	//baseList, _ := service.GeteAllBaseList(10567)
+	//for _, item := range baseList {
+	//	hans := item.DrugName // 要转换的汉字字符串
+	//	// 创建一个拼音转换器
+	//	p := pinyin.NewArgs()
+	//	// 将汉字转为拼音
+	//	pinyinSlice := pinyin.Pinyin(hans, p)
+	//	// 获取首字母
+	//	firstLetter := ""
+	//	for _, py := range pinyinSlice {
+	//		if len(py) > 0 {
+	//			firstLetter += string(py[0][0])
+	//		}
+	//	}
+	//	item.FirstLetter = firstLetter
+	//	service.UpdateBaseList(item.ID, item.FirstLetter)
+	//}
 	//pdf := gofpdf.New("P", "mm", "A4", "")
 	//pdf.AddPage()
 	//pdf.Text(5, 10, "血液净化治疗记录单")

models/device_models.go

 	Number              string `gorm:"column:number" json:"number" form:"number"`
 	ZoneName            string `gorm:"column:name" json:"zon_name" form:"name"`
 	DialysisMachineName string `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	ModeId              int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 }
 
 type XtDeviceOxygenates struct {

models/patient_models.go

 	return "xt_dialysis_prescription"
 }
 
+type DialysisPrescriptionListSix 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"`
+	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisStrainer           string `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	SolutionStatus             int64  `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
+}
+
+func (DialysisPrescriptionListSix) TableName() string {
+	return "xt_dialysis_solution"
+}
+
 type DialysisAssesmentBefor struct {
 	ID                     int64 `gorm:"column:id" json:"id"`
 	UserOrgId              int64 `gorm:"column:user_org_id" json:"user_org_id"`
 type VmDialysisSolution struct {
 	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"`
+	DialysisStrainer           string                `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 	DialysisDialyszers         string                `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string                `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 	DialyzerPerfusionApparatus string                `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`

service/gobal_config_service.go

 	return
 }
 
+func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64) (schedulelist []*models.XtScheduleList, err error) {
+
+	db := XTReadDB().Model(&schedulelist).Where("status =1 and user_org_id =?", org_id)
+	if start_time > 0 {
+		db = db.Where("schedule_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("schedule_date<=?", end_time)
+	}
+	err = db.Preload("DialysisSolution", "status=1 and user_org_id =?", org_id).Find(&schedulelist).Error
+
+	return schedulelist, err
+
+}
+
+func GetMobileDialysisPrescriptionList(start_time int64, end_time int64, org_id int64) (prescription []*models.DialysisPrescription, err error) {
+
+	db := XTReadDB().Model(&prescription).Where("status =1 and user_org_id =?", org_id)
+
+	if start_time > 0 {
+		db = db.Where("record_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date<=?", end_time)
+	}
+	err = db.Find(&prescription).Error
+	return prescription, err
+}
+
 func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
 	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error

service/inspection_service.go

 }
 
 func GetPatientInspectionByDate(orgId, patientId, date, projectId int64) (inspections []*models.Inspection, err error) {
-	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id =? and inspect_date =? and status=1", patientId, orgId, projectId, date).Find(&inspections).Error
+	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id =? and inspect_date =? and status=1", patientId, orgId, projectId, date).Order("created_time desc").Find(&inspections).Error
 	return
 }
 
 func GetPatientInspections(orgId, patientId, projectId, page int64) (inspections []*models.Inspection, total int64, date int64, err error) {
 
 	var projectCount models.UserInspectionProjectCount
-	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("count(distinct inspect_date) as count, project_id, patient_id").Scan(&projectCount).Error
+	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("count(distinct inspect_date) as count, project_id, patient_id").Order("created_time desc").Scan(&projectCount).Error
 
 	if err != nil {
 		return

service/mobile_dialysis_service.go

 	LastDialysisBeforePrepare []*DialysisBeforePrepare         `gorm:"-" json:"last_good_user_detail"`
 	Project                   []*models.HisPrescriptionProject `gorm:"-" json:"project"`
 	//WarehouseOutInfo          []*models.WarehouseOutInfoSeven   `gorm:"ForeignKey:PatientId,ScheduleDate;AssociationForeignKey:PatientId,SysRecordTime" json:"ware_house_out_info"`
+	DialysisPrescription models.DialysisPrescriptionListSix `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"prescription"`
 }
 
 func (MDialysisGoodsVM) TableName() string {
 
 	db := readDb.
 		Table("xt_schedule as sch").
+		Preload("DialysisPrescription", "status=1 and user_org_id =? and solution_status = 1", orgID).
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).

service/patient_service.go

 	err = readDb.Model(&models.XtHisConfig{}).Where("status = 1 AND user_org_id = ?", org_id).First(&config).Error
 	return
 }
+
+func GetPatientDetailInformedConsent(patient_id int64, org_id int64) (models.XtPatients, error) {
+
+	patients := models.XtPatients{}
+	err := XTReadDB().Where("id = ? and status=1 and user_org_id =?", patient_id, org_id).Find(&patients).Error
+	return patients, err
+}

service/pharmacy_service.go

 	var g errgroup.Group
 	var lib []*models.BaseDrugLib
 	var lock sync.Mutex
+
 	if special {
 		err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and drug_status not like '%停用%' AND status = 1 and is_special_diseases = 1", orgid).Find(&lib).Error
+
 	} else {
 		err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and drug_status not like '%停用%'  AND status = 1 ", orgid).Find(&lib).Error
+
 	}
 	if err != nil {
 		return

service/schedule_service.go

 	if partionid > 0 {
 		db = db.Where("x.partition_id = ?", partionid)
 	}
-	err = db.Select("x.schedule_date,x.schedule_type,x.schedule_week,x.bed_id,x.partition_id,t.name,n.number,z.name,x.dialysis_machine_name").Joins("left join xt_patients as t on t.id = x.patient_id and t.user_org_id = ? and t.status = 1", orgid).Joins("left join xt_device_zone as z on z.id = x.partition_id and z.org_id = ? and z.status =1", orgid).Joins("left join xt_device_number as n on n.id = x.bed_id and n.org_id = ? and n.status =1", orgid).Scan(&schedule).Error
+	err = db.Select("x.schedule_date,x.schedule_type,x.schedule_week,x.bed_id,x.partition_id,t.name,n.number,z.name,x.dialysis_machine_name,x.mode_id").Joins("left join xt_patients as t on t.id = x.patient_id and t.user_org_id = ? and t.status = 1", orgid).Joins("left join xt_device_zone as z on z.id = x.partition_id and z.org_id = ? and z.status =1", orgid).Joins("left join xt_device_number as n on n.id = x.bed_id and n.org_id = ? and n.status =1", orgid).Scan(&schedule).Error
 
 	return schedule, err
 }