2024/6/17

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

controllers/dialysis_api_controller.go

@@ -5877,9 +5877,17 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
-			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
-			record.UltrafiltrationVolume = ultrafiltration_volume
+			if adminInfo.CurrentOrgId != 10735 {
+				ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+				record.UltrafiltrationVolume = ultrafiltration_volume
+			}
+
+			if adminInfo.CurrentOrgId == 10735 {
+				ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+				record.UltrafiltrationVolume = ultrafiltration_volume / 2
+			}
+
 		}
 
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -5291,8 +5291,16 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 || adminInfo.Org.Id == 10599 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
-			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
-			record.UltrafiltrationVolume = ultrafiltration_volume
+
+			if adminInfo.Org.Id != 10735 {
+				ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+				record.UltrafiltrationVolume = ultrafiltration_volume
+			}
+			//胶州少海医院
+			if adminInfo.Org.Id == 10735 {
+				ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+				record.UltrafiltrationVolume = ultrafiltration_volume / 2
+			}
 
 		}
 	}

controllers/pharmacy_controller.go

@@ -576,6 +576,13 @@ func (this *PharmacyController) DrugWithdrawal() {
 	}
 	err = service.DrugWithdrawal(orgid, patient_id, stime, etime, creater)
 
+	prescriptionList, _ := service.GetHisPrescriptionByStartTime(orgid, patient_id, stime, etime)
+	if len(prescriptionList) > 0 {
+		for _, item := range prescriptionList {
+			service.ModiftyPrescpiton(item.ID)
+		}
+	}
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())

service/pharmacy_service.go

@@ -614,27 +614,25 @@ func GetManyDrugs(orgid int64, keyword string) (map[int64]models.PharmacyBaseDru
 // 查询(
 func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (finlly []*models.ListOfDrugs, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
-
-	fmt.Println("startime==========================", stime)
 	var tmp []*models.TmpLLL
 	if is_medicine == 0 {
 		if keyword != "" {
 			keyword = "%" + keyword + "%"
 			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct drug_id from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1)",
 				stime, etime, orgid, is_medicine, orgid, keyword, stime, etime, orgid, is_medicine, orgid, keyword).Scan(&tmp).Error
 		} else {
 			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct drug_id from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
 				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
 		}
@@ -645,20 +643,20 @@ func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (f
 		if keyword != "" {
 			keyword = "%" + keyword + "%"
 			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct drug_id from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1)",
 				stime, etime, orgid, is_medicine, orgid, keyword, stime, etime, orgid, is_medicine, orgid, keyword).Scan(&tmp).Error
 		} else {
 			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
 				"union "+
 				"select distinct drug_id from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) ",
 				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
 		}
@@ -1065,6 +1063,19 @@ func UpdateIsAdvice(id int64) (err error) {
 	return err
 }
 
+func GetHisPrescriptionByStartTime(org_id int64, patient_id int64, start_time int64, end_time int64) (prescription []*models.HisPrescription, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date>=? and record_date<=? and status=1 and is_medicine =1", org_id, patient_id, start_time, end_time).Find(&prescription).Error
+	return prescription, err
+}
+
+func ModiftyPrescpiton(id int64) (models.HisPrescription, error) {
+
+	prescription := models.HisPrescription{}
+	err := XTWriteDB().Model(&prescription).Where("id = ? and status=1", id).Updates(map[string]interface{}{"is_medicine": 0}).Error
+	return prescription, err
+}
+
 // 患者退药按钮点击
 func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error) {
 	//开事务