库存调拨修改

controllers/dialysis_api_controller.go

@@ -669,7 +669,7 @@ func (c *DialysisApiController) PostPrescription() {
 			advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 			if advicePrescription.ID > 0 {
 
-				service.UpdateDoctorAdvieById(advicePrescription.ID, prescribing_number)
+				service.UpdateDoctorAdvieByIdOne(advicePrescription.ID, prescribing_number, anticoagulant_zongliang)
 
 				key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
 				redis := service.RedisClient()
@@ -5801,12 +5801,15 @@ func (this *DialysisApiController) GetMobileScheduleList() {
 
 	if len(schedule) > 0 {
 		for _, its := range schedule {
-			prescription, _ := service.GetPrescriptionList(its.PatientId, its.ScheduleDate, its.UserOrgId)
-			its.DialysisPrescription = prescription
-			monitor, _ := service.GetLastMonitorRecordList(its.PatientId, its.ScheduleDate, its.UserOrgId)
-			its.MonitoringRecord = monitor
-			after, _ := service.GetLastAfter(its.PatientId, its.ScheduleDate, its.UserOrgId)
-			its.XtAssessmentAfterDislysis = after
+			//prescription, _ := service.GetPrescriptionList(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			//its.DialysisPrescription = prescription
+			//monitor, _ := service.GetLastMonitorRecordList(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			//its.MonitoringRecord = monitor
+			//after, _ := service.GetLastAfter(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			//its.XtAssessmentAfterDislysis = after
+
+			order, _ := service.GetLastOrder(its.UserOrgId, its.PatientId, its.ScheduleDate)
+			service.UpdateDoctorSix(order.StartTime, order.PatientId, order.DialysisDate, order.UserOrgId)
 		}
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1894,7 +1894,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.Org.Id, id, recordDate.Unix())
 			if advicePrescription.ID > 0 {
 
-				service.UpdateDoctorAdvieById(advicePrescription.ID, prescribing_number)
+				service.UpdateDoctorAdvieByIdOne(advicePrescription.ID, prescribing_number, anticoagulant_zongliang)
 
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
 				redis := service.RedisClient()

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1265,7 +1265,8 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
 	fmt.Println("execution_time", execution_time)
 	groupno, _ := c.GetInt64("groupno", -1)
-
+	//patient_id, _ := c.GetInt64("patient_id")
+	advice_date, _ := c.GetInt64("advice_date")
 	var ids []string
 	if groupno == 0 {
 		advice_ids := c.GetString("advice_id")
@@ -1339,7 +1340,7 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
-		fmt.Println("keyThh322323232323232323223", key)
+
 		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
@@ -1348,12 +1349,13 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 
 	} else {
 		err = service.BatchModifyExceOldDoctorAdvice(&advices, ids)
-		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+
+		err = service.ModifyExceDoctorAdviceByGroupNoOne(&advices, ids)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
-		fmt.Println("keyTwohh322323232323232323223", key)
+
 		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice_date, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
 
 		defer redis.Close()
@@ -1367,7 +1369,6 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			ExecutionTime: theTime.Unix(),
 			UpdatedTime:   time.Now().Unix(),
 		}
-		fmt.Println("ids2323232232323", ids)
 		var advicehis models.HisDoctorAdviceInfo
 		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
 		his_advices, _ := service.FindHisDoctorAdviceByIdOne(adminUserInfo.Org.Id, ids)

service/dialysis_service.go

@@ -1137,6 +1137,19 @@ func ModifyExceDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_
 	return err
 }
 
+func ModifyExceDoctorAdviceByGroupNoOne(m *models.DoctorAdvice, ids []string) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.DoctorAdvice{}).Where("id in(?) and status =1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+
+	return err
+
+}
+
 func BatchModifyExceOldDoctorAdvice(m *models.DoctorAdvice, ids []string) (err error) {
 
 	ut := writeDb.Begin()
@@ -2039,6 +2052,13 @@ func GetLastOrder(user_org_id int64, patient_id int64, dialysis_date int64) (mod
 	return twenty, err
 }
 
+func UpdateDoctorSix(start_time int64, patient_id int64, dialysis_date int64, user_org_id int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("patient_id = ? and advice_date=? and user_org_id =? and status=1 and advice_name ='低分子肝素钠注射液'", patient_id, dialysis_date, user_org_id).Updates(map[string]interface{}{"execution_time": start_time}).Error
+	return advice, err
+}
+
 func GetTodayInforMation(orgid int64, record_date int64) (list []*NewDeviceInformation, err error) {
 
 	err = UserReadDB().Where("user_org_id = ? and date = ? and status = 1", orgid, record_date).Find(&list).Error
@@ -2054,7 +2074,7 @@ func GetFiledConfig(orgid int64) (models.FiledConfig, error) {
 
 func GetDoctorAdviceCheckList(patient_id int64, advice_date int64, user_org_id int64) (doctor []*models.DoctorAdvice, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id =? and status= 1 and check_state= 0", patient_id, advice_date, user_org_id).Find(&doctor).Error
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id =? and status= 1 and checker= 0", patient_id, advice_date, user_org_id).Find(&doctor).Error
 	return doctor, err
 }
 

service/gobal_config_service.go

@@ -1012,7 +1012,7 @@ func GetAllBaseDrugListTwenty(orgid int64) (drug []*models.BaseDrugLibTwenty, er
 
 func GetMobileScheduleList(orgid int64) (schedule []*models.MyVmBloodSchedule, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status= 1 and schedule_date>=1667232000 and schedule_date<=1669737600", orgid).Preload("SchedualPatient", "user_org_id = ? and status = 1", orgid).Find(&schedule).Error
+	err = XTReadDB().Where("user_org_id = ? and status= 1 and schedule_date=1676563200", orgid).Preload("SchedualPatient", "user_org_id = ? and status = 1", orgid).Find(&schedule).Error
 	return schedule, err
 }
 

service/inspection_service.go

@@ -46,6 +46,13 @@ func UpdateDoctorAdvieById(id int64, prescription_number float64) (models.Doctor
 	return advice, err
 }
 
+func UpdateDoctorAdvieByIdOne(id int64, prescription_number float64, single_dose float64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id=? and status= 1 ", id).Updates(map[string]interface{}{"prescribing_number": prescription_number, "single_dose": single_dose}).Error
+	return advice, err
+}
+
 func CreatePatientInspection(inspectins []models.Inspection) (err error) {
 	if len(inspectins) == 0 {
 		err = errors.New("Inspections Cant be nil.")