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

controllers/manager_center_api_controller.go

@@ -168,6 +168,10 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	is_zero_flag, _ := c.GetInt64("is_zero_flag")
 
 	specification_name := c.GetString("specification_name")
+
+	scan_code := c.GetString("scan_code")
+	drug_identification_code := c.GetString("drug_identification_code")
+
 	hans := drug_name // 要转换的汉字字符串
 
 	// 创建一个拼音转换器
@@ -260,6 +264,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		IsSelfDrug:                  is_self_drug,
 		SpecificationName:           specification_name,
 		IsZeroFlag:                  is_zero_flag,
+		ScanCode:                    scan_code,
+		DrugIdentificationCode:      drug_identification_code,
 	}
 	drugLib.FirstLetter = firstLetter
 	drugLib.Pinyin = firstLetter
@@ -385,6 +391,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_self_drug, _ := c.GetInt64("is_self_drug")
 	specification_name := c.GetString("specification_name")
 	is_zero_flag, _ := c.GetInt64("is_zero_flag")
+	scan_code := c.GetString("scan_code")
+	drug_identification_code := c.GetString("drug_identification_code")
 
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
@@ -484,6 +492,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		IsSelfDrug:                  is_self_drug,
 		SpecificationName:           specification_name,
 		IsZeroFlag:                  is_zero_flag,
+		ScanCode:                    scan_code,
+		DrugIdentificationCode:      drug_identification_code,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -5320,13 +5320,16 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			if adminInfo.Org.Id == 10735 {
 
 				lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
+				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+				var ultrafiltration_rate_one = math.Floor(prescription.TargetUltrafiltration*1000/float64(totalMin)*60*1000) / 1000
+
 				if lastMonitorRecordList.ID > 0 {
-					record.UltrafiltrationRate = lastMonitorRecordList.UltrafiltrationRate
-					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * lastMonitorRecordList.UltrafiltrationRate)
+					record.UltrafiltrationRate = ultrafiltration_rate_one
+					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * ultrafiltration_rate_one)
 
 					record.UltrafiltrationVolume = ultrafiltration_volume
 				} else {
-					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * ultrafiltration_rate_one)
 
 					record.UltrafiltrationVolume = ultrafiltration_volume
 				}

controllers/patient_api_controller.go

@@ -8760,7 +8760,19 @@ func (this *PatientApiController) ModifyCoursePrint() {
 	id := int64(dataBody["id"].(float64))
 	content := dataBody["content"].(string)
 
-	coursePrint, _ := service.ModifyCoursePrint(id, content)
+	record_date := dataBody["record_date"].(string)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTime = theTime.Unix()
+	}
+
+	coursePrint, _ := service.ModifyCoursePrint(id, content, theStartTime)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"coursePrint": coursePrint,

controllers/patient_dataconfig_api_controller.go

@@ -931,6 +931,17 @@ func (this *PatientDataConfigAPIController) Rescues() {
 func (this *PatientDataConfigAPIController) CreateRescue() {
 	patientID, _ := this.GetInt64("patient_id")
 	content := this.GetString("content")
+	record_date := this.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTime = theTime.Unix()
+	}
 	if patientID <= 0 || len(content) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -952,7 +963,7 @@ func (this *PatientDataConfigAPIController) CreateRescue() {
 		OrgID:      adminUserInfo.CurrentOrgId,
 		PatientID:  patientID,
 		Recorder:   adminUserInfo.AdminUser.Id,
-		RecordTime: now,
+		RecordTime: theStartTime,
 		Content:    content,
 		Status:     1,
 		CreateTime: now,

models/drug.go

@@ -85,13 +85,15 @@ type BaseDrugLib struct {
 	Bby01     string `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	Bbx01     string `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 
-	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
-	IsProject          int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
-	DrugDosageFormName string `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
-	IsShow             int64  `gorm:"column:is_show" json:"is_show" form:"is_show"`
-	IsSelfDrug         int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
-	SpecificationName  string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	IsZeroFlag         int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	FirstLetter            string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	IsProject              int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
+	DrugDosageFormName     string `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
+	IsShow                 int64  `gorm:"column:is_show" json:"is_show" form:"is_show"`
+	IsSelfDrug             int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	SpecificationName      string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	IsZeroFlag             int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	ScanCode               string `gorm:"column:scan_code" json:"scan_code" form:"scan_code"`
+	DrugIdentificationCode string `gorm:"column:drug_identification_code" json:"drug_identification_code" form:"drug_identification_code"`
 }
 
 func (BaseDrugLib) TableName() string {
@@ -145,16 +147,18 @@ func (BaseDrugLibTwentyOne) TableName() string {
 }
 
 type BaseDrugLibEleven struct {
-	ID               int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName         string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
-	MaxUnit          string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber        int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit          string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose             string `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit         string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	IsZeroFlag       int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	ID                     int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName               string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Manufacturer           int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	ManufacturerName       string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+	MaxUnit                string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber              int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                   string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit               string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	IsZeroFlag             int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	ScanCode               string `gorm:"column:scan_code" json:"scan_code" form:"scan_code"`
+	DrugIdentificationCode string `gorm:"column:drug_identification_code" json:"drug_identification_code" form:"drug_identification_code"`
 }
 
 func (BaseDrugLibEleven) TableName() string {

service/patient_service.go

@@ -4735,11 +4735,11 @@ func GetPatientRescueRecord(id int64) (models.XtPatientRescueRecord, error) {
 	return rescueRecords, err
 }
 
-func ModifyCoursePrint(id int64, content string) (models.XtPatientRescueRecord, error) {
+func ModifyCoursePrint(id int64, content string, record_date int64) (models.XtPatientRescueRecord, error) {
 
 	rescueRecord := models.XtPatientRescueRecord{}
 
-	err := XTWriteDB().Model(&rescueRecord).Where("id = ? and status=1", id).Updates(map[string]interface{}{"content": content}).Error
+	err := XTWriteDB().Model(&rescueRecord).Where("id = ? and status=1", id).Updates(map[string]interface{}{"content": content, "record_time": record_date}).Error
 
 	return rescueRecord, err
 }

service/user_service.go

@@ -99,7 +99,12 @@ func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
 
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
-	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+
+	if orgId == 10724 {
+		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
+	} else {
+		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
+	}
 	return
 }