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 = 10580 //机构id
+		subscibe.OrgId = 10666 //机构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 = 10580 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17997 //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 = 10580 //机构id小英9675或4
+		subscibe.OrgId = 10666 //机构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 = 10580 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17997 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1812,6 +1812,100 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 
+				//针对异常未出库问题的脚本
+				//if adminInfo.Org.Id == 10402 {
+				//
+				//	newadviceInfo := &models.HisDoctorAdviceInfo{
+				//		ID:                    advice.ID,
+				//		UserOrgId:             advice.UserOrgId,
+				//		PatientId:             advice.PatientId,
+				//		HisPatientId:          advice.HisPatientId,
+				//		AdviceType:            advice.AdviceType,
+				//		AdviceDate:            advice.AdviceDate,
+				//		StartTime:             advice.StartTime,
+				//		AdviceName:            advice.AdviceName,
+				//		AdviceDesc:            advice.AdviceDesc,
+				//		ReminderDate:          advice.ReminderDate,
+				//		SingleDose:            advice.SingleDose,
+				//		SingleDoseUnit:        advice.SingleDoseUnit,
+				//		PrescribingNumber:     advice.PrescribingNumber,
+				//		PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				//		DeliveryWay:           advice.DeliveryWay,
+				//		ExecutionFrequency:    advice.ExecutionFrequency,
+				//		AdviceDoctor:          advice.AdviceDoctor,
+				//		Status:                advice.Status,
+				//		CreatedTime:           advice.CreatedTime,
+				//		UpdatedTime:           advice.UpdatedTime,
+				//		AdviceAffirm:          advice.AdviceAffirm,
+				//		Remark:                advice.Remark,
+				//		StopTime:              advice.StopTime,
+				//		StopReason:            advice.StopReason,
+				//		StopDoctor:            advice.StopDoctor,
+				//		StopState:             advice.StopState,
+				//		ParentId:              advice.ParentId,
+				//		ExecutionTime:         advice.ExecutionTime,
+				//		ExecutionStaff:        advice.ExecutionStaff,
+				//		ExecutionState:        advice.ExecutionState,
+				//		Checker:               advice.Checker,
+				//		RecordDate:            advice.RecordDate,
+				//		DialysisOrderId:       advice.DialysisOrderId,
+				//		CheckTime:             advice.CheckTime,
+				//		CheckState:            advice.CheckState,
+				//		DrugSpec:              advice.DrugSpec,
+				//		DrugSpecUnit:          advice.DrugSpecUnit,
+				//		Groupno:               advice.Groupno,
+				//		RemindType:            advice.RemindType,
+				//		FrequencyType:         advice.FrequencyType,
+				//		DayCount:              advice.DayCount,
+				//		WeekDay:               advice.WeekDay,
+				//		TemplateId:            advice.TemplateId,
+				//		Modifier:              advice.Modifier,
+				//		DrugId:                advice.DrugId,
+				//		Price:                 advice.Price,
+				//		PrescriptionId:        advice.PrescriptionId,
+				//		MedListCodg:           advice.MedListCodg,
+				//		FeedetlSn:             advice.FeedetlSn,
+				//		Day:                   advice.DayCount,
+				//		ChildDoctorAdvice:     nil,
+				//		Drug:                  models.Drug{},
+				//		Diagnosis:             advice.Diagnosis,
+				//		Way:                   advice.Way,
+				//		HospApprFlag:          advice.HospApprFlag,
+				//		LmtUsedFlag:           advice.LmtUsedFlag,
+				//		HisOrderInfo:          models.HisOrderInfo{},
+				//		IsMedicine:            advice.IsMedicine,
+				//		ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+				//		Child:                 nil,
+				//		IsSettle:              advice.IsSettle,
+				//		IsMobile:              advice.IsMobile,
+				//		IsSelfDrug:            advice.IsSelfDrug,
+				//		DrugWayCount:          advice.DrugWayCount,
+				//	}
+				//	outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
+				//
+				//	var out_count int64
+				//	if len(outListExport) > 0 {
+				//		for _, item := range outListExport {
+				//			if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+				//				out_count = item.Count * medical.MinNumber
+				//			}
+				//			if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+				//				out_count = item.Count
+				//			}
+				//			if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+				//				out_count = item.Count * medical.MinNumber
+				//			}
+				//
+				//		}
+				//	}
+				//	//按最小单位出库
+				//	var cha_count = prescribing_number_total - out_count
+				//
+				//	newadviceInfo.PrescribingNumber = float64(cha_count)
+				//	newadviceInfo.PrescribingNumberUnit = medical.MinUnit
+				//	service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+				//}
+
 			}
 		}
 

models/patient_models.go

@@ -1846,6 +1846,7 @@ type NewDialysisPrescription struct {
 	DisplaceLiquiValue         float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
 	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
 	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	DisplaceLiquiPart          int64   `gorm:"column:displace_liqui_part" json:"displace_liqui_part" form:"displace_liqui_part"`
 }
 
 func (NewDialysisPrescription) TableName() string {

service/dialysis_service.go

@@ -2500,9 +2500,9 @@ func GetAllAdviceList(patient_id int64, advice_date int64, user_org_id int64) (a
 	return advice, err
 }
 
-func GetHistoryWarehouseOutInfo(patient_id int64, user_org_id int64, record_time int64) (outInfo []*models.WarehouseOutInfo, err error) {
+func GetHistoryWarehouseOutInfo(patient_id int64, user_org_id int64, record_time int64, good_id int64) (outInfo []*models.WarehouseOutInfo, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and sys_record_time = ? and status =1", patient_id, user_org_id, record_time).Find(&outInfo).Error
+	err = XTReadDB().Where("patient_id = ? and org_id = ? and sys_record_time = ? and status =1 and good_id = ?", patient_id, user_org_id, record_time, good_id).Find(&outInfo).Error
 
 	return outInfo, err
 }

service/patient_service.go

@@ -1535,7 +1535,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
 	// Where("do.patient_id=? and do.user_org_id=? and do.stage = 2 and do.status=1", patientID, orgID).Count(&total).Offset(offset).Limit(limit).Order("do.dialysis_date desc").Select(" do.id, do.dialysis_date, do.user_org_id, do.patient_id, do.prescription_id, do.stage, do.remark, do.status, do.created_time, do.updated_time, s.schedule_type, s.partition_id, dz.name as partition_name").Find(&orders).Error
 
 	db := readDb.Table("xt_dialysis_order as do").
-		Preload("DoctorAdvice", "patient_id =? and user_org_id = ? and status =1", patientID, orgID).
+		Preload("DoctorAdvice", "patient_id =? and user_org_id = ? and status =1 and advice_type =2", patientID, orgID).
 		Preload("DialysisPrescription", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("PredialysisEvaluation", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {

service/user_service.go

@@ -218,7 +218,7 @@ func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
 
 func GetDrugFlowDetailById(drug_id int64, org_id int64) (flow []*models.DrugFlow, err error) {
 
-	if org_id == 10217 {
+	if org_id == 10188 {
 		err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =? and system_time>=1717171200", drug_id, org_id).Order("ctime asc").Find(&flow).Error
 	} else {
 		err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =?", drug_id, org_id).Order("ctime asc").Find(&flow).Error