耗材参数

controllers/his_project_api_controller.go

@@ -757,6 +757,9 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	totals_float, _ := strconv.ParseFloat(totals, 64)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
+	timeStr := time.Now().Format("2006-01-02")
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
 
 	bloodPatient, errcode := service.GetBloodPatientByIdCard(idcard, orgId)
 	if errcode == gorm.ErrRecordNotFound {
@@ -779,6 +782,8 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			Gender:                 sex,
 			Total:                  totals_float,
 			UserOrgId:              orgId,
+			Status:                 1,
+			RecordDate:             timeStringToTime.Unix(),
 		}
 		err := service.CreateHisPatient(&patient)
 		if err != nil {
@@ -864,13 +869,17 @@ func (this *HisProjectApiController) GetHisPatientHistory() {
 	fmt.Println(keyword, start_time, end_time, register_type, limit, page)
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	history, total, err := service.GetHisPatientHistory(keyword, startTime.Unix(), endTime.Unix(), register_type, limit, page)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	history, total, err := service.GetHisPatientHistory(keyword, startTime.Unix(), endTime.Unix(), register_type, limit, page, orgId)
+	department, err := service.GetAllDepartMent(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"history": history,
-		"total":   total,
+		"history":    history,
+		"total":      total,
+		"department": department,
 	})
 }

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -42,6 +42,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	fmt.Println("partiontype", partitionType)
 	scheduleType, _ := this.GetInt64("scheduleType")
 	fmt.Println(scheduleType)
+
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	if len(keywords) > 0 {
 

service/his_project_service.go

@@ -284,10 +284,11 @@ func GetProjectListById(orgid int64, ids []string) (project []*models.XtHisProje
 	return project, err
 }
 
-func GetHisPatientHistory(keyword string, startime int64, endtime int64, registtype int64, limit int64, page int64) (hisPatient []*models.XtHisPatient, total int64, err error) {
+func GetHisPatientHistory(keyword string, startime int64, endtime int64, registtype int64, limit int64, page int64, orgid int64) (hisPatient []*models.XtHisPatient, total int64, err error) {
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 	db := XTReadDB().Table("his_patient as x").Where("x.status = 1")
+
 	if len(keyword) > 0 {
 		db = db.Where("x.name like ?", likeKey)
 	}
@@ -300,6 +301,9 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
 	if registtype > 0 {
 		db = db.Where("x.register_type = ?", registtype)
 	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
 	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number").Count(&total).Offset(offset).Limit(limit).Find(&hisPatient).Error
 	return hisPatient, total, err
 }