库存流水展示

controllers/dialysis_api_controller.go

@@ -658,7 +658,7 @@ func (c *DialysisApiController) PostPrescription() {
 			PatientId:  patient,
 		}
 
-		dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
@@ -944,6 +944,30 @@ func (c *DialysisApiController) PostSoulution() {
 	//	}
 	//}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= recordDate.Unix() {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	prescription := models.DialysisPrescription{
 		UserOrgId:                 adminUserInfo.CurrentOrgId,
 		PatientId:                 patient,
@@ -1113,6 +1137,24 @@ func (c *DialysisApiController) PostSoulution() {
 	//  }
 	//}
 
+	//创建步骤表
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     1,
+		RecordDate: recordDate.Unix(),
+		Sourse:     1,
+		PatientId:  patient,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
+
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if dialysisPrescription.ID == 0 { //新增
 		if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -1541,7 +1583,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 			PatientId:  id,
 		}
 
-		dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 5, id)
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 5, id)
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
@@ -1742,7 +1784,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 			PatientId:  id,
 		}
 
-		dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 2, id)
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 2, id)
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
@@ -2237,7 +2279,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			PatientId:  patient,
 		}
 
-		dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 3, patient)
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 3, patient)
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
@@ -3488,7 +3530,49 @@ func (c *DialysisApiController) CreateMonitor() {
 		Dicarbonate:               dicarbonate,
 	}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= monitoring_date {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, monitoring_date, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	err := service.CreateMonitor(&monitorRecord)
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     7,
+		RecordDate: monitoring_date,
+		Sourse:     1,
+		PatientId:  patient,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, monitoring_date, 7, patient)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
+
 	redis := service.RedisClient()
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(monitoring_date, 10) + ":monitor_record_list_all"
 

controllers/dialysis_record_api_controller.go

@@ -1098,7 +1098,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		PatientId:  patientID,
 	}
 
-	dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 6, patientID)
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 6, patientID)
 	if dialysisFinish.ID == 0 {
 		service.CreateDialysisFinish(finish)
 	}
@@ -1276,6 +1276,23 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			}
 
 			err := service.CreateMonitor(&record)
+
+			finish := models.XtDialysisFinish{
+				IsFinish:   1,
+				UserOrgId:  adminUserInfo.CurrentOrgId,
+				Status:     1,
+				Ctime:      time.Now().Unix(),
+				Mtime:      0,
+				Module:     7,
+				RecordDate: recordDate.Unix(),
+				Sourse:     1,
+				PatientId:  patientID,
+			}
+
+			dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 7, patientID)
+			if dialysisFinish.ID == 0 {
+				service.CreateDialysisFinish(finish)
+			}
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 
 			redis := service.RedisClient()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -911,8 +911,6 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 			//今日的日期减去设置的日期
 			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
 
-			fmt.Println(" recordDate.Unix()-----------", recordDate.Unix())
-			fmt.Println("cha_time-------------", cha_time)
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
 				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -1434,6 +1432,30 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+		fmt.Println("recordDate.Unix()", recordDate.Unix())
+		if cha_time >= recordDate.Unix() {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
 	_, assessmentAfter := service.FindAssessmentAfterDislysisByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if assessmentAfter.ID == 0 { //新增
 		if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -1445,30 +1467,6 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 		}
 
-		// 查询信息规挡的设置天数
-
-		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-		if infor.ID > 0 {
-
-			var cha_time int64
-
-			timeNowStr := time.Now().Format("2006-01-02")
-			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
-
-			//今日的日期减去设置的日期
-			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
-
-			if cha_time >= recordDate.Unix() {
-				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
-				//申请状态不允许的情况 拒绝修改
-				if infor.ApplicationStatus != 1 {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
-					return
-				}
-
-			}
-		}
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
@@ -1482,7 +1480,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 			PatientId:  id,
 		}
 
-		dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.Org.Id, recordDate.Unix(), 9, id)
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.Org.Id, recordDate.Unix(), 9, id)
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
@@ -1529,7 +1527,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyOne, "", time.Second)
-		fmt.Println("err233332323232232323", err)
+
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
@@ -2990,6 +2988,31 @@ func (this *DialysisAPIController) StartDialysis() {
 		return
 	}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= recordDate.Unix() {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.Org.Id)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	dialysisRecord = &models.DialysisOrder{
 		DialysisDate:           recordDate.Unix(),
 		UserOrgId:              adminUserInfo.Org.Id,
@@ -3034,7 +3057,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			Ctime:      time.Now().Unix(),
 			Mtime:      0,
 			Module:     6,
-			RecordDate: recordDate.Unix(),
+			RecordDate: schedulestartTime,
 			Sourse:     1,
 			PatientId:  patientID,
 		}
@@ -3218,31 +3241,6 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.Temperature = 36.5
 		}
 
-		// 查询信息规挡的设置天数
-
-		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-		if infor.ID > 0 {
-
-			var cha_time int64
-
-			timeNowStr := time.Now().Format("2006-01-02")
-			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
-
-			//今日的日期减去设置的日期
-			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
-
-			if cha_time >= recordDate.Unix() {
-				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.Org.Id)
-				//申请状态不允许的情况 拒绝修改
-				if infor.ApplicationStatus != 1 {
-					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
-					return
-				}
-
-			}
-		}
-
 		err := service.CreateMonitor(&record)
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
@@ -3251,7 +3249,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			Ctime:      time.Now().Unix(),
 			Mtime:      0,
 			Module:     7,
-			RecordDate: recordDate.Unix(),
+			RecordDate: schedulestartTime,
 			Sourse:     1,
 			PatientId:  patientID,
 		}

controllers/patient_api_controller.go

@@ -1763,7 +1763,7 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 		PatientId:  patient,
 	}
 
-	dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, advice.AdviceDate, 1, patient)
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, advice.AdviceDate, 4, patient)
 	if dialysisFinish.ID == 0 {
 		service.CreateDialysisFinish(finish)
 	}

service/stock_service.go

@@ -6299,7 +6299,7 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 
 func UpdateWarehouseInfoByGoodIdOne(info *models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber}).Error
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber, "good_id": info.GoodId}).Error
 	return err
 }