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

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10742 //机构id
+		subscibe.OrgId = 10138 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10742 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10742 //机构id小英9675或4
+		subscibe.OrgId = 10138 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10742 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/gobal_config_api_controller.go

@@ -2368,7 +2368,9 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	drugFlowList, _ := service.GetDrugStockFlowDetail(start_time, orgId)
 	flowlist, _ := service.GetSingeOrderFlow(id, orgId)
+
 	drugList, _ := service.GetDrugFlowList(id, orgId)
+
 	drugListOne, _ := service.GetDrugFlowListGroupByIdOne(id, orgId)
 	drugListFlow, err := service.GetDrugFlowListGroupById(id, orgId)
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -5355,6 +5355,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
+
+			//湘潭爱心美白石
+			if adminInfo.Org.Id == 9850 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+			}
+
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -5547,6 +5554,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.DisplacementQuantity = displacement_quantity
 	}
 
+	if adminInfo.Org.Id == 9850 {
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
+	}
+
 	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
 
 	this.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/patient_api_controller.go

@@ -309,6 +309,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 	//2.一组医嘱内有多条医嘱(不包括子医嘱)的情况下,需要为修改的那条医嘱重新分配组号，并修改医嘱开始时间
 	var err error
 	var isChangeGroup bool
+
 	if advice.ParentId == 0 {
 		adviceSlice, _ := service.FindAdviceByGoroupNo(adminUserInfo.Org.Id, advice.GroupNo)
 		sourceAdvice, _ := service.FindOldDoctorAdvice(adminUserInfo.Org.Id, advice.ID)
@@ -360,6 +361,8 @@ func (c *PatientApiController) EditDoctorAdvice() {
 					keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
 					redis.Set(keyOne, "", time.Second)
 				}
+			} else {
+				err = service.UpdateDoctorAdvice(&advice)
 			}
 
 		} else if len(adviceSlice) > 1 {
@@ -414,6 +417,8 @@ func (c *PatientApiController) EditDoctorAdvice() {
 					isChangeGroup = true
 
 				}
+			} else {
+				err = service.UpdateDoctorAdvice(&advice)
 			}
 
 		}
@@ -687,6 +692,24 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			for _, item := range advices {
 
+				if item.ExecutionState == 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
+					return
+				}
+
+				if item.Checker >= 0 && item.Checker == adminUserInfo.AdminUser.Id {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
+					return
+				}
+
+				//针对普宁
+				if adminUserInfo.Org.Id != 10599 {
+
+					if item.StartTime > theTime.Unix() {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
+						return
+					}
+				}
 				//自备药
 				selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
 
@@ -1143,6 +1166,25 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			advicesOne, _ := service.FindDoctorAdviceByIdsOne(adminUserInfo.Org.Id, ids)
 			for _, item := range advicesOne {
 
+				if item.ExecutionState == 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
+					return
+				}
+
+				if item.Checker >= 0 && item.Checker == adminUserInfo.AdminUser.Id {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
+					return
+				}
+
+				//针对普宁
+				if adminUserInfo.Org.Id != 10599 {
+
+					if item.StartTime > theTime.Unix() {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
+						return
+					}
+				}
+
 				//自备药
 				selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
 

service/stock_service.go

@@ -11050,6 +11050,49 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 	return list, total, err
 }
 
+func GetDoctorAdviceInfoList(page int64, limit int64, orgId int64, start_time int64, end_time int64, is_sale int64) ([]models.HisDoctorAdviceInfo, int64, error) {
+	var list []models.HisDoctorAdviceInfo
+	var total int64
+
+	// 计算偏移量
+	offset := (page - 1) * limit
+
+	// 初始化数据库查询
+	db := XTReadDB().Model(&models.HisDoctorAdviceInfo{})
+
+	// 构建 WHERE 子句
+	query := db.Where("status=1")
+	if orgId > 0 {
+		query = query.Where("user_org_id=?", orgId)
+	}
+	if start_time > 0 {
+		query = query.Where("advice_date >= ?", start_time)
+	}
+	if end_time > 0 {
+		query = query.Where("advice_date <= ?", end_time)
+	}
+	if is_sale == 1 {
+		query = query.Where("is_upload = 1")
+	}
+	if is_sale == 2 {
+		query = query.Where("is_upload IN (?, ?)", 2, 0) // 使用 IN 替代 OR，通常性能更好
+	}
+
+	// 获取总记录数
+	err := query.Count(&total).Error
+	if err != nil {
+		return nil, 0, err
+	}
+
+	// 获取分页后的数据
+	err = query.Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return list, total, nil
+}
+
 func GetDrugWarehouseOutInfoByDrugCode(drug_id int64, patient_id int64, advice_date int64, user_org_id int64) (outinfo []*models.XtDrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and patient_id = ? and sys_record_time =? and org_id = ? and status =1", drug_id, patient_id, advice_date, user_org_id).Find(&outinfo).Error