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

controllers/dialysis_api_controller.go

@@ -5009,6 +5009,13 @@ func (c *DialysisApiController) GetDialysisOrder() {
 		endTime = theTime.Unix()
 	}
 
+	if xttime < 1740931200 {
+
+		startTime = 1740326400
+
+		endTime = 1740844800
+	}
+
 	scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(patientInfo.ID, startTime, endTime, adminUserInfo.CurrentOrgId)
 
 	dialysis_count := len(scheduleDialyCount)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4147,7 +4147,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 || adminUserInfo.Org.Id == 10679 || adminUserInfo.Org.Id == 10742 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 || adminUserInfo.Org.Id == 10679 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10757 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -6264,6 +6264,13 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 		endTime = theTime.Unix()
 	}
 
+	if xttime < 1740931200 {
+
+		startTime = 1740326400
+
+		endTime = 1740844800
+	}
+
 	scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(patientInfo.ID, startTime, endTime, adminUserInfo.Org.Id)
 
 	dialysis_count_one := len(scheduleDialyCount)
@@ -6952,7 +6959,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 		adminUserInfo := c.GetMobileAdminUserInfo()
 		var advice models.DoctorAdvice
 		if groupno > 0 {
-			advice, _ = service.FindDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			advice, _ = service.FindDoctorAdviceByGoroupNoOne(adminUserInfo.Org.Id, groupno, patient_id, doc_advice_date)
 			if advice.ID == 0 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 				return

controllers/new_stock_api_controller.go

@@ -171,6 +171,8 @@ func (this *NewStockApiController) GetHisDrugCodeQuery() {
 	is_settle, _ := this.GetInt64("is_settle")
 	is_code, _ := this.GetInt64("is_code")
 
+	is_type, _ := this.GetInt64("is_type")
+
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -194,20 +196,40 @@ func (this *NewStockApiController) GetHisDrugCodeQuery() {
 		endTime = theTime.Unix()
 	}
 
-	list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle, keywords, is_code)
+	if is_type == 1 {
+		list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle, keywords, is_code)
 
-	drug, _ := service.GetAllDrugList(orgId)
+		drug, _ := service.GetAllDrugList(orgId)
 
-	codeConfig, _ := service.GetDrugCodeConfig(orgId)
+		codeConfig, _ := service.GetDrugCodeConfig(orgId)
 
-	patients, _ := service.GetAllpatient(orgId)
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list":       list,
-		"total":      total,
-		"drug":       drug,
-		"patients":   patients,
-		"codeConfig": codeConfig,
-	})
+		patients, _ := service.GetAllpatient(orgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":       list,
+			"total":      total,
+			"drug":       drug,
+			"patients":   patients,
+			"codeConfig": codeConfig,
+		})
+	}
+
+	if is_type == 2 {
+		advice, total, _ := service.GetBloodDrugCode(orgId, startTime, endTime, limit, page, is_sale)
+
+		drug, _ := service.GetAllDrugList(orgId)
+
+		codeConfig, _ := service.GetDrugCodeConfig(orgId)
+
+		patients, _ := service.GetAllpatient(orgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":       advice,
+			"total":      total,
+			"drug":       drug,
+			"patients":   patients,
+			"codeConfig": codeConfig,
+		})
+
+	}
 
 	return
 }

controllers/print_data_api_controller.go

@@ -257,9 +257,15 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 				endTime = theTime.Unix()
 			}
 
+			if item.ScheduleDate < 1740931200 {
+
+				startTime = 1740326400
+
+				endTime = 1740844800
+			}
+
 			scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(item.PatientID, startTime, endTime, adminUserInfo.CurrentOrgId)
 
-			fmt.Println("scheduleDialyCount------------------", scheduleDialyCount)
 			dialysis_count := len(scheduleDialyCount)
 
 			var dialysis_count_str = "一周" + strconv.Itoa(dialysis_count) + "次"

models/dialysis.go

@@ -465,6 +465,7 @@ type DoctorAdvice struct {
 	IsSettle              int64           `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 	IsPrescription        int64           `gorm:"column:is_prescription" json:"is_prescription" form:"is_prescription"`
 	DrugCode              string          `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	IsUpload              int64           `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
 }
 
 func (DoctorAdvice) TableName() string {

service/new_warehouse_service.go

@@ -4606,17 +4606,22 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			}
 
+			if warehouse.MaxUnit != warehouse.MinUnit {
+				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			}
+			fmt.Println("minNumber------", minNumber)
+			fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
+			fmt.Println(" warehouse.MaxUnit", warehouse.MaxUnit)
+			fmt.Println(" warehouse.MinUnit", warehouse.MinUnit)
+
 			if warehouse.MaxUnit == warehouse.MinUnit {
 				//改动的地方
 				warehouse.StockMaxNumber = warehouse.StockMaxNumber - minNumber
 			}
 
-			if warehouse.MaxUnit != warehouse.MinUnit {
-				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-			}
-			if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
-				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			}
+			//if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+			//	warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			//}
 		} else {
 
 			if minNumber > 0 {

service/patient_service.go

@@ -1757,6 +1757,11 @@ func FindDoctorAdviceByGoroupNo(orgID int64, groupno int64) (advice models.Docto
 	return
 }
 
+func FindDoctorAdviceByGoroupNoOne(orgID int64, groupno int64, patient_id int64, advice_date int64) (advice models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND groupno = ? AND status = 1 and patient_id = ? and advice_date =?", orgID, groupno, patient_id, advice_date).First(&advice).Error
+	return
+}
+
 func FindOldDoctorAdvice(orgID int64, advice_id int64) (advice models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("id = ? AND user_org_id=? AND status = 1", advice_id, orgID).First(&advice).Error
 	return

service/stock_service.go

@@ -11066,6 +11066,31 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 	return list, total, err
 }
 
+func GetBloodDrugCode(orgId int64, start_time int64, end_time int64, limit int64, page int64, is_sale int64) (advice []*models.DoctorAdvice, total int64, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1 and advice_type !=1")
+
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+
+	if start_time > 0 {
+		db = db.Where("advice_date>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+
+	if is_sale > 0 {
+		db = db.Where("is_upload = ?", is_sale)
+	}
+	offset := (page - 1) * limit
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("advice_date desc").Find(&advice).Error
+
+	return advice, 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