2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id
+		subscibe.OrgId = 10028 //机构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 = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英9675或4
+		subscibe.OrgId = 10028 //机构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 = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/drug_stock_api_contorller.go

@@ -13,7 +13,6 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 )
 
 type StockDrugApiController struct {
@@ -3280,10 +3279,6 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 
 	warehousing_id, _ := c.GetInt64("warehousing_id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-
-	checker := c.GetAdminUserInfo().AdminUser.Id
-
 	// 开始外部循环的事务
 	db := service.XTWriteDB()
 	tx := db.Begin()
@@ -3294,6 +3289,9 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			tx.Rollback()
 		}
 	}()
+	houseConfig, _ := service.GetNewAllStoreHouseConfig(orgId, tx)
+
+	checker := c.GetAdminUserInfo().AdminUser.Id
 
 	//更改核对状态
 	service.CheckNewWarehousingInfo(warehousing_id, orgId, checker, tx)
@@ -3392,8 +3390,9 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			over_count += it.StockMaxNumber + it.StockMinNumber
 		}
 		//查询该仓库是否有默认数据
-		_, errcode := service.GetNewDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId, tx)
-		if errcode == gorm.ErrRecordNotFound {
+		drugStockCount, _ := service.GetNewDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId, tx)
+		fmt.Println("errcode======================", drugStockCount.ID)
+		if drugStockCount.ID == 0 {
 			drugStock := models.XtDrugStockCount{
 				UserOrgId:      item.OrgId,
 				StorehouseId:   item.StorehouseId,
@@ -3409,7 +3408,8 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			}
 			service.CreateNewDrugStockSum(drugStock, tx)
 
-		} else if errcode == nil {
+		}
+		if drugStockCount.ID > 0 {
 			service.UpdateNewDrugStockSum(item.StorehouseId, item.DrugId, item.OrgId, total_count, over_count, tx)
 		}
 	}

controllers/his_api_controller.go

@@ -3619,7 +3619,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 						advices := items["advices"].([]interface{})
-						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
 						groupNo := int64(0)
 						if len(advices) > 0 {
 							for _, advice := range advices {
@@ -3695,6 +3694,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									if drugOutConfig.IsOpen == 1 {
 
 										drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, s.DrugId)
+
 										// 查询该药品最后一次出库记录
 										druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(s.DrugId, patient_id, recordDateTime, s.ID)
 
@@ -3741,6 +3741,110 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										}
 
+										//库存不足
+										if s.UserOrgId != 10206 {
+											if s.ID == 0 {
+												//查询改药品是否已经停用
+												base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+
+												if base.ID > 0 {
+													tx.Rollback()
+													c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+													return
+
+												}
+
+												drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
+
+												if drugMedical.SumCount == 0 {
+													tx.Rollback()
+													c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+													return
+
+												}
+
+												//针对康德
+												if s.UserOrgId == 10402 || s.UserOrgId == 10164 {
+													//获取该药品的总入库数量
+													drugWarehouseinfo, _ := service.GetAllDrugInfoList(s.DrugId, s.UserOrgId)
+
+													//获取该药品总共开了多少支医嘱
+													hisDocInfoList, _ := service.GetHisDocInfoList(s.DrugId, s.UserOrgId)
+													var in_count int64
+													var in_prescription_number_total int64
+													if len(drugWarehouseinfo) > 0 {
+														for _, item := range drugWarehouseinfo {
+															if item.MaxUnit == drugMedical.MaxUnit && drugMedical.MaxUnit != drugMedical.MinUnit {
+
+																in_count += item.WarehousingCount * drugMedical.MinNumber
+															}
+
+															if item.MaxUnit == drugMedical.MinUnit && drugMedical.MaxUnit != drugMedical.MinUnit {
+
+																in_count += item.WarehousingCount
+															}
+
+															if item.MaxUnit == drugMedical.MinUnit && drugMedical.MaxUnit == drugMedical.MinUnit {
+
+																in_count += item.WarehousingCount
+															}
+
+														}
+													}
+
+													if len(hisDocInfoList) > 0 {
+
+														for _, item := range hisDocInfoList {
+															if item.PrescribingNumberUnit == drugMedical.MaxUnit && drugMedical.MaxUnit != drugMedical.MinUnit {
+																prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+																prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+
+																in_prescription_number_total += prescribingNumberSevenTy * drug.MinNumber
+															}
+
+															if item.PrescribingNumberUnit == drugMedical.MinUnit && drugMedical.MaxUnit != drugMedical.MinUnit {
+																prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+																prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+																in_prescription_number_total += prescribingNumberSevenTy
+															}
+
+															if item.PrescribingNumberUnit == drugMedical.MinUnit && drugMedical.MaxUnit == drugMedical.MinUnit {
+																prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+																prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+																in_prescription_number_total += prescribingNumberSevenTy
+															}
+														}
+													}
+													//
+													//fmt.Println("no_user_total------------------------------", no_user_total)
+													//fmt.Println("in_prescription_number_total---------------------------", in_prescription_number_total)
+													//fmt.Println("in_count----------------------------------", in_count)
+
+													//如果已经开过的医嘱 加上未开的医嘱数量 大于 入库总数量则提示库存不足
+													if no_user_total+in_prescription_number_total > in_count {
+														tx.Rollback()
+														c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+														return
+													}
+
+												}
+
+												//查询该药品所有入库数量
+
+											}
+											if s.ID > 0 {
+												//查询改药品是否已经停用
+												base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+
+												if base.ID > 0 {
+													tx.Rollback()
+													c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+													return
+
+												}
+											}
+										}
+
 										//fmt.Println("药品名称----------------------", drug.DrugName)
 										//fmt.Println("药品名称----------------------", drug.IsUse)
 										//fmt.Println("is_user_total-------------------------", is_user_total)
@@ -4127,40 +4231,6 @@ func (c *HisApiController) CreateHisPrescription() {
 								timeFormat := tempTime.Format("20060102150405")
 								s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 
-								if s.UserOrgId != 10206 {
-									if s.ID == 0 {
-										//查询改药品是否已经停用
-										base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
-
-										if base.ID > 0 {
-											tx.Rollback()
-											c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
-											return
-
-										}
-
-										drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
-
-										if drugMedical.SumCount == 0 {
-											tx.Rollback()
-											c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
-											return
-
-										}
-									}
-									if s.ID > 0 {
-										//查询改药品是否已经停用
-										base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
-
-										if base.ID > 0 {
-											tx.Rollback()
-											c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
-											return
-
-										}
-									}
-								}
-
 								//赤峰
 								if adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10489 {
 
@@ -4313,7 +4383,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								if p.PatientId != 30038 {
 
 									//用机构ID区分
-									if adminInfo.CurrentOrgId != 9671 && adminInfo.CurrentOrgId != 10164 {
+									if adminInfo.CurrentOrgId != 9671 {
 										if goodOutConfig.IsOpen == 1 {
 											//耗材出库
 											if p.Type == 3 {
@@ -4326,6 +4396,44 @@ func (c *HisApiController) CreateHisPrescription() {
 
 												nowCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
+												//针对康德
+												if p.UserOrgId == 10164 || p.UserOrgId == 10402 {
+
+													//查询耗材的总入库数量
+													warehouseInfo, _ := service.GetAllWarehouseInfo(p.ProjectId, adminInfo.CurrentOrgId)
+
+													//查询该耗材的总出库数量
+													prescriptionGood, _ := service.GetHisPrescriptionByGoodId(p.ProjectId, adminInfo.CurrentOrgId)
+
+													var all_good_count int64
+
+													var prescription_count int64
+													if len(warehouseInfo) > 0 {
+
+														for _, item := range warehouseInfo {
+															all_good_count += item.WarehousingCount
+														}
+													}
+													if len(prescriptionGood) > 0 {
+														for _, item := range prescriptionGood {
+
+															hisCount, _ := strconv.ParseInt(item.Count, 10, 64)
+															prescription_count += hisCount
+														}
+													}
+
+													fmt.Println("prescription_count-------------------------", prescription_count)
+													fmt.Println("nowCount-------------------------", nowCount)
+													fmt.Println("all_good_count-------------------------", all_good_count)
+
+													if prescription_count+nowCount > all_good_count {
+														goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+														tx.Rollback()
+														c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
+														return
+													}
+												}
+
 												//如果当前处方数量大于历史数据,则需要出库
 												if nowCount > historyCount {
 

controllers/patient_api_controller.go

@@ -210,6 +210,20 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/getpatientrescuerecordlist", &PatientApiController{}, "Get:GetPatientRescureRecordList")
 
+	beego.Router("/api/patient/getmonitorsearchlist", &PatientApiController{}, "Get:GetMonitorSearchList")
+
+	beego.Router("/api/patient/getsummarysearchlist", &PatientApiController{}, "Get:GetSummarySearchList")
+
+	beego.Router("/api/patient/getpatientdryweightlist", &PatientApiController{}, "Get:GetPatientDryWeightList")
+
+	beego.Router("/api/patient/getdialysissystemlist", &PatientApiController{}, "Get:GetDialysisSystemList")
+
+	beego.Router("/api/patient/getpatientadvicelist", &PatientApiController{}, "Get:GetPatientAdviceList")
+
+	beego.Router("/api/patient/getpatientinspectionlist", &PatientApiController{}, "Get:GetPatientInspectionList")
+
+	beego.Router("/api/patient/getinspectionbyprojectid", &PatientApiController{}, "Get:GetInspectionByProjectId")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -8723,3 +8737,214 @@ func (this *PatientApiController) GetPatientRescureRecordList() {
 		"operators":        operators,
 	})
 }
+
+func (this *PatientApiController) GetMonitorSearchList() {
+
+	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")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var startTime 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
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	monitorList, _ := service.GetMonitorSearchList(patient_id, orgId, startTime, endTime)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"monitorList": monitorList,
+	})
+
+}
+
+func (this *PatientApiController) GetSummarySearchList() {
+
+	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")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var startTime 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
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	summaryList, _ := service.GetSummarySearchList(patient_id, orgId, startTime, endTime)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"summaryList": summaryList,
+	})
+}
+
+func (this *PatientApiController) GetPatientDryWeightList() {
+
+	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")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var startTime 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
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	dryWeightList, _ := service.GetPatientDryWeightList(patient_id, orgId, startTime, endTime)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"dryWeightList": dryWeightList,
+	})
+}
+
+func (this *PatientApiController) GetDialysisSystemList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	prescription, _ := service.GetDialysisSystemList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"prescription": prescription,
+	})
+}
+
+func (this *PatientApiController) GetPatientAdviceList() {
+
+	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")
+	advice_type, _ := this.GetInt64("advice_type")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var startTime 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
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	advicelist, _ := service.GetPatientAdviceList(patient_id, orgId, startTime, endTime, advice_type)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"advicelist": advicelist,
+	})
+}
+
+func (this *PatientApiController) GetPatientInspectionList() {
+
+	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")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var startTime 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
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	groupList, _ := service.GetNewPatientGroupInspectionList(patient_id, orgId, startTime, endTime)
+
+	inspection, _ := service.GetNewPatientInspectionList(patient_id, orgId, startTime, endTime)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"groupList":  groupList,
+		"inspection": inspection,
+	})
+}
+
+func (this *PatientApiController) GetInspectionByProjectId() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	project_id, _ := this.GetInt64("project_id")
+	inspect_date, _ := this.GetInt64("inspect_date")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	inspection, _ := service.GetNewInspectionByProjectId(patient_id, project_id, inspect_date, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inspection": inspection,
+	})
+}

controllers/stock_in_api_controller.go

@@ -7466,9 +7466,6 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 			//基础库插入数据
 			service.UpdateNewGoodInfoAddSumCount(item.GoodId, total_count, orgId, sum_in_count, tx)
 
-			//查询该仓库是否有数据
-			_, errcode := service.GetNewGoodStockCount(orgId, item.StorehouseId, item.GoodId, tx)
-
 			goodList, _ := service.GetNewSumGoodList(orgId, item.StorehouseId, item.GoodId, tx)
 			var flush_count int64
 			for _, it := range goodList {
@@ -7518,7 +7515,9 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 			//创建出库流水
 			service.CreateNewStockFlowOne(stockFlow, tx)
 
-			if errcode == gorm.ErrRecordNotFound {
+			//查询该仓库是否有数据
+			stockCount, _ := service.GetNewGoodStockCount(orgId, item.StorehouseId, item.GoodId, tx)
+			if stockCount.ID == 0 {
 
 				goodCount := models.XtGoodStockCount{
 					UserOrgId:        orgId,
@@ -7535,7 +7534,7 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				}
 				service.CreateNewGoodCount(goodCount, tx)
 			}
-			if errcode == nil {
+			if stockCount.ID > 0 {
 				service.UpdateNewGoodStockCount(orgId, item.StorehouseId, item.GoodId, item.WarehousingCount, flush_count, tx)
 			}
 		}

models/dialysis.go

@@ -1815,3 +1815,90 @@ type XtDoctorAdviceOne struct {
 func (XtDoctorAdviceOne) TableName() string {
 	return "xt_doctor_advice"
 }
+
+type PatientNewSchedule struct {
+	ID                              int64                           `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                       int64                           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                       int64                           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ModeId                          int64                           `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status                          int64                           `gorm:"column:status" json:"status" form:"status"`
+	ScheduleDate                    int64                           `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	PatientMonitoringRecord         []*PatientMonitoringRecord      `gorm:"ForeignKey:PatientId,MonitoringDate;AssociationForeignKey:PatientId,ScheduleDate" json:"monitor"`
+	PatientAssessmentAfterDislysis  PatientAssessmentAfterDislysis  `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"after"`
+	PatientAssessmentBeforeDislysis PatientAssessmentBeforeDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"befor"`
+}
+
+func (PatientNewSchedule) TableName() string {
+	return "xt_schedule"
+}
+
+type PatientNewScheduleOne struct {
+	ID                      int64                   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId               int64                   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId               int64                   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ModeId                  int64                   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status                  int64                   `gorm:"column:status" json:"status" form:"status"`
+	ScheduleDate            int64                   `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	PatientTreatmentSummary PatientTreatmentSummary `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"summary"`
+}
+
+func (PatientNewScheduleOne) TableName() string {
+	return "xt_schedule"
+}
+
+type PatientMonitoringRecord struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DialysisOrderId        int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	MonitoringDate         int64   `gorm:"column:monitoring_date" json:"monitoring_date" form:"monitoring_date"`
+	MonitoringTime         string  `gorm:"column:monitoring_time" json:"monitoring_time" form:"monitoring_time"`
+	BreathingRate          string  `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
+}
+
+func (PatientMonitoringRecord) TableName() string {
+	return "xt_monitoring_record"
+}
+
+type PatientAssessmentAfterDislysis struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+}
+
+func (PatientAssessmentAfterDislysis) TableName() string {
+	return "xt_assessment_after_dislysis"
+}
+
+type PatientAssessmentBeforeDislysis struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+}
+
+func (PatientAssessmentBeforeDislysis) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+type PatientTreatmentSummary struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId       int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AssessmentDate  int64  `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+	DialysisOrderId int64  `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	Mission         string `gorm:"column:mission" json:"mission" form:"mission"`
+	DialysisSummary string `gorm:"column:dialysis_summary" json:"dialysis_summary" form:"dialysis_summary"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (PatientTreatmentSummary) TableName() string {
+	return "xt_treatment_summary"
+}

models/patient_models.go

@@ -3082,3 +3082,24 @@ func (BtAssessmentBeforeDislysis) TableName() string {
 
 	return "xt_assessment_before_dislysis"
 }
+
+type BtInspection struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	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"`
+}
+
+func (BtInspection) TableName() string {
+
+	return "xt_inspection"
+}

service/new_stock_service.go

@@ -348,16 +348,13 @@ func GetNewDrugStockCount(storehouse_id int64, drug_id int64, org_id int64, tx *
 	drugStockCount := models.XtDrugStockCount{}
 	var err error
 	err = tx.Where("storehouse_id = ? and drug_id = ? and user_org_id  = ? and status = 1", storehouse_id, drug_id, org_id).Find(&drugStockCount).Error
-	if err == gorm.ErrRecordNotFound {
+	if err != gorm.ErrRecordNotFound {
 		if err != nil {
 			tx.Rollback()
 			return nil, err
 		}
 		return nil, err
 	}
-	if err != nil {
-		return nil, err
-	}
 	return &drugStockCount, nil
 }
 

service/patient_service.go

@@ -4860,3 +4860,154 @@ func GetPatientLastBefor(patient_id int64, start_time int64, end_time int64, org
 
 	return beforeDislysis, err
 }
+
+func GetMonitorSearchList(patient_id int64, user_org_id int64, start_time int64, end_time int64) (schedule []*models.PatientNewSchedule, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status= 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("schedule_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("schedule_date<=?", end_time)
+	}
+
+	err = db.Preload("PatientMonitoringRecord", "user_org_id = ? and status=1", user_org_id).Preload("PatientAssessmentAfterDislysis", "user_org_id = ? and status=1", user_org_id).Preload("PatientAssessmentBeforeDislysis", "user_org_id = ? and status=1", user_org_id).Find(&schedule).Error
+
+	return schedule, err
+
+}
+
+func GetSummarySearchList(patient_id int64, user_org_id int64, start_time int64, end_time int64) (schedule []*models.PatientNewScheduleOne, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status= 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("schedule_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("schedule_date<=?", end_time)
+	}
+
+	err = db.Preload("PatientTreatmentSummary", "user_org_id = ? and status=1", user_org_id).Find(&schedule).Error
+
+	return schedule, err
+}
+
+func GetPatientDryWeightList(patient_id int64, user_org_id int64, start_time int64, end_time int64) (dry []*models.SgjPatientDryweight, err error) {
+
+	db := XTReadDB().Model(&dry).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime<=?", start_time)
+	}
+	err = db.Find(&dry).Error
+
+	return dry, err
+}
+
+func GetDialysisSystemList(user_org_id int64) (prescription []*models.SystemPrescription, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&prescription).Error
+
+	return prescription, err
+}
+
+func GetPatientAdviceList(patient_id int64, user_org_id int64, start_time int64, end_time int64, advice_type int64) (list []*models.XtDoctorAdvice, err error) {
+
+	db := XTReadDB().Model(&list).Where("status= 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+	if advice_type > 0 {
+		db = db.Where("advice_type = ?", advice_type)
+	}
+
+	err = db.Find(&list).Error
+
+	return list, err
+
+}
+
+func GetNewPatientGroupInspectionList(patient_id int64, org_id int64, start_time int64, end_time int64) (inspection []*models.BtInspection, err error) {
+
+	db := XTReadDB().Model(&inspection).Where("status= 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("inspect_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("inspect_date<=?", end_time)
+	}
+	err = db.Group("project_id,inspect_date").Order("project_id").Find(&inspection).Error
+
+	return inspection, err
+}
+
+func GetNewPatientInspectionList(patient_id int64, org_id int64, start_time int64, end_time int64) (inspection []*models.XtInspection, err error) {
+
+	db := XTReadDB().Model(&inspection).Where("status= 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("inspect_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("inspect_date<=?", end_time)
+	}
+	err = db.Find(&inspection).Error
+
+	return inspection, err
+
+}
+
+func GetNewInspectionByProjectId(patient_id int64, project_id int64, inspect_date int64, org_id int64) (inspection []*models.XtInspection, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and project_id = ? and inspect_date = ? and status=1 and org_id = ?", patient_id, project_id, inspect_date, org_id).Find(&inspection).Error
+
+	return inspection, err
+}

service/self_drug_service.go

@@ -5397,3 +5397,17 @@ func ModifyDrugCodeWarehosueInfo(id int64, drug_code string) (models.XtDrugWareh
 
 	return drugWarehouseInfo, err
 }
+
+func GetAllDrugInfoList(drug_id int64, user_org_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and org_id = ? and status =1 and is_check =1", drug_id, user_org_id).Find(&info).Find(&info).Error
+
+	return info, err
+}
+
+func GetHisDocInfoList(drug_id int64, user_org_id int64) (info []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and user_org_id = ? and status=1", drug_id, user_org_id).Find(&info).Error
+
+	return info, err
+}

service/smart_sch.go

@@ -8,12 +8,24 @@ import (
 )
 
 func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*models.SmartSchPatient, err error) {
-	db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1 and  lapseto !=3", orgID)
-	if len(keywords) > 0 {
-		likekey := "%" + keywords + "%"
-		err = db.Where("name LIKE ? OR dialysis_no LIKE ?", likekey, likekey).Find(&patient).Error
-	} else {
-		err = db.Find(&patient).Error
+	if orgID != 10517 {
+		db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1 and  lapseto !=3", orgID)
+		if len(keywords) > 0 {
+			likekey := "%" + keywords + "%"
+			err = db.Where("name LIKE ? OR dialysis_no LIKE ?", likekey, likekey).Find(&patient).Error
+		} else {
+			err = db.Find(&patient).Error
+		}
+	}
+
+	if orgID == 10517 {
+		db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1 and  lapseto =1", orgID)
+		if len(keywords) > 0 {
+			likekey := "%" + keywords + "%"
+			err = db.Where("name LIKE ? OR dialysis_no LIKE ?", likekey, likekey).Find(&patient).Error
+		} else {
+			err = db.Find(&patient).Error
+		}
 	}
 
 	//for _, item := range patient {

service/stock_service.go

@@ -3527,7 +3527,7 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 		return
 	} else {
 		db := readDb.Model(&models.WarehouseOutInfo{})
-		db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.is_check = 1 AND xt_warehouse_out_info.good_id <> 0 AND xt_warehouse_out_info.count <> 0 ", orgId)
+		db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.is_check = 1 AND xt_warehouse_out_info.count <> 0 ", orgId)
 
 		if len(keywords) > 0 {
 			likeKey := "%" + keywords + "%"
@@ -3537,7 +3537,7 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 
 			db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_out_info.warehouse_out_order_number LIKE ?  OR xt_good_information.specification_name LIKE ?  OR xt_good_information.good_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_warehouse_out_info.id")
 		} else {
-			db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
+			db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id and xt_warehouse_out.org_id = xt_warehouse_out_info.org_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
 		}
 
 		if manufacturer > 0 {
@@ -3552,8 +3552,8 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 			db = db.Where("xt_warehouse_out_info.storehouse_id = ?", storehouse_id)
 		}
 
-		db = db.Preload("WarehouseOut", "status = 1 AND org_id = ?", orgId)
-		db = db.Preload("WarehousingInfoNight", "status=1 and org_id = ?", orgId)
+		db = db.Preload("WarehouseOut", "status = 1 AND org_id = ? and is_check =1", orgId)
+		db = db.Preload("WarehousingInfoNight", "status=1 and org_id = ? and is_check =1", orgId)
 		db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
 		db = db.Count(&total)
 		offset := (page - 1) * limit
@@ -3565,7 +3565,7 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 
 func GetStockOutDetailTotal(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (err error, totalPrice float64) {
 	db := readDb.Model(&models.WarehouseOutInfo{})
-	db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1  AND xt_warehouse_out_info.good_id <> 0 AND xt_warehouse_out_info.count <> 0", orgId)
+	db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1  AND xt_warehouse_out_info.count > 0", orgId)
 
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
@@ -3575,7 +3575,7 @@ func GetStockOutDetailTotal(orgId int64, startTime int64, endTime int64, keyword
 
 		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_out_info.warehouse_out_order_number LIKE ?", likeKey, likeKey).Group("xt_warehouse_out_info.id")
 	} else {
-		db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
+		db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id and   xt_warehouse_out.org_id = xt_warehouse_out_info.org_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
 	}
 
 	if manufacturer > 0 {
@@ -9905,6 +9905,20 @@ func GetGoodInformationByGoodIdOne(good_id int64) (models.GoodInformationFourty,
 	return info, err
 }
 
+func GetAllWarehouseInfo(good_id int64, user_org_id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and user_org_id =? and status=1 and is_check =1", good_id, user_org_id).Find(&info).Error
+
+	return info, err
+}
+
+func GetHisPrescriptionByGoodId(good_id int64, user_org_id int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("project_id  = ? and user_org_id =? and status=1 and type =3", good_id, user_org_id).Find(&project).Error
+
+	return project, err
+}
+
 func GetHisDocById(id int64, orgid int64) (models.HisDoctorAdvice, error) {
 
 	advice := models.HisDoctorAdvice{}

service/warhouse_service.go

@@ -11195,6 +11195,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			SystemTime:              advice.SysRecordTime,
 			PatientId:               advice.PatientId,
 			Remark:                  advice.Remark,
+			OperateTime:             time.Now().Unix(),
 		}
 		if warehouse.RetailPrice == 0 {
 			drugflow.Price = advice.Price
@@ -11266,6 +11267,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			SystemTime:              advice.SysRecordTime,
 			PatientId:               advice.PatientId,
 			Remark:                  advice.Remark,
+			OperateTime:             time.Now().Unix(),
 		}
 
 		CreateNewDrugFlowOne(drugflow, tx)