历史排班

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #
@@ -51,75 +51,75 @@ sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 
-readmysqlhost = shengws1.mysql.rds.aliyuncs.com
+readmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh
-readmysqlpass = xhPECP2nFObR8aUK
+readmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmysqlname = sgj_xt
 
 
 
-readmysqlhost2 = rr-kuyicloud.mysql.rds.aliyuncs.com
+readmysqlhost2 = read-kuyicloud2024lt.mysql.rds.aliyuncs.com
 readmysqlport2 = 3306
 readmysqluser2 = syh
-readmysqlpass2 = xhPECP2nFObR8aUK
+readmysqlpass2 = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmysqlname2 = sgj_xt
 
-writemysqlhost = shengws1.mysql.rds.aliyuncs.com
+writemysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = syh
-writemysqlpass = xhPECP2nFObR8aUK
+writemysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writemysqlname = sgj_xt
 
 
-readuserhost = shengws1.mysql.rds.aliyuncs.com
+readuserhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = syh
-readuserpass = xhPECP2nFObR8aUK
+readuserpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readusername = sgj_users
 
-writeuserhost = shengws1.mysql.rds.aliyuncs.com
+writeuserhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = syh
-writeuserpass = xhPECP2nFObR8aUK
+writeuserpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writeusername = sgj_users
 
-readmiddlehost = shengws1.mysql.rds.aliyuncs.com
+readmiddlehost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readmiddleport = 3306
 readmiddleuser = syh
-readmiddlepass = xhPECP2nFObR8aUK
+readmiddlepass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmiddlename = ky_xt_middle
 
-writemiddlehost = shengws1.mysql.rds.aliyuncs.com
+writemiddlehost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writemiddleport = 3306
 writemiddleuser = syh
-writemiddlepass = xhPECP2nFObR8aUK
+writemiddlepass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writemiddlename = ky_xt_middle
 
 
-readsgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
+readsgjpatientmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readsgjpatientmysqlport = 3306
 readsgjpatientmysqluser = syh
-readsgjpatientmysqlpass = xhPECP2nFObR8aUK
+readsgjpatientmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readsgjpatientmysqlname = sgj_patient
 
-writesgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
+writesgjpatientmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writesgjpatientmysqlport = 3306
 writesgjpatientmysqluser = syh
-writesgjpatientmysqlpass = xhPECP2nFObR8aUK
+writesgjpatientmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writesgjpatientmysqlname = sgj_patient
 
 
-readpatienthost = shengws1.mysql.rds.aliyuncs.com
+readpatienthost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readpatientport = 3306
 readpatientuser = syh
-readpatientpass = xhPECP2nFObR8aUK
+readpatientpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readpatientname = sgj_cdm
 
-writepatienthost = shengws1.mysql.rds.aliyuncs.com
+writepatienthost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writepatientport = 3306
 writepatientuser = syh
-writepatientpass = xhPECP2nFObR8aUK
+writepatientpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writepatientname = sgj_cdm
 
 redishost = kuyicloud.redis.rds.aliyuncs.com

controllers/his_api_controller.go

@@ -3100,7 +3100,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10164 {
+	if adminInfo.CurrentOrgId == 10489 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3154,16 +3154,18 @@ func (c *HisApiController) CreateHisPrescription() {
 						utils.ErrorLog("pre_time")
 					}
 					preTime, _ := items["pre_time"].(string)
-
+					fmt.Println("preTime", preTime)
 					timeLayout := "2006-01-02"
 					loc, _ := time.LoadLocation("Local")
 					theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
+					result := strings.Split(preTime, " ")
+					theTime3, _ := time.ParseInLocation(timeLayout, result[0], loc)
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
 					}
 					pTime := theTime2.Unix()
-					fmt.Println("pTime----------------------------------------", pTime)
+
 					ctime := time.Now().Unix()
 
 					if tempPrescription.ID == 0 {
@@ -3246,10 +3248,10 @@ func (c *HisApiController) CreateHisPrescription() {
 								s.AdviceDoctor = doctor_id
 								s.StopState = 2
 								s.ExecutionState = 2
-								s.AdviceDate = recordDateTime
+								s.AdviceDate = theTime3.Unix()
 								s.Status = 1
 								s.UserOrgId = adminInfo.CurrentOrgId
-								s.RecordDate = recordDateTime
+								s.RecordDate = theTime3.Unix()
 								s.StartTime = tempPrescription.PreTime
 								s.Groupno = groupNo
 								s.CreatedTime = ctime
@@ -3485,7 +3487,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								p.Ctime = time.Now().Unix()
 								p.Mtime = time.Now().Unix()
 								p.PatientId = patient_id
-								p.RecordDate = recordDateTime
+								p.RecordDate = theTime3.Unix()
 								p.Doctor = doctor_id
 								p.UserOrgId = adminInfo.CurrentOrgId
 								p.HisPatientId = his_patient_id
@@ -3551,9 +3553,6 @@ func (c *HisApiController) CreateHisPrescription() {
 										}
 										parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
-										fmt.Println("出库数据------------------------------------------", out_count_five)
-										fmt.Println("出库数据------------------------------------------2", parseIntCount)
-
 										//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
 										if out_count_five != parseIntCount {
 											//查询耗材最后一次出库记录
@@ -4165,6 +4164,9 @@ func (c *HisApiController) CreateHisPrescription() {
 					timeLayout := "2006-01-02"
 					loc, _ := time.LoadLocation("Local")
 					theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
+					result := strings.Split(preTime, " ")
+					theTime3, _ := time.ParseInLocation(timeLayout, result[0], loc)
+					fmt.Println("theTime30000000000000000000000", theTime3.Unix())
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -4244,10 +4246,10 @@ func (c *HisApiController) CreateHisPrescription() {
 								s.AdviceDoctor = doctor_id
 								s.StopState = 2
 								s.ExecutionState = 2
-								s.AdviceDate = recordDateTime
+								s.AdviceDate = theTime3.Unix()
 								s.Status = 1
 								s.UserOrgId = adminInfo.CurrentOrgId
-								s.RecordDate = recordDateTime
+								s.RecordDate = theTime3.Unix()
 								s.StartTime = tempPrescription.PreTime
 								s.Groupno = groupNo
 								s.CreatedTime = ctime
@@ -4348,7 +4350,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								p.Ctime = time.Now().Unix()
 								p.Mtime = time.Now().Unix()
 								p.PatientId = patient_id
-								p.RecordDate = recordDateTime
+								p.RecordDate = theTime3.Unix()
 								p.Doctor = doctor_id
 								p.UserOrgId = adminInfo.CurrentOrgId
 								p.HisPatientId = his_patient_id
@@ -4773,6 +4775,7 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 			}
 		}
+		tx.Commit()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "保存成功",

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -409,6 +409,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Sodium = 138
 				newprescribe.Bicarbonate = 31.1
 				newprescribe.DialysateFlow = 500
+				newprescribe.TargetUltrafiltration = 0
 			}
 			// 针对新化博翔
 			if adminUserInfo.Org.Id == 10447 {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1665,22 +1665,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				//
-				if config.IsOpen == 1 && item.UserOrgId == 10210 {
-
-					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//更新字典里面的库存
-					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					var sum_count int64
-					for _, its := range stockInfo {
-						if its.MaxUnit == medical.MaxUnit {
-							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-						}
-						sum_count += its.StockMaxNumber + its.StockMinNumber
-					}
-					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					//剩余库存
-					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				}
+				//if config.IsOpen == 1 && item.UserOrgId == 10210 {
+				//
+				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+				//	//更新字典里面的库存
+				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+				//	var sum_count int64
+				//	for _, its := range stockInfo {
+				//		if its.MaxUnit == medical.MaxUnit {
+				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				//		}
+				//		sum_count += its.StockMaxNumber + its.StockMinNumber
+				//	}
+				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+				//	//剩余库存
+				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				//}
 
 			}
 		}

controllers/patient_api_controller.go

@@ -143,6 +143,8 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/getpatientcriticalonelist", &PatientApiController{}, "Get:GetPatientCriticalOneList")
 
+	beego.Router("/api/patient/deletesolution", &PatientApiController{}, "Get:DeleteSolution")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -1130,7 +1132,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 	loc, _ := time.LoadLocation("Local")
 	todayTime, err := time.ParseInLocation(timeLayout, today, loc)
 
-	if adminUserInfo.CurrentOrgId == 9538 || adminUserInfo.CurrentOrgId == 10375 || adminUserInfo.CurrentOrgId == 10164 {
+	if adminUserInfo.CurrentOrgId == 9538 || adminUserInfo.CurrentOrgId == 10164 {
 		prescription := models.DialysisPrescription{
 			Dialyzer:                   solution.Dialyzer,
 			Anticoagulant:              solution.Anticoagulant,
@@ -6776,3 +6778,12 @@ func (c *PatientApiController) GetPatientCriticalOneList() {
 		"list": list,
 	})
 }
+
+func (c *PatientApiController) DeleteSolution() {
+
+	id, _ := c.GetInt64("id")
+	solution, _ := service.DeleteSolutionById(id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"solution": solution,
+	})
+}

controllers/stock_in_api_controller.go

@@ -7970,13 +7970,13 @@ func (this *StockManagerApiController) GetStockFlowOrderList() {
 			var count int64
 
 			if index == 0 {
-				count = list[index].OverCount - list[index].Count
+				count = list[index].FlushOverCount - list[index].Count
 				service.UpdateOverCount(list[index+1].ID, count)
 			}
 
 			if index >= 1 {
 				lastStockFlow, _ := service.GetLastOverCount(list[index-1].ID)
-				count = lastStockFlow.OverCount - list[index].Count
+				count = lastStockFlow.FlushOverCount - list[index].Count
 				service.UpdateOverCount(list[index].ID, count)
 			}
 
@@ -7984,14 +7984,14 @@ func (this *StockManagerApiController) GetStockFlowOrderList() {
 		if list[index].ConsumableType == 7 || list[index].ConsumableType == 4 || list[index].ConsumableType == 1 || list[index].ConsumableType == 10 || list[index].ConsumableType == 13 {
 			if index == 0 {
 				var count int64
-				count = list[index].OverCount + list[index].Count
+				count = list[index].FlushOverCount + list[index].Count
 				service.UpdateOverCount(list[index+1].ID, count)
 			}
 
 			if index >= 1 {
 				var count int64
 				lastStockFlow, _ := service.GetLastOverCount(list[index-1].ID)
-				count = lastStockFlow.OverCount + list[index].Count
+				count = lastStockFlow.FlushOverCount + list[index].Count
 				service.UpdateOverCount(list[index].ID, count)
 			}
 

models/stock_models.go

@@ -693,6 +693,7 @@ type VmStockFlow struct {
 	OverCount                 int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	OrderId                   int64           `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	Remark                    string          `gorm:"column:remark" json:"remark" form:"remark"`
+	FlushOverCount            int64           `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
 }
 
 func (VmStockFlow) TableName() string {

service/new_warehouse_service.go

@@ -2752,11 +2752,13 @@ func FindNewDrugCancelStock(return_date int64, org_id int64, tx *gorm.DB) (*mode
 	stock := models.DrugCancelStock{}
 	var err error
 	err = tx.Where("return_time = ? and org_id = ? and status = 1", return_date, org_id).Find(&stock).Error
-
-	if err != nil {
-		tx.Rollback()
-		return &stock, nil
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return &stock, nil
+		}
 	}
+
 	return &stock, nil
 }
 
@@ -2771,10 +2773,13 @@ func FindNewLastDrugCancelStock(advice_date int64, org_id int64, tx *gorm.DB) (m
 
 	cancelStock := models.DrugCancelStock{}
 	err := tx.Where("return_time = ? and org_id = ? and status = 1", advice_date, org_id).Find(&cancelStock).Error
-	if err != nil {
-		tx.Rollback()
-		return cancelStock, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return cancelStock, err
+		}
 	}
+
 	return cancelStock, err
 }
 

service/patient_service.go

@@ -4015,3 +4015,12 @@ func GetInspectionByPatientId(patient_id int64, item_id int64) (models.XtInspect
 	err := XTReadDB().Where("patient_id =? and status =1 and inspect_date>=1704038400 and inspect_date<=1711814400 and item_id =?", patient_id, item_id).Order("id asc").Last(&inspection).Limit(1).Error
 	return inspection, err
 }
+
+func DeleteSolutionById(id int64) (models.DialysisSolution, error) {
+
+	solution := models.DialysisSolution{}
+
+	err := XTWriteDB().Model(&solution).Where("id=? and status=1", id).Updates(map[string]interface{}{"status": 12}).Error
+
+	return solution, err
+}

service/secondary_service.go

@@ -1152,13 +1152,13 @@ func DeleteSecondOrderInfo(id int64) error {
 
 func GetStockFlowOrderList(good_id int64, user_org_id int64) (list []*models.VmStockFlow, err error) {
 
-	err = XTReadDB().Where("good_id = ? and user_org_id =? and ctime>=1706630400 and ctime<=1709222399 and status=1", good_id, user_org_id).Order("ctime asc").Find(&list).Error
+	err = XTReadDB().Where("good_id = ? and user_org_id =?  and status=1", good_id, user_org_id).Order("ctime asc").Find(&list).Error
 	return list, err
 }
 
 func UpdateOverCount(id int64, count int64) (err error) {
 
-	err = XTWriteDB().Model(models.VmStockFlow{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"over_count": count}).Error
+	err = XTWriteDB().Model(models.VmStockFlow{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"flush_over_count": count}).Error
 	return err
 }
 

service/stock_service.go

@@ -2002,10 +2002,13 @@ func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
 func GetNewLastDrugCancelStockById(orgid int64, tx *gorm.DB) (models.DrugCancelStock, error) {
 	stock := models.DrugCancelStock{}
 	err := tx.Where("org_id = ? and status = 1", orgid).Last(&stock).Error
-	if err != nil {
-		tx.Rollback()
-		return stock, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return stock, err
+		}
 	}
+
 	return stock, err
 }
 
@@ -5802,10 +5805,13 @@ func GetHisAdviceListByDrugIdTwo(patient_id int64, advice_date int64, orgid int6
 func GetNewHisAdviceListByDrugIdTwo(patient_id int64, advice_date int64, orgid int64, tx *gorm.DB) (info []*models.HisDoctorAdviceInfo, err error) {
 
 	err = tx.Where("patient_id = ? and advice_date = ? and status = 1 and user_org_id = ?", patient_id, advice_date, orgid).Find(&info).Error
-	if err != nil {
-		tx.Rollback()
-		return info, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
 	}
+
 	return info, err
 }
 
@@ -5845,11 +5851,13 @@ func GetLastDrugWarehouseOutByDrugIdTwenty(drugid int64, patient_id int64, advic
 func GetLastNewDrugWarehouseOutByDrugIdTwenty(drugid int64, patient_id int64, advice_date int64, advice_id int64, tx *gorm.DB) (out []*models.DrugWarehouseOutInfo, err error) {
 
 	err = tx.Where("advice_id = ?  and drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1 and is_check = 1", advice_id, drugid, patient_id, advice_date).Find(&out).Error
-
-	if err != nil {
-		tx.Rollback()
-		return out, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return out, err
+		}
 	}
+
 	return out, err
 }