Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

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

controllers/dialysis_api_controller.go

@@ -146,6 +146,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/getpatientdialysisrecordlist", &DialysisApiController{}, "Get:GetPatientDialysisRecordList")
 
 	beego.Router("/api/patient/getpatientrecordlist", &DialysisApiController{}, "Get:GetPatientRecordList")
+
+	beego.Router("/api/patient/getdialysistotalcount", &DialysisApiController{}, "Get:GetDialysisTotalCount")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -7697,3 +7699,40 @@ func (this *DialysisApiController) GetPatientRecordList() {
 	})
 
 }
+
+func (this *DialysisApiController) GetDialysisTotalCount() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	var startdateunix int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startdateunix = theTime.Unix()
+	}
+	var enddateunix int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		enddateunix = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	order, _ := service.GetDialysisTotalCountByTime(orgId, startdateunix, enddateunix, patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+	})
+}

controllers/his_api_controller.go

@@ -3174,7 +3174,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 9504 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3373,267 +3373,244 @@ func (c *HisApiController) CreateHisPrescription() {
 								//查询保存处方出库开关是否打开
 								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 
-								if drugOutConfig.IsOpen == 1 {
+								if s.PatientId != 30038 {
+									if drugOutConfig.IsOpen == 1 {
 
-									drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, s.DrugId)
-									// 查询该药品最后一次出库记录
-									druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(s.DrugId, patient_id, recordDateTime, s.ID)
+										drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, s.DrugId)
+										// 查询该药品最后一次出库记录
+										druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(s.DrugId, patient_id, recordDateTime, s.ID)
 
-									var is_user_total int64
-									var no_user_total int64
+										var is_user_total int64
+										var no_user_total int64
 
-									if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+										if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
-										prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
-										prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+											prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+											prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
 
-										no_user_total += prescribingNumberSevenTy * drug.MinNumber
-									}
+											no_user_total += prescribingNumberSevenTy * drug.MinNumber
+										}
 
-									if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+										if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
 
-										prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
-										prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-										no_user_total += prescribingNumberSevenTy
-									}
+											prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+											prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+											no_user_total += prescribingNumberSevenTy
+										}
 
-									if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+										if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
 
-										prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
-										prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-										no_user_total += prescribingNumberSevenTy
-									}
-									if len(druginfo) > 0 {
-										for _, it := range druginfo {
-											if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-												it.Count = it.Count * drug.MinNumber
-												is_user_total += it.Count
-											}
+											prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+											prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+											no_user_total += prescribingNumberSevenTy
+										}
+										if len(druginfo) > 0 {
+											for _, it := range druginfo {
+												if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+													it.Count = it.Count * drug.MinNumber
+													is_user_total += it.Count
+												}
 
-											if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-												is_user_total += it.Count
-											}
+												if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+													is_user_total += it.Count
+												}
 
-											if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-												is_user_total += it.Count
+												if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+													is_user_total += it.Count
 
+												}
 											}
-										}
 
-									}
+										}
 
-									fmt.Println("is_user_total-----------------------------", is_user_total)
-									fmt.Println("no_user_total-----------------------------", no_user_total)
+										//fmt.Println("is_user_total-----------------------------", is_user_total)
+										//fmt.Println("no_user_total-----------------------------", no_user_total)
 
-									if is_user_total != no_user_total {
+										if is_user_total != no_user_total {
+											//出库
+											if drug.IsUse == 2 {
+												creater := adminInfo.AdminUser.Id
+												newadviceInfo := &models.HisDoctorAdviceInfo{
+													ID:                    s.ID,
+													UserOrgId:             s.UserOrgId,
+													PatientId:             s.PatientId,
+													HisPatientId:          s.HisPatientId,
+													AdviceType:            s.AdviceType,
+													AdviceDate:            s.AdviceDate,
+													StartTime:             s.StartTime,
+													AdviceName:            s.AdviceName,
+													AdviceDesc:            s.AdviceDesc,
+													ReminderDate:          s.ReminderDate,
+													SingleDose:            s.SingleDose,
+													SingleDoseUnit:        s.SingleDoseUnit,
+													PrescribingNumber:     s.PrescribingNumber,
+													PrescribingNumberUnit: s.PrescribingNumberUnit,
+													DeliveryWay:           s.DeliveryWay,
+													ExecutionFrequency:    s.ExecutionFrequency,
+													AdviceDoctor:          s.AdviceDoctor,
+													Status:                s.Status,
+													CreatedTime:           s.CreatedTime,
+													UpdatedTime:           s.UpdatedTime,
+													AdviceAffirm:          s.AdviceAffirm,
+													Remark:                s.Remark,
+													StopTime:              s.StopTime,
+													StopReason:            s.StopReason,
+													StopDoctor:            s.StopDoctor,
+													StopState:             s.StopState,
+													ParentId:              s.ParentId,
+													ExecutionTime:         s.ExecutionTime,
+													ExecutionStaff:        s.ExecutionStaff,
+													ExecutionState:        s.ExecutionState,
+													Checker:               s.Checker,
+													RecordDate:            s.RecordDate,
+													DialysisOrderId:       s.DialysisOrderId,
+													CheckTime:             s.CheckTime,
+													CheckState:            s.CheckState,
+													DrugSpec:              s.DrugSpec,
+													DrugSpecUnit:          s.DrugSpecUnit,
+													Groupno:               s.Groupno,
+													RemindType:            s.RemindType,
+													FrequencyType:         s.FrequencyType,
+													DayCount:              s.DayCount,
+													WeekDay:               s.WeekDay,
+													TemplateId:            s.TemplateId,
+													Modifier:              s.Modifier,
+													DrugId:                s.DrugId,
+													Price:                 s.Price,
+													PrescriptionId:        s.PrescriptionId,
+													MedListCodg:           s.MedListCodg,
+													FeedetlSn:             s.FeedetlSn,
+													Day:                   s.DayCount,
+													ChildDoctorAdvice:     nil,
+													Drug:                  models.Drug{},
+													Diagnosis:             s.Diagnosis,
+													Way:                   s.Way,
+													HospApprFlag:          s.HospApprFlag,
+													LmtUsedFlag:           s.LmtUsedFlag,
+													HisOrderInfo:          models.HisOrderInfo{},
+													IsMedicine:            s.IsMedicine,
+													ExecutionFrequencyId:  s.ExecutionFrequencyId,
+													Child:                 nil,
+													IsSettle:              s.IsSettle,
+													IsMobile:              s.IsMobile,
+													IsSelfDrug:            s.IsSelfDrug,
+													DrugWayCount:          s.DrugWayCount,
+												}
 
-										if len(druginfo) > 0 {
-											//回退库存
-											//for _, it := range druginfo {
-											//	if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-											//
-											//		service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-											//
-											//	}
-											//	if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-											//
-											//		service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-											//
-											//	}
-											//	if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-											//
-											//		service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-											//
-											//	}
-											//}
-
-											//删除记录
-											//service.DeleteNewDrugAutoWarehouseSeven(s.DrugId, patient_id, recordDateTime, s.ID)
+												var history_count int64
+												var local_count int64
+												//查找已经开过的医嘱信息
+												adviceHistory, _ := service.GetHistory(s.ID, s.UserOrgId, tx)
 
-										}
+												if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
-										//出库
-										if drug.IsUse == 2 {
-											creater := adminInfo.AdminUser.Id
-											newadviceInfo := &models.HisDoctorAdviceInfo{
-												ID:                    s.ID,
-												UserOrgId:             s.UserOrgId,
-												PatientId:             s.PatientId,
-												HisPatientId:          s.HisPatientId,
-												AdviceType:            s.AdviceType,
-												AdviceDate:            s.AdviceDate,
-												StartTime:             s.StartTime,
-												AdviceName:            s.AdviceName,
-												AdviceDesc:            s.AdviceDesc,
-												ReminderDate:          s.ReminderDate,
-												SingleDose:            s.SingleDose,
-												SingleDoseUnit:        s.SingleDoseUnit,
-												PrescribingNumber:     s.PrescribingNumber,
-												PrescribingNumberUnit: s.PrescribingNumberUnit,
-												DeliveryWay:           s.DeliveryWay,
-												ExecutionFrequency:    s.ExecutionFrequency,
-												AdviceDoctor:          s.AdviceDoctor,
-												Status:                s.Status,
-												CreatedTime:           s.CreatedTime,
-												UpdatedTime:           s.UpdatedTime,
-												AdviceAffirm:          s.AdviceAffirm,
-												Remark:                s.Remark,
-												StopTime:              s.StopTime,
-												StopReason:            s.StopReason,
-												StopDoctor:            s.StopDoctor,
-												StopState:             s.StopState,
-												ParentId:              s.ParentId,
-												ExecutionTime:         s.ExecutionTime,
-												ExecutionStaff:        s.ExecutionStaff,
-												ExecutionState:        s.ExecutionState,
-												Checker:               s.Checker,
-												RecordDate:            s.RecordDate,
-												DialysisOrderId:       s.DialysisOrderId,
-												CheckTime:             s.CheckTime,
-												CheckState:            s.CheckState,
-												DrugSpec:              s.DrugSpec,
-												DrugSpecUnit:          s.DrugSpecUnit,
-												Groupno:               s.Groupno,
-												RemindType:            s.RemindType,
-												FrequencyType:         s.FrequencyType,
-												DayCount:              s.DayCount,
-												WeekDay:               s.WeekDay,
-												TemplateId:            s.TemplateId,
-												Modifier:              s.Modifier,
-												DrugId:                s.DrugId,
-												Price:                 s.Price,
-												PrescriptionId:        s.PrescriptionId,
-												MedListCodg:           s.MedListCodg,
-												FeedetlSn:             s.FeedetlSn,
-												Day:                   s.DayCount,
-												ChildDoctorAdvice:     nil,
-												Drug:                  models.Drug{},
-												Diagnosis:             s.Diagnosis,
-												Way:                   s.Way,
-												HospApprFlag:          s.HospApprFlag,
-												LmtUsedFlag:           s.LmtUsedFlag,
-												HisOrderInfo:          models.HisOrderInfo{},
-												IsMedicine:            s.IsMedicine,
-												ExecutionFrequencyId:  s.ExecutionFrequencyId,
-												Child:                 nil,
-												IsSettle:              s.IsSettle,
-												IsMobile:              s.IsMobile,
-												IsSelfDrug:            s.IsSelfDrug,
-												DrugWayCount:          s.DrugWayCount,
-											}
+													prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
 
-											var history_count int64
-											var local_count int64
-											//查找已经开过的医嘱信息
-											adviceHistory, _ := service.GetHistory(s.ID, s.UserOrgId, tx)
+													local_count += prescribingNumberSevenTy * drug.MinNumber
+												}
 
-											if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+												if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
 
-												prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
-												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													local_count += prescribingNumberSevenTy
+												}
 
-												local_count += prescribingNumberSevenTy * drug.MinNumber
-											}
+												if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
 
-											if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+													prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													local_count += prescribingNumberSevenTy
+												}
 
-												prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
-												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-												local_count += prescribingNumberSevenTy
-											}
+												if adviceHistory.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
-											if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+													prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
 
-												prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
-												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-												local_count += prescribingNumberSevenTy
-											}
+													history_count += prescribingNumberSevenTy * drug.MinNumber
+												}
 
-											if adviceHistory.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+												if adviceHistory.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
 
-												prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
-												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													history_count += prescribingNumberSevenTy
+												}
 
-												history_count += prescribingNumberSevenTy * drug.MinNumber
-											}
+												if adviceHistory.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
 
-											if adviceHistory.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+													prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													history_count += prescribingNumberSevenTy
+												}
 
-												prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
-												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-												history_count += prescribingNumberSevenTy
-											}
+												//fmt.Println("local_count0000000000000000000000000000000000000000000", local_count)
+												//
+												//fmt.Println("history_count999999999999999999999999999999999999999", history_count)
 
-											if adviceHistory.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+												//如果当前出库数量大于历史出库数量则需要出库
+												if local_count > history_count {
+													//按最小单位出库
+													var cha_count = local_count - history_count
 
-												prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
-												prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-												history_count += prescribingNumberSevenTy
-											}
+													//fmt.Println("cha_count000000000000000000000000000", cha_count)
 
-											//fmt.Println("local_count0000000000000000000000000000000000000000000", local_count)
-											//
-											//fmt.Println("history_count999999999999999999999999999999999999999", history_count)
+													newadviceInfo.PrescribingNumber = float64(cha_count)
+													newadviceInfo.PrescribingNumberUnit = drug.MinUnit
 
-											//如果当前出库数量大于历史出库数量则需要出库
-											if local_count > history_count {
-												//按最小单位出库
-												var cha_count = local_count - history_count
+													service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
+												}
 
-												//fmt.Println("cha_count000000000000000000000000000", cha_count)
+												//如果当前出库数量小于历史出库数量则需要退库
+												if local_count < history_count {
 
-												newadviceInfo.PrescribingNumber = float64(cha_count)
-												newadviceInfo.PrescribingNumberUnit = drug.MinUnit
-												service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
-											}
+													var cha_count = history_count - local_count
 
-											//如果当前出库数量小于历史出库数量则需要退库
-											if local_count < history_count {
+													service.NewHisDrugCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
 
-												var cha_count = history_count - local_count
-												//fmt.Println("退库----------------------------", cha_count)
-												service.NewHisDrugCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+													service.NewHisDrugAutoCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+												}
 
-												service.NewHisDrugAutoCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
 											}
 
-										}
-
-										//更新字典里面的库存
-										stockInfo, _ := service.GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, s.UserOrgId, s.DrugId, tx)
-										var sum_count int64
-										for _, its := range stockInfo {
-											baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
-											if its.MaxUnit == baseDrug.MaxUnit {
-												its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+											//更新字典里面的库存
+											stockInfo, _ := service.GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, s.UserOrgId, s.DrugId, tx)
+											var sum_count int64
+											for _, its := range stockInfo {
+												baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
+												if its.MaxUnit == baseDrug.MaxUnit {
+													its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+												}
+												sum_count += its.StockMaxNumber + its.StockMinNumber
 											}
-											sum_count += its.StockMaxNumber + its.StockMinNumber
-										}
-										//更新基础库存
-										service.UpdateNewBaseDrugSumTwo(s.DrugId, sum_count, s.UserOrgId, tx)
-										//剩余库存
-										service.UpdateNewDrugStockCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, sum_count, tx)
+											//更新基础库存
+											service.UpdateNewBaseDrugSumTwo(s.DrugId, sum_count, s.UserOrgId, tx)
+											//剩余库存
+											service.UpdateNewDrugStockCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, sum_count, tx)
 
-										over, _ := service.FindNewOverCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, tx)
-										service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
+											over, _ := service.FindNewOverCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, tx)
+											service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
 
-										//创建医嘱
-										service.CreateHisDoctorAdviceOne(&s, tx)
+											//创建医嘱
+											service.CreateHisDoctorAdviceOne(&s, tx)
 
-										adviceObj, _ := service.GetLastHisDoctorAdviceById(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
+											adviceObj, _ := service.GetLastHisDoctorAdviceById(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
 
-										outInfoTwo, _ := service.GetDrugWarehouseOutInfoByAdviceId(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
+											outInfoTwo, _ := service.GetDrugWarehouseOutInfoByAdviceId(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
 
-										if len(outInfoTwo) > 0 {
-											for _, item := range outInfoTwo {
-												service.UpdateDrugOutInfoByAdviceId(item.ID, adviceObj.ID, tx)
+											if len(outInfoTwo) > 0 {
+												for _, item := range outInfoTwo {
+													service.UpdateDrugOutInfoByAdviceId(item.ID, adviceObj.ID, tx)
+												}
 											}
-										}
 
-										drugAutoDetail, _ := service.GetDrugAutoDetail(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
-										if len(drugAutoDetail) > 0 {
-											for _, item := range drugAutoDetail {
-												service.UpdateDrugAutoDetail(item.ID, adviceObj.ID, tx)
+											drugAutoDetail, _ := service.GetDrugAutoDetail(s.PatientId, s.UserOrgId, s.AdviceDate, s.DrugId, tx)
+											if len(drugAutoDetail) > 0 {
+												for _, item := range drugAutoDetail {
+													service.UpdateDrugAutoDetail(item.ID, adviceObj.ID, tx)
+												}
 											}
 										}
 									}
@@ -3764,142 +3741,96 @@ func (c *HisApiController) CreateHisPrescription() {
 								service.CreateNewHisProjectTwo(&p, tx)
 
 								//查询保存耗材出库开关是否打开
-								if goodOutConfig.IsOpen == 1 {
-									//耗材出库
-									if p.Type == 3 {
-										lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
-										//查询历史出库数据
-										flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
-
-										var out_count_five int64
-										for _, item := range flowGood {
-											out_count_five += item.Count
-										}
-										parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
-
-										//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
-										if out_count_five != parseIntCount {
-											//查询耗材最后一次出库记录
-											wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(p.ProjectId, patient_id, recordDateTime, lastHisProject.ID)
-											//查询默认出库仓库库存
-											storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
-											if len(wareOut) > 0 {
-
-												for _, it := range wareOut {
-													//回退库存
-													service.ModifyGoodWarehouseInfo(it.GoodId, it.WarehouseInfotId, it.OrgId, it.Count)
-
-													//删除出库记录
-													service.DeleteGoodWarehouseOutInfo(it.GoodId, it.SysRecordTime, it.OrgId, it.ProjectId)
-
-												}
+								if p.PatientId != 30038 {
+									if goodOutConfig.IsOpen == 1 {
+										//耗材出库
+										if p.Type == 3 {
+											lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
+											//查询历史出库数据
+											flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+
+											var out_count_five int64
+											for _, item := range flowGood {
+												out_count_five += item.Count
 											}
+											parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
-											timeStr := time.Now().Format("2006-01-02")
-											timeArr := strings.Split(timeStr, "-")
-											total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
-
-											total = total + 1
-											warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-											number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-											number = number + total
-											warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-
-											operation_time := time.Now().Unix()
-											creater := c.GetAdminUserInfo().AdminUser.Id
-
-											recordDateStr := time.Now().Format("2006-01-02")
-											recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-											nowtime := recordDate.Unix()
-											warehouseOut := models.WarehouseOut{
-												WarehouseOutOrderNumber: warehousing_out_order,
-												OperationTime:           operation_time,
-												OrgId:                   adminInfo.CurrentOrgId,
-												Creater:                 creater,
-												Ctime:                   time.Now().Unix(),
-												Status:                  1,
-												WarehouseOutTime:        nowtime,
-												Type:                    1,
-												StorehouseId:            storeConfig.StorehouseOutInfo,
-												IsCheck:                 1,
-												IsSys:                   1,
-											}
-											//查询是否生成出库单
-											out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
-											if out.ID == 0 {
-												service.AddNewSigleWarehouseOut(&warehouseOut, tx)
-											}
+											//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
+											if out_count_five != parseIntCount {
+												//查询耗材最后一次出库记录
+												wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(p.ProjectId, patient_id, recordDateTime, lastHisProject.ID)
+												//查询默认出库仓库库存
+												storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+												if len(wareOut) > 0 {
 
-											lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
-
-											goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
-											houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
-
-											dialyPrepareOne := models.DialysisBeforePrepare{
-												GoodTypeId:   goodObj.GoodTypeId,
-												GoodId:       p.ProjectId,
-												PatientId:    p.PatientId,
-												RecordDate:   p.RecordDate,
-												UserOrgId:    adminInfo.CurrentOrgId,
-												Count:        parseIntCount,
-												Ctime:        time.Now().Unix(),
-												Creater:      creater,
-												Status:       1,
-												StorehouseId: houseConfig.StorehouseOutInfo,
-												ProjectId:    lastHisProject.ID,
-											}
-											//判断是否是零用耗材(非零用)
-											if goodObj.IsUse == 2 || goodObj.IsUse == 0 {
-
-												//查询历史出库数据
-												flowGood, _ := service.GetNewStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
-												var out_count int64
-												for _, item := range flowGood {
-													out_count += item.Count
-												}
-												//如果历史数和当前数据不想等才进行退库出库
-												if out_count != parseIntCount {
-													service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
-
-													service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
-													detail := models.AutomaticReduceDetail{
-														WarehouseOutId:          0,
-														WarehouseOutOrderNumber: "",
-														PatientId:               p.PatientId,
-														Ctime:                   time.Now().Unix(),
-														Mtime:                   0,
-														Status:                  1,
-														RecordTime:              p.RecordDate,
-														OrgId:                   p.UserOrgId,
-														GoodId:                  p.ProjectId,
-														GoodTypeId:              0,
-														Count:                   parseIntCount,
-														Type:                    0,
-														ProjectId:               lastHisProject.ID,
-														StorehouseId:            0,
-													}
+													for _, it := range wareOut {
+														//回退库存
+														service.ModifyGoodWarehouseInfo(it.GoodId, it.WarehouseInfotId, it.OrgId, it.Count)
 
-													service.CreateNewAutoDetail(detail, tx)
+														//删除出库记录
+														service.DeleteGoodWarehouseOutInfo(it.GoodId, it.SysRecordTime, it.OrgId, it.ProjectId)
 
-													//查询剩余库存
-													goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
-													var sum_count int64
-													for _, item := range goodList {
-														sum_count += item.StockCount
 													}
+												}
 
-													//更新剩余库存
-													service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
-
-													//耗材
-													service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+												timeStr := time.Now().Format("2006-01-02")
+												timeArr := strings.Split(timeStr, "-")
+												total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
+
+												total = total + 1
+												warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+												number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+												number = number + total
+												warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+
+												operation_time := time.Now().Unix()
+												creater := c.GetAdminUserInfo().AdminUser.Id
+
+												recordDateStr := time.Now().Format("2006-01-02")
+												recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+												nowtime := recordDate.Unix()
+												warehouseOut := models.WarehouseOut{
+													WarehouseOutOrderNumber: warehousing_out_order,
+													OperationTime:           operation_time,
+													OrgId:                   adminInfo.CurrentOrgId,
+													Creater:                 creater,
+													Ctime:                   time.Now().Unix(),
+													Status:                  1,
+													WarehouseOutTime:        nowtime,
+													Type:                    1,
+													StorehouseId:            storeConfig.StorehouseOutInfo,
+													IsCheck:                 1,
+													IsSys:                   1,
+												}
+												//查询是否生成出库单
+												out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+												if out.ID == 0 {
+													service.AddNewSigleWarehouseOut(&warehouseOut, tx)
+												}
 
+												lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+
+												goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+												houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+
+												dialyPrepareOne := models.DialysisBeforePrepare{
+													GoodTypeId:   goodObj.GoodTypeId,
+													GoodId:       p.ProjectId,
+													PatientId:    p.PatientId,
+													RecordDate:   p.RecordDate,
+													UserOrgId:    adminInfo.CurrentOrgId,
+													Count:        parseIntCount,
+													Ctime:        time.Now().Unix(),
+													Creater:      creater,
+													Status:       1,
+													StorehouseId: houseConfig.StorehouseOutInfo,
+													ProjectId:    lastHisProject.ID,
 												}
-												//判断是否是零用耗材(零用但是是出库耗材)
-												if goodObj.IsUse == 1 && goodObj.IsWarehouse == 1 {
+												//判断是否是零用耗材(非零用)
+												if goodObj.IsUse == 2 || goodObj.IsUse == 0 {
 
 													//查询历史出库数据
-													flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+													flowGood, _ := service.GetNewStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
 													var out_count int64
 													for _, item := range flowGood {
 														out_count += item.Count
@@ -3922,7 +3853,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															GoodTypeId:              0,
 															Count:                   parseIntCount,
 															Type:                    0,
-															ProjectId:               p.ID,
+															ProjectId:               lastHisProject.ID,
 															StorehouseId:            0,
 														}
 
@@ -3940,84 +3871,133 @@ func (c *HisApiController) CreateHisPrescription() {
 
 														//耗材
 														service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+
+													}
+													//判断是否是零用耗材(零用但是是出库耗材)
+													if goodObj.IsUse == 1 && goodObj.IsWarehouse == 1 {
+
+														//查询历史出库数据
+														flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+														var out_count int64
+														for _, item := range flowGood {
+															out_count += item.Count
+														}
+														//如果历史数和当前数据不想等才进行退库出库
+														if out_count != parseIntCount {
+															service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
+
+															service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+															detail := models.AutomaticReduceDetail{
+																WarehouseOutId:          0,
+																WarehouseOutOrderNumber: "",
+																PatientId:               p.PatientId,
+																Ctime:                   time.Now().Unix(),
+																Mtime:                   0,
+																Status:                  1,
+																RecordTime:              p.RecordDate,
+																OrgId:                   p.UserOrgId,
+																GoodId:                  p.ProjectId,
+																GoodTypeId:              0,
+																Count:                   parseIntCount,
+																Type:                    0,
+																ProjectId:               p.ID,
+																StorehouseId:            0,
+															}
+
+															service.CreateNewAutoDetail(detail, tx)
+
+															//查询剩余库存
+															goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
+															var sum_count int64
+															for _, item := range goodList {
+																sum_count += item.StockCount
+															}
+
+															//更新剩余库存
+															service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+
+															//耗材
+															service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+														}
+
 													}
 
 												}
 
 											}
 
-										}
-
-										//记录日志
-										byterequest, _ := json.Marshal(p)
-										adviceLog := models.XtDoctorAdviceLog{
-											UserOrgId:   p.UserOrgId,
-											PatientId:   p.PatientId,
-											AdminUserId: adminInfo.AdminUser.Id,
-											Module:      1,
-											ErrLog:      string(byterequest),
-											Status:      1,
-											Ctime:       time.Now().Unix(),
-											Mtime:       0,
-											Source:      "电脑端新建his项目",
-											RecordDate:  p.RecordDate,
-										}
-										service.CreateDoctorAdviceLog(adviceLog)
-
-										projectList = append(projectList, p)
-
-										if p.Type == 2 { //因为项目和耗材的基础库存在id相同的情况，所以需要根据该字段来判断，type为2的话为从项目开出来的
-											//新增或者编辑项目，修改对应的标签数据
-											labelOrigin, _ := service.GetProjectById(p.UserOrgId, p.ID, patient_id, recordDateTime)
-											if labelOrigin.ID == 0 { //当天某个人的处方中的项目不存在
-												var label models.HisLabelPrintInfo
-												project, _ := service.GetProjectDetail(p.ProjectId)
-												if project.CostClassify == 3 { //类别为检验检查
-													if p.TeamId > 0 { //检验检查组套
-														tempLabel, _ := service.GetProjectByTeamId(p.UserOrgId, p.TeamId, patient_id, recordDateTime)
-														if tempLabel.ID == 0 {
-															team, _ := service.GetProjectTeamDetail(p.TeamId)
+											//记录日志
+											byterequest, _ := json.Marshal(p)
+											adviceLog := models.XtDoctorAdviceLog{
+												UserOrgId:   p.UserOrgId,
+												PatientId:   p.PatientId,
+												AdminUserId: adminInfo.AdminUser.Id,
+												Module:      1,
+												ErrLog:      string(byterequest),
+												Status:      1,
+												Ctime:       time.Now().Unix(),
+												Mtime:       0,
+												Source:      "电脑端新建his项目",
+												RecordDate:  p.RecordDate,
+											}
+											service.CreateDoctorAdviceLog(adviceLog)
+
+											projectList = append(projectList, p)
+
+											if p.Type == 2 { //因为项目和耗材的基础库存在id相同的情况，所以需要根据该字段来判断，type为2的话为从项目开出来的
+												//新增或者编辑项目，修改对应的标签数据
+												labelOrigin, _ := service.GetProjectById(p.UserOrgId, p.ID, patient_id, recordDateTime)
+												if labelOrigin.ID == 0 { //当天某个人的处方中的项目不存在
+													var label models.HisLabelPrintInfo
+													project, _ := service.GetProjectDetail(p.ProjectId)
+													if project.CostClassify == 3 { //类别为检验检查
+														if p.TeamId > 0 { //检验检查组套
+															tempLabel, _ := service.GetProjectByTeamId(p.UserOrgId, p.TeamId, patient_id, recordDateTime)
+															if tempLabel.ID == 0 {
+																team, _ := service.GetProjectTeamDetail(p.TeamId)
+																label.Number = tempPrescription.PrescriptionNumber
+																label.ProjectId = project.ID
+																label.Status = 1
+																label.IsPrint = 2
+																label.DoctorId = info.DoctorId
+																label.UserOrgId = p.UserOrgId
+																label.PatientId = patient_id
+																label.RecordDate = recordDateTime
+																label.Ctime = time.Now().Unix()
+																label.Mtime = time.Now().Unix()
+																label.ItemId = p.TeamId
+																label.FeedetlSn = p.FeedetlSn
+																label.PProjectId = p.ID
+																label.ProjectName = team.ProjectTeam
+																label.PatientName = patient.Name
+																service.CreateNewHisLabelRecord(&label, tx)
+															}
+														} else { //单条检验检查项目
 															label.Number = tempPrescription.PrescriptionNumber
 															label.ProjectId = project.ID
 															label.Status = 1
-															label.IsPrint = 2
 															label.DoctorId = info.DoctorId
 															label.UserOrgId = p.UserOrgId
 															label.PatientId = patient_id
 															label.RecordDate = recordDateTime
+															label.IsPrint = 2
 															label.Ctime = time.Now().Unix()
 															label.Mtime = time.Now().Unix()
-															label.ItemId = p.TeamId
 															label.FeedetlSn = p.FeedetlSn
 															label.PProjectId = p.ID
-															label.ProjectName = team.ProjectTeam
+															label.ItemId = p.TeamId
+															label.ProjectName = project.ProjectName
 															label.PatientName = patient.Name
 															service.CreateNewHisLabelRecord(&label, tx)
 														}
-													} else { //单条检验检查项目
-														label.Number = tempPrescription.PrescriptionNumber
-														label.ProjectId = project.ID
-														label.Status = 1
-														label.DoctorId = info.DoctorId
-														label.UserOrgId = p.UserOrgId
-														label.PatientId = patient_id
-														label.RecordDate = recordDateTime
-														label.IsPrint = 2
-														label.Ctime = time.Now().Unix()
-														label.Mtime = time.Now().Unix()
-														label.FeedetlSn = p.FeedetlSn
-														label.PProjectId = p.ID
-														label.ItemId = p.TeamId
-														label.ProjectName = project.ProjectName
-														label.PatientName = patient.Name
-														service.CreateNewHisLabelRecord(&label, tx)
 													}
 												}
 											}
-										}
 
+										}
 									}
 								}
+
 								tx.Commit()
 							}
 						}

controllers/his_project_api_controller.go

@@ -1207,8 +1207,13 @@ func (this *HisProjectApiController) ChangePatient() {
 func (this *HisProjectApiController) GetPatientcaseHistory() {
 
 	patient_id, _ := this.GetInt64("patient_id")
+	record_date := this.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+
 	patient, err := service.GetBloodPatientInfoById(patient_id)
-	history, _ := service.GetPatientCaseHistory(patient_id)
+	history, _ := service.GetPatientCaseHistory(patient_id, startTime.Unix())
 	hispatient, _ := service.GetHisPatientById(patient_id)
 
 	//获取患者最后一次的血管通路

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2811,6 +2811,8 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.BloodFlow = lastAssessmentAfterDislysis.BloodFlow
 		tempassessmentAfterDislysis.SealingFluidDispose = lastAssessmentAfterDislysis.SealingFluidDispose
 		tempassessmentAfterDislysis.SealingFluidSpecial = lastAssessmentAfterDislysis.SealingFluidSpecial
+		tempassessmentAfterDislysis.Ktv = lastAssessmentAfterDislysis.Ktv
+		tempassessmentAfterDislysis.Urr = lastAssessmentAfterDislysis.Urr
 		if tempassessmentAfterDislysis.PatientId == 18695 {
 			tempassessmentAfterDislysis.ActualDisplacement = 0
 		}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -1547,3 +1547,40 @@ func (c *StaffScheduleApiController) GetPatientMap() {
 	})
 	return
 }
+
+func (c *StaffScheduleApiController) GetMobileDialysisCount() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	start_time := c.GetString("start_time")
+
+	end_time := c.GetString("end_time")
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	var startdateunix int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startdateunix = theTime.Unix()
+	}
+	var enddateunix int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		enddateunix = theTime.Unix()
+	}
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+	order, _ := service.GetDialysisTotalCountByTime(orgId, startdateunix, enddateunix, patient_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+	})
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -40,4 +40,6 @@ func StaffScheduleApiControllersRegisterRouters() {
 
 	beego.Router("m/api/patient/getpatientmap", &StaffScheduleApiController{}, "Get:GetPatientMap")
 
+	beego.Router("/m/api/patient/getmobiledialysiscount", &StaffScheduleApiController{}, "Get:GetMobileDialysisCount")
+
 }

controllers/sign_api_controller.go

@@ -1244,12 +1244,12 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
 	//}
 
-	//drugList, _ := service.GetAllBaseDrugList(10653)
-	//for _, item := range drugList {
-	//	service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
-	//
-	//	//service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
-	//}
+	drugList, _ := service.GetAllBaseDrugList(10318)
+	for _, item := range drugList {
+		service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
+
+		//service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
+	}
 
 	//goodList, _ := service.GetAllGoodList(10571)
 	//for _, item := range goodList {

models/schedule_models.go

@@ -150,6 +150,31 @@ func (SchedulePatients) TableName() string {
 	return "xt_schedule"
 }
 
+type XtTreatmentMode struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	Name                string `gorm:"column:name" json:"name" form:"name"`
+	DialysisDuration    int64  `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
+	ReplacementWay      int64  `gorm:"column:replacement_way" json:"replacement_way" form:"replacement_way"`
+	HemodialysisMachine int64  `gorm:"column:hemodialysis_machine" json:"hemodialysis_machine" form:"hemodialysis_machine"`
+	BloodFilter         int64  `gorm:"column:blood_filter" json:"blood_filter" form:"blood_filter"`
+	PerfusionApparatus  int64  `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
+	BloodFlowVolume     int64  `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	DialysateFlow       int64  `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Kalium              int64  `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	Sodium              int64  `gorm:"column:sodium" json:"sodium" form:"sodium"`
+	Calcium             int64  `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	Bicarbonate         int64  `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
+	Remark              string `gorm:"column:remark" json:"remark" form:"remark"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime         int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime         int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ModeID              int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+}
+
+func (XtTreatmentMode) TableName() string {
+	return "xt_treatment_mode"
+}
+
 type PatientSchedule struct {
 	Schedule
 

service/his_project_service.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"time"
+
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
-	"time"
 )
 
 func GetHisProjectIsExist(projectName string, orgid int64) (*models.XtHisProject, error) {
@@ -366,10 +367,17 @@ func GetBloodPatientInfoById(patientid int64) (models.XtPatients, error) {
 	return patients, err
 }
 
-func GetPatientCaseHistory(patientid int64) (models.HisPatientCaseHistory, error) {
+func GetPatientCaseHistory(patientid int64, record_date int64) (models.HisPatientCaseHistory, error) {
 
 	history := models.HisPatientCaseHistory{}
-	err := XTReadDB().Model(&history).Where("patient_id = ? and status = 1", patientid).Last(&history).Error
+	db := XTReadDB().Model(&history).Where("status=1")
+	if patientid > 0 {
+		db = db.Where("patient_id =?", patientid)
+	}
+	if record_date > 0 {
+		db = db.Where("record_date = ?", record_date)
+	}
+	err := db.Last(&history).Error
 	return history, err
 }
 

service/patient_service.go

@@ -4052,3 +4052,24 @@ func GetMonitorRecordList(patient_id int64, monitor_date int64, user_org_id int6
 	err = XTReadDB().Where("patient_id = ? and user_org_id =? and monitoring_date = ? and status =1", patient_id, user_org_id, monitor_date).Find(&monitor).Error
 	return monitor, err
 }
+
+func GetDialysisTotalCountByTime(user_org_id int64, start_time int64, end_time int64, patient_id int64) (order []*models.XtDialysisOrder, err error) {
+
+	db := XTReadDB().Table("xt_dialysis_order").Where("status =1")
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("dialysis_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("dialysis_date <=?", end_time)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	err = db.Find(&order).Error
+
+	return order, err
+}

service/schedule_service.go

@@ -575,19 +575,19 @@ func (WeekSchedulePrintDeviceNumber) TableName() string {
 }
 
 type WeekSchedulePrintVMTwo struct {
-	ID             int64 `gorm:"column:id" json:"id"`
-	ZoneID         int64 `gorm:"column:partition_id" json:"zone_id"`
-	DeviceNumberID int64 `gorm:"column:bed_id" json:"device_number_id"`
-	PatientID      int64 `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate   int64 `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType   int64 `gorm:"column:schedule_type" json:"schedule_type"`
-	ScheduleWeek   int64 `gorm:"column:schedule_week" json:"schedule_week"`
-	ModeID         int64 `gorm:"column:mode_id" json:"mode_id"`
-
-	Patient      *WeekSchedulePrintPatients     `gorm:"ForeignKey:PatientID" json:"patient"`
-	DeviceNumber *WeekSchedulePrintDeviceNumber `gorm:"ForeignKey:DeviceNumberID" json:"device_number"`
-	Zone         *models.DeviceZone             `gorm:"ForeignKey:ZoneID" json:"zone"`
-	Mode         *models.TreatmentMode          `gorm:"ForeignKey:ModeID" json:"mode"`
+	ID             int64                          `gorm:"column:id" json:"id"`
+	ZoneID         int64                          `gorm:"column:partition_id" json:"zone_id"`
+	DeviceNumberID int64                          `gorm:"column:bed_id" json:"device_number_id"`
+	PatientID      int64                          `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate   int64                          `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType   int64                          `gorm:"column:schedule_type" json:"schedule_type"`
+	ScheduleWeek   int64                          `gorm:"column:schedule_week" json:"schedule_week"`
+	ModeID         int64                          `gorm:"column:mode_id" json:"mode_id"`
+	Patient        *WeekSchedulePrintPatients     `gorm:"ForeignKey:PatientID" json:"patient"`
+	DeviceNumber   *WeekSchedulePrintDeviceNumber `gorm:"ForeignKey:DeviceNumberID" json:"device_number"`
+	Zone           *models.DeviceZone             `gorm:"ForeignKey:ZoneID" json:"zone"`
+	//Mode           *models.TreatmentMode          `gorm:"ForeignKey:ModeID" json:"mode"`
+	Mode *models.XtTreatmentMode `json:"mode" gorm:"foreignkey:ModeID,ModeID;AssociationForeignKey:ModeID,ModeID"`
 }
 
 type PrintCount struct {

service/secondary_service.go

@@ -1153,7 +1153,7 @@ 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 status=1", good_id, user_org_id).Order("id asc").Find(&list).Error
+	err = XTReadDB().Where("good_id = ? and user_org_id =?  and status=1 and ctime>=1711900800", good_id, user_org_id).Order("id asc").Find(&list).Error
 	return list, err
 }
 

service/statistis_qc_service.go

@@ -1,13 +1,14 @@
 package service
 
 import (
-	"XT_New/models"
 	"database/sql"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"reflect"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func GetDialysisTotalDatas() {