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

controllers/dialysis_api_controller.go

@@ -4863,12 +4863,12 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	}
 	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10345 {
 
-		if xttime <= 1703952000 {
+		if xttime <= 1735574400 {
 			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}
 
-		if xttime >= 1704038400 {
+		if xttime >= 1735660800 {
 			dialysis_count, _ := service.GetDialysisOrderCountTwo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}

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,13 +3289,32 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			tx.Rollback()
 		}
 	}()
+	houseConfig, _ := service.GetNewAllStoreHouseConfig(orgId, tx)
+
+	checker := c.GetAdminUserInfo().AdminUser.Id
 
 	//更改核对状态
 	service.CheckNewWarehousingInfo(warehousing_id, orgId, checker, tx)
 
 	list, _ := service.GetNewWarehousingInfoByList(warehousing_id, orgId, tx)
+
+	var is_success = 2
 	for _, item := range list {
+		var his_warehousing_count = item.WarehousingCount
+		var his_max_unit = item.MaxUnit
+		var in_cout int64
 		medical, _ := service.GetNewBaseDrugMedical(item.DrugId, tx)
+
+		if his_max_unit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			in_cout = his_warehousing_count * medical.MinNumber
+		}
+		if his_max_unit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			in_cout = his_warehousing_count
+		}
+		if his_max_unit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+			in_cout = his_warehousing_count
+		}
+
 		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			//新增库存
 			service.AddNewDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID, tx)
@@ -3392,8 +3406,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)
+
+		if drugStockCount.ID == 0 {
 			drugStock := models.XtDrugStockCount{
 				UserOrgId:      item.OrgId,
 				StorehouseId:   item.StorehouseId,
@@ -3409,17 +3424,45 @@ 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)
 		}
-	}
 
-	tx.Commit()
+		flowList, _ := service.GetNewDrugFlowList(item.DrugId, item.OrgId, item.ID, tx)
+		var his_count int64
+		if len(flowList) > 0 {
+			for _, item := range flowList {
+				baseDrug, _ := service.GetNewBaseDrugMedical(item.DrugId, tx)
+				if item.MaxUnit == baseDrug.MaxUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+					his_count = item.Count * baseDrug.MinNumber
+				}
+				if item.MaxUnit == baseDrug.MinUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+					his_count = item.Count
+				}
+				if item.MaxUnit == baseDrug.MaxUnit && baseDrug.MaxUnit == baseDrug.MinUnit {
+					his_count = item.Count
+				}
+			}
+		}
 
+		if in_cout != his_count {
+			is_success = 1
+			tx.Rollback()
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
+			return
+		}
+	}
+
+	if is_success != 1 {
+		tx.Commit()
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
 
+	return
+
 }
 
 func (c *StockDrugApiController) ReturnCheckWarehouseingInfo() {
@@ -3581,6 +3624,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 				"max_unit":               drup.MaxUnit,
 				"msg":                    2,
 			})
+			tx.Rollback()
 			return
 		}
 	}
@@ -3607,7 +3651,12 @@ func (c *StockDrugApiController) CheckDrugOut() {
 
 	}
 	warehousingOutInfoListThree, _ := service.GetNewDrugWarehouseOutListById(warehouse_out_id, orgId, tx)
+
+	var is_success = 2
 	for _, it := range warehousingOutInfoListThree {
+
+		var his_count = it.Count
+		var his_count_unit = it.CountUnit
 		medical, _ := service.GetNewBaseDrugMedical(it.DrugId, tx)
 		drup, _ := service.FindNewBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
 		//出库逻辑
@@ -3635,6 +3684,47 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		}
 		//更新基础库库存
 		service.UpdateNewBaseDrugSumTwo(it.DrugId, sum_count_one, it.OrgId, tx)
+
+		if it.OrgId == 10164 || it.OrgId == 10721 {
+			var now_count int64
+
+			if his_count_unit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+				now_count = his_count * medical.MinNumber
+			}
+			if his_count_unit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+				now_count = his_count
+			}
+			if his_count_unit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+				now_count = his_count
+			}
+
+			var flow_count int64
+
+			//查询该药品的出库数量
+			drugflowlist, _ := service.GetDrugOutFlowByWarehouseOut(it.DrugId, it.ID, it.OrgId, tx)
+			if len(drugflowlist) > 0 {
+				for _, items := range drugflowlist {
+
+					if items.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						flow_count = items.Count * medical.MinNumber
+					}
+					if items.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+						flow_count = items.Count
+					}
+					if items.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+						flow_count = items.Count
+					}
+				}
+			}
+
+			if now_count != flow_count {
+				is_success = 1
+				tx.Rollback()
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
+				return
+			}
+		}
+
 	}
 
 	out := models.DrugWarehouseOut{
@@ -3643,18 +3733,22 @@ func (c *StockDrugApiController) CheckDrugOut() {
 	//更新审核状态
 	service.UpdateNewCheckDrugOut(out, warehouse_out_id, tx)
 
-	tx.Commit()
+	//查询
+	if is_success != 1 {
+		tx.Commit()
+		c.ServeSuccessJSON(map[string]interface{}{
+			"warehousingOutInfoList": warehousingOutInfoList,
+			"drug_name":              "",
+			"dose":                   "",
+			"dose_unit":              "",
+			"min_number":             "",
+			"min_unit":               "",
+			"max_unit":               "",
+			"msg":                    1,
+		})
+		return
+	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"warehousingOutInfoList": warehousingOutInfoList,
-		"drug_name":              "",
-		"dose":                   "",
-		"dose_unit":              "",
-		"min_number":             "",
-		"min_unit":               "",
-		"max_unit":               "",
-		"msg":                    1,
-	})
 }
 
 func (c *StockDrugApiController) ToReturnCheck() {
@@ -3690,11 +3784,16 @@ func (c *StockDrugApiController) ToReturnCheck() {
 	//调用出库逻辑
 	for _, item := range list {
 		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
 		if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-			service.UpdateNewDrugMaxNumber(item.Count, item.WarehouseInfoId, tx)
+
 			var sum_out_count int64
 			sum_out_count = item.Count * medical.MinNumber
+
+			service.UpdateNewDrugMaxNumberOne(sum_out_count, item.WarehouseInfoId, tx)
+
 			service.ModifyNewReduceDrugInformation(item.DrugId, sum_out_count, item.OrgId, tx)
+
 			drugInfoList, _ := service.FindNewDrugWarehouseInfoList(item.DrugId, item.OrgId, tx)
 			var drug_max_number int64
 			var drug_min_number int64
@@ -3723,6 +3822,7 @@ func (c *StockDrugApiController) ToReturnCheck() {
 			service.CreatedNewDrugFlushInfo(drugFlushInfo, tx)
 			service.DeleteNewDrugOutFlow(item.ID, item.OrgId, tx)
 		}
+
 		if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 			service.UpdateDrugMaxNumber(item.Count, item.WarehouseInfoId)
 			var sum_out_count int64

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)
@@ -3751,7 +3855,7 @@ func (c *HisApiController) CreateHisPrescription() {
 										if is_user_total != no_user_total {
 											//出库
 											//针对御享天源
-											if drug.IsUse == 1 && s.UserOrgId == 10635 {
+											if drug.IsUse == 1 && s.UserOrgId == 10635 && s.UserOrgId == 9671 {
 
 												creater := adminInfo.AdminUser.Id
 												newadviceInfo := &models.HisDoctorAdviceInfo{
@@ -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/manager_center_api_controller.go

@@ -168,6 +168,10 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	is_zero_flag, _ := c.GetInt64("is_zero_flag")
 
 	specification_name := c.GetString("specification_name")
+
+	scan_code := c.GetString("scan_code")
+	drug_identification_code := c.GetString("drug_identification_code")
+
 	hans := drug_name // 要转换的汉字字符串
 
 	// 创建一个拼音转换器
@@ -260,6 +264,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		IsSelfDrug:                  is_self_drug,
 		SpecificationName:           specification_name,
 		IsZeroFlag:                  is_zero_flag,
+		ScanCode:                    scan_code,
+		DrugIdentificationCode:      drug_identification_code,
 	}
 	drugLib.FirstLetter = firstLetter
 	drugLib.Pinyin = firstLetter
@@ -385,6 +391,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_self_drug, _ := c.GetInt64("is_self_drug")
 	specification_name := c.GetString("specification_name")
 	is_zero_flag, _ := c.GetInt64("is_zero_flag")
+	scan_code := c.GetString("scan_code")
+	drug_identification_code := c.GetString("drug_identification_code")
 
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
@@ -484,6 +492,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		IsSelfDrug:                  is_self_drug,
 		SpecificationName:           specification_name,
 		IsZeroFlag:                  is_zero_flag,
+		ScanCode:                    scan_code,
+		DrugIdentificationCode:      drug_identification_code,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 
@@ -2322,7 +2332,7 @@ func (c *ManagerCenterApiController) CreateDiagnose() {
 	wubi := c.GetString("wubi")
 
 	sort, _ := c.GetInt64("sort")
-	fmt.Println("sort-------------------", sort)
+
 	if len(class_name) <= 0 {
 		utils.ErrorLog("len(class_name) == 0")
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -977,7 +977,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对患者称重两次没有数据的问题
-		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10745 {
 
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3904,6 +3904,10 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
+			if adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+			}
+
 			if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10679 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
 			}
@@ -5188,6 +5192,12 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
+			//重庆塘坝卫生院
+			if adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10745 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10679 {
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -5320,13 +5330,16 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			if adminInfo.Org.Id == 10735 {
 
 				lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
+				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+				var ultrafiltration_rate_one = math.Floor(prescription.TargetUltrafiltration*1000/float64(totalMin)*60*1000) / 1000
+
 				if lastMonitorRecordList.ID > 0 {
-					record.UltrafiltrationRate = lastMonitorRecordList.UltrafiltrationRate
-					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * lastMonitorRecordList.UltrafiltrationRate)
+					record.UltrafiltrationRate = ultrafiltration_rate_one
+					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * ultrafiltration_rate_one)
 
 					record.UltrafiltrationVolume = ultrafiltration_volume
 				} else {
-					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * ultrafiltration_rate_one)
 
 					record.UltrafiltrationVolume = ultrafiltration_volume
 				}
@@ -5422,6 +5435,25 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	}
 
+	if adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10745 {
+
+		var replacement_rate float64
+		var displacement_quantity float64
+		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*60) / 1000
+
+		record.ReplacementRate = replacement_rate
+
+		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
+		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
+		record.DisplacementQuantity = displacement_quantity
+	}
+
+	if adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10745 {
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+		record.UltrafiltrationVolume = ultrafiltration_volume
+	}
+
 	if adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10727 {
 
 		var replacement_rate float64

controllers/patient_api_controller.go

@@ -14,6 +14,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"github.com/astaxie/beego/config"
 	"github.com/jinzhu/gorm"
 	"github.com/mozillazg/go-pinyin"
 
@@ -210,6 +211,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")
@@ -8647,34 +8662,82 @@ func (this *PatientApiController) GetAutoPatientContent() {
 
 	lastBefor, _ := service.GetPatientLastBefor(patient_id, startTime, endTime, orgId)
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"prescription":                         prescription,
-		"berfor":                               berfor,
-		"monitorList":                          monitorList,
-		"dryweightList":                        dryweightList,
-		"inpectionList":                        inpectionList,
-		"dialysisOrder":                        dialysisOrder,
-		"patient":                              patient,
-		"longAdvice":                           longAdvice,
-		"groupPrescriptionList":                groupPrescriptionList,
-		"after":                                after,
-		"max_blood_flow_volume":                monitor.BloodFlowVolume,
-		"max_befor_systolic_blood_pressure":    maxBeforSystolicBloodPressure.SystolicBloodPressure,
-		"min_befor_systolic_blood_pressure":    minBeforSystolicBloodPressure.SystolicBloodPressure,
-		"max_befor_diastolic_blood_pressure":   maxBeforDiastolicBloodPressure.DiastolicBloodPressure,
-		"min_befor_diastolic_blood_pressure":   minBeforDiastolicBloodPressure.DiastolicBloodPressure,
-		"max_after_systolic_blood_pressure":    maxAfterSystolicBloodPressure.SystolicBloodPressure,
-		"min_after_systolic_blood_pressure":    minAfterSystolicBloodPressure.SystolicBloodPressure,
-		"max_after_diastolic_blood_pressure":   maxAfterDiastolicBloodPressure.DiastolicBloodPressure,
-		"min_after_diastolic_blood_pressure":   minAfterDiastolicBloodPressure.DiastolicBloodPressure,
-		"max_monitor_systolic_blood_pressure":  maxMonitorSystolicBloodPressure.SystolicBloodPressure,
-		"min_monitor_systolic_blood_pressure":  minMonitorSystolicBloodPressure.SystolicBloodPressure,
-		"max_monitor_diastolic_blood_pressure": maxMonitorDiastolicBloodPressure.DiastolicBloodPressure,
-		"min_monitor_diastolic_blood_pressure": minMonitorDiastolicBloodPressure.DiastolicBloodPressure,
-		"lastDryWeight":                        lastDryWeight,
-		"patientVascularAccess":                patientVascularAccess,
-		"lastBefor":                            lastBefor,
-	})
+	_, configs := service.FindXTHisRecordByOrgId(orgId)
+
+	//血透
+	if configs.IsOpen != 1 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"prescription":                         prescription,
+			"berfor":                               berfor,
+			"monitorList":                          monitorList,
+			"dryweightList":                        dryweightList,
+			"inpectionList":                        inpectionList,
+			"dialysisOrder":                        dialysisOrder,
+			"patient":                              patient,
+			"longAdvice":                           longAdvice,
+			"groupPrescriptionList":                groupPrescriptionList,
+			"after":                                after,
+			"max_blood_flow_volume":                monitor.BloodFlowVolume,
+			"max_befor_systolic_blood_pressure":    maxBeforSystolicBloodPressure.SystolicBloodPressure,
+			"min_befor_systolic_blood_pressure":    minBeforSystolicBloodPressure.SystolicBloodPressure,
+			"max_befor_diastolic_blood_pressure":   maxBeforDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_befor_diastolic_blood_pressure":   minBeforDiastolicBloodPressure.DiastolicBloodPressure,
+			"max_after_systolic_blood_pressure":    maxAfterSystolicBloodPressure.SystolicBloodPressure,
+			"min_after_systolic_blood_pressure":    minAfterSystolicBloodPressure.SystolicBloodPressure,
+			"max_after_diastolic_blood_pressure":   maxAfterDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_after_diastolic_blood_pressure":   minAfterDiastolicBloodPressure.DiastolicBloodPressure,
+			"max_monitor_systolic_blood_pressure":  maxMonitorSystolicBloodPressure.SystolicBloodPressure,
+			"min_monitor_systolic_blood_pressure":  minMonitorSystolicBloodPressure.SystolicBloodPressure,
+			"max_monitor_diastolic_blood_pressure": maxMonitorDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_monitor_diastolic_blood_pressure": minMonitorDiastolicBloodPressure.DiastolicBloodPressure,
+			"lastDryWeight":                        lastDryWeight,
+			"patientVascularAccess":                patientVascularAccess,
+			"lastBefor":                            lastBefor,
+		})
+	}
+
+	//his
+	if configs.IsOpen == 1 {
+
+		hisadvice, _ := service.GetHisPrecriptionadviceList(orgId, patient_id, startTime, endTime)
+		if len(hisadvice) > 0 {
+			if len(hisadvice) > 0 {
+				for _, item := range hisadvice {
+					baseDrug, _ := service.GetBasedrugByIdOne(item.DrugId, orgId)
+					item.StartTime = item.CreatedTime
+					item.AdviceDesc = baseDrug.Dose + baseDrug.DoseUnit + "*" + config.ToString(baseDrug.MinNumber) + baseDrug.MinUnit + "/" + baseDrug.MaxUnit
+				}
+			}
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"prescription":                         prescription,
+			"berfor":                               berfor,
+			"monitorList":                          monitorList,
+			"dryweightList":                        dryweightList,
+			"inpectionList":                        inpectionList,
+			"dialysisOrder":                        dialysisOrder,
+			"patient":                              patient,
+			"longAdvice":                           hisadvice,
+			"groupPrescriptionList":                groupPrescriptionList,
+			"after":                                after,
+			"max_blood_flow_volume":                monitor.BloodFlowVolume,
+			"max_befor_systolic_blood_pressure":    maxBeforSystolicBloodPressure.SystolicBloodPressure,
+			"min_befor_systolic_blood_pressure":    minBeforSystolicBloodPressure.SystolicBloodPressure,
+			"max_befor_diastolic_blood_pressure":   maxBeforDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_befor_diastolic_blood_pressure":   minBeforDiastolicBloodPressure.DiastolicBloodPressure,
+			"max_after_systolic_blood_pressure":    maxAfterSystolicBloodPressure.SystolicBloodPressure,
+			"min_after_systolic_blood_pressure":    minAfterSystolicBloodPressure.SystolicBloodPressure,
+			"max_after_diastolic_blood_pressure":   maxAfterDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_after_diastolic_blood_pressure":   minAfterDiastolicBloodPressure.DiastolicBloodPressure,
+			"max_monitor_systolic_blood_pressure":  maxMonitorSystolicBloodPressure.SystolicBloodPressure,
+			"min_monitor_systolic_blood_pressure":  minMonitorSystolicBloodPressure.SystolicBloodPressure,
+			"max_monitor_diastolic_blood_pressure": maxMonitorDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_monitor_diastolic_blood_pressure": minMonitorDiastolicBloodPressure.DiastolicBloodPressure,
+			"lastDryWeight":                        lastDryWeight,
+			"patientVascularAccess":                patientVascularAccess,
+			"lastBefor":                            lastBefor,
+		})
+	}
 
 }
 
@@ -8697,7 +8760,19 @@ func (this *PatientApiController) ModifyCoursePrint() {
 	id := int64(dataBody["id"].(float64))
 	content := dataBody["content"].(string)
 
-	coursePrint, _ := service.ModifyCoursePrint(id, content)
+	record_date := dataBody["record_date"].(string)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTime = theTime.Unix()
+	}
+
+	coursePrint, _ := service.ModifyCoursePrint(id, content, theStartTime)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"coursePrint": coursePrint,
@@ -8723,3 +8798,253 @@ 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()
+	}
+
+	_, configs := service.FindXTHisRecordByOrgId(orgId)
+
+	if configs.IsOpen == 1 {
+
+		if advice_type == 1 {
+			hisLongadvicelist, _ := service.GetHisPrecriptionadviceList(orgId, patient_id, startTime, endTime)
+			if len(hisLongadvicelist) > 0 {
+				for _, item := range hisLongadvicelist {
+					item.StartTime = item.CreatedTime
+					baseDrug, _ := service.GetBasedrugByIdOne(item.DrugId, orgId)
+					item.AdviceDesc = baseDrug.Dose + baseDrug.DoseUnit + "*" + config.ToString(baseDrug.MinNumber) + baseDrug.MinUnit + "/" + baseDrug.MaxUnit
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"advicelist": hisLongadvicelist,
+			})
+			return
+		} else {
+			fmt.Println("hhhhhh")
+			advicelist, _ := service.GetHisadviceList(orgId, patient_id, startTime, endTime)
+			if len(advicelist) > 0 {
+				for _, item := range advicelist {
+					item.StartTime = item.CreatedTime
+					baseDrug, _ := service.GetBasedrugByIdOne(item.DrugId, orgId)
+					item.AdviceDesc = baseDrug.Dose + baseDrug.DoseUnit + "*" + config.ToString(baseDrug.MinNumber) + baseDrug.MinUnit + "/" + baseDrug.MaxUnit
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"advicelist": advicelist,
+			})
+			return
+		}
+
+	}
+
+	if configs.IsOpen != 1 {
+		advicelist, _ := service.GetPatientAdviceList(patient_id, orgId, startTime, endTime, advice_type)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"advicelist": advicelist,
+		})
+		return
+	}
+	return
+
+}
+
+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/patient_dataconfig_api_controller.go

@@ -931,6 +931,17 @@ func (this *PatientDataConfigAPIController) Rescues() {
 func (this *PatientDataConfigAPIController) CreateRescue() {
 	patientID, _ := this.GetInt64("patient_id")
 	content := this.GetString("content")
+	record_date := this.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTime = theTime.Unix()
+	}
 	if patientID <= 0 || len(content) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -952,7 +963,7 @@ func (this *PatientDataConfigAPIController) CreateRescue() {
 		OrgID:      adminUserInfo.CurrentOrgId,
 		PatientID:  patientID,
 		Recorder:   adminUserInfo.AdminUser.Id,
-		RecordTime: now,
+		RecordTime: theStartTime,
 		Content:    content,
 		Status:     1,
 		CreateTime: now,

controllers/pharmacy_controller.go

@@ -50,6 +50,8 @@ func PharmacyApiRegistRouters() {
 
 	beego.Router("/api/pharmacy/changeZeroFlag", &PharmacyController{}, "Get:ChangeZeroFlag")
 
+	beego.Router("/api/pharmacy/getdrugtocalcount", &PharmacyController{}, "Get:GetDrugTocalCount")
+
 }
 
 // 测试
@@ -1446,3 +1448,28 @@ func (this *PharmacyController) ChangeZeroFlag() {
 	})
 
 }
+
+func (this *PharmacyController) GetDrugTocalCount() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	drug_id, _ := this.GetInt64("drug_id")
+	start_time := this.GetString("start_time")
+	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 {
+			fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	adviceList, _ := service.GetDrugTocalCountByDrugId(drug_id, startTime, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+	})
+}

controllers/print_data_api_controller.go

@@ -107,14 +107,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
 
-				if item.ScheduleDate <= 1703952000 {
+				if item.ScheduleDate <= 1735574400 {
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
 					item.Count = listOne.Count
 				}
 
-				if item.ScheduleDate >= 1704038400 {
+				if item.ScheduleDate >= 1735660800 {
 
 					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 

controllers/self_drug_api_congtroller.go

@@ -191,6 +191,10 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/drug/modifydrugcodewarehouseinfo", &SelfDrugApiController{}, "Post:ModifyDrugCodeWarehosueInfo")
 
+	beego.Router("/api/drug/getpatientadvicelist", &SelfDrugApiController{}, "Get:GetPatientAdviceList")
+
+	beego.Router("/api/drug/getpatientadvicelistdetail", &SelfDrugApiController{}, "Get:GetPatientAdviceListDetail")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -6474,3 +6478,83 @@ func (c *SelfDrugApiController) ModifyDrugCodeWarehosueInfo() {
 	})
 
 }
+
+func (this *SelfDrugApiController) GetPatientAdviceList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	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 {
+			fmt.Println(err)
+			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+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	adviceList, _ := service.GetNewPatientAdviceList(patient_id, startTime, endTime, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+	})
+}
+
+func (this *SelfDrugApiController) GetPatientAdviceListDetail() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	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 {
+			fmt.Println(err)
+			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+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	advice_name := this.GetString("advice_name")
+
+	adviceList, _ := service.GetPatientAdviceListDetail(patient_id, startTime, endTime, orgId, advice_name)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+	})
+
+}

controllers/stock_in_api_controller.go

@@ -7304,6 +7304,7 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 
 	////出库逻辑
 	for _, item := range warehousingOutInfo {
+
 		// 查询该耗材是否有库存
 		warehouseOne, _ := service.FindNewWarehousingInfoTen(item.GoodId, item.StorehouseId, tx)
 
@@ -7323,10 +7324,14 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 		}
 
 	}
+	var is_scucess = 2
+
 	for _, item := range warehousingOutInfo {
 
 		creater := this.GetAdminUserInfo().AdminUser.Id
 
+		var now_count = item.Count
+
 		//出库
 		err := service.ConsumablesNewDeliveryThirty(orgId, item.SysRecordTime, item, &warehouseOut, item.Count, creater, tx)
 
@@ -7353,12 +7358,31 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 		//基础库扣减库存
 		service.UpdateNewGoodInfoReduceSumCount(item.GoodId, total_count, orgId, tx)
 
+		var flow_count int64
+		flowList, _ := service.GetGoodFlowByWarehouseOutId(item.GoodId, item.OrgId, item.ID, tx)
+		if len(flowList) > 0 {
+			for _, items := range flowList {
+				flow_count += items.Count
+			}
+		}
+
+		if now_count != flow_count {
+			is_scucess = 1
+			tx.Rollback()
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
+			return
+
+		}
+
 	}
 
 	//审核单据
 	err := service.UpdatedNewWarehouseOut(id, tx)
 
-	tx.Commit()
+	if is_scucess != 1 {
+		tx.Commit()
+	}
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg":                "2",
@@ -7366,6 +7390,7 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 			"specification_name": "",
 			"storehose_name":     "",
 		})
+		return
 	}
 
 }
@@ -7449,12 +7474,13 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 	checker := this.GetAdminUserInfo().AdminUser.Id
 	//更改审核状态
 	err := service.UpdateNewCheckWarehouseInfo(warehousing_info_id, checker, tx)
+	var is_success = 2
 	if err == nil {
 		list, _ := service.GetNewWarehouseInfoList(warehousing_info_id, orgId, tx)
 
 		for _, item := range list {
+			var now_count = item.WarehousingCount
 			service.UpdateNewWarehouseInfoByIdListThree(item.WarehousingCount, item.ID, tx)
-
 			//查询该耗材剩余库存库
 			stockList, _ := service.GetNewStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId, tx)
 			var total_count int64
@@ -7466,9 +7492,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 {
@@ -7495,8 +7518,8 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				Dealer:                  item.Dealer,
 				Creator:                 Creator,
 				UpdateCreator:           0,
-				Status:                  1,
 				Ctime:                   item.Ctime,
+				Status:                  1,
 				Mtime:                   0,
 				Price:                   item.PackingPrice,
 				WarehousingDetailId:     item.ID,
@@ -7518,7 +7541,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,13 +7560,32 @@ 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)
 			}
+
+			//查询该耗材的流水数量
+			goodFlowList, _ := service.GetInitGoodFlow(orgId, item.GoodId, item.ID, tx)
+
+			var flow_count int64
+			if len(goodFlowList) > 0 {
+				for _, item := range goodFlowList {
+					flow_count += item.Count
+				}
+			}
+
+			if now_count != flow_count {
+				is_success = 1
+				tx.Rollback()
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
+				return
+			}
+
 		}
 	}
-
-	tx.Commit()
+	if is_success != 1 {
+		tx.Commit()
+	}
 
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{

enums/error_code.go

@@ -287,6 +287,8 @@ const ( // ErrorCode
 	ErrorTimeCodeParamWrong = 600000012
 
 	ErrorCodeAuthWrong = 600000013
+
+	ErrorCodeFlow = 600000014
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -552,6 +554,7 @@ var ErrCodeMsgs = map[int]string{
 
 	ErrorTimeCodeParamWrong: "时间跨度不能超过一个月",
 	ErrorCodeAuthWrong:      "尚未实名认证,请先认证",
+	ErrorCodeFlow:           "网络错误,数据异常,审核失败",
 }
 
 type SGJError struct {

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/drug.go

@@ -85,13 +85,15 @@ type BaseDrugLib struct {
 	Bby01     string `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	Bbx01     string `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 
-	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
-	IsProject          int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
-	DrugDosageFormName string `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
-	IsShow             int64  `gorm:"column:is_show" json:"is_show" form:"is_show"`
-	IsSelfDrug         int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
-	SpecificationName  string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	IsZeroFlag         int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	FirstLetter            string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	IsProject              int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
+	DrugDosageFormName     string `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
+	IsShow                 int64  `gorm:"column:is_show" json:"is_show" form:"is_show"`
+	IsSelfDrug             int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	SpecificationName      string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	IsZeroFlag             int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	ScanCode               string `gorm:"column:scan_code" json:"scan_code" form:"scan_code"`
+	DrugIdentificationCode string `gorm:"column:drug_identification_code" json:"drug_identification_code" form:"drug_identification_code"`
 }
 
 func (BaseDrugLib) TableName() string {
@@ -145,16 +147,18 @@ func (BaseDrugLibTwentyOne) TableName() string {
 }
 
 type BaseDrugLibEleven struct {
-	ID               int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName         string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
-	MaxUnit          string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber        int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit          string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose             string `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit         string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	IsZeroFlag       int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	ID                     int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName               string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Manufacturer           int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	ManufacturerName       string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+	MaxUnit                string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber              int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                   string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit               string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	IsZeroFlag             int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	ScanCode               string `gorm:"column:scan_code" json:"scan_code" form:"scan_code"`
+	DrugIdentificationCode string `gorm:"column:drug_identification_code" json:"drug_identification_code" form:"drug_identification_code"`
 }
 
 func (BaseDrugLibEleven) TableName() string {

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"
+}

models/schedule_models.go

@@ -477,6 +477,7 @@ type VmBloodScheduleTwo struct {
 	SchedualPatient            *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
 	HisPrescriptionTemplateSix HisPrescriptionTemplateSix `gorm:"ForeignKey:PatientId,Mode;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
 	HisPrescriptionProject     []*HisPrescriptionProject  `gorm:"ForeignKey:PatientId,schedule_date;AssociationForeignKey:PatientId,RecordDate" json:"his_prescription_project"`
+	DialysisSolution           DialysisSolution           `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 }
 
 func (VmBloodScheduleTwo) TableName() string {

service/dialysis_solution_service.go

@@ -425,7 +425,7 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 				return db.Where("user_org_id = ? and status = 1 and record_date = ? and type =3", orgID, scheduleDate).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
 					return db.Where("org_id = ? and status = 1", orgID)
 				})
-			}).Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			}).Preload("DialysisSolution", "status =1 and user_org_id = ? and solution_status=1").Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
 				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
 					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
@@ -443,7 +443,7 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 				return db.Where("user_org_id = ? and status = 1 and record_date = ? and type =3", orgID, scheduleDate).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
 					return db.Where("org_id = ? and status = 1", orgID)
 				})
-			}).Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			}).Preload("DialysisSolution", "status =1 and user_org_id = ? and solution_status=1", orgID).Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
 				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
 					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)

service/gobal_config_service.go

@@ -665,7 +665,7 @@ func GetAllBaseDrugListTwo(orgid int64) (drug []*models.BaseDrugLibEleven, err e
 	if orgid > 0 {
 		db = db.Where("x.org_id =?", orgid)
 	}
-	err = db.Select("x.id,x.drug_name,p.manufacturer_name,x.dose,x.dose_unit,x.min_number,x.max_unit,x.min_unit").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
+	err = db.Select("x.id,x.drug_name,p.manufacturer_name,x.dose,x.dose_unit,x.min_number,x.max_unit,x.min_unit,x.scan_code,x.drug_identification_code").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
 	return drug, err
 }
 

service/his_service.go

@@ -2549,7 +2549,9 @@ func GetHisPrescriptionProjectsByID(id int64) (projects []*models.HisPrescriptio
 }
 
 func GetHisPrescriptionProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
+
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id = 0", user_org_id, patient_id, record_time).Find(&projects).Error
+
 	return
 }
 

service/mobile_dialysis_service.go

@@ -2889,12 +2889,12 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 }
 
 func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1640966400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1704038400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
 	return
 }
 
 func GetDialysisOrderCountTwo(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1704038400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1735660800 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
 	return
 }
 
@@ -8269,7 +8269,7 @@ func GetDialysisTotalCountOne(org_id int64, patient_id int64) (models.BloodDialy
 	order := models.BloodDialysisOrderCount{}
 	db := XTReadDB().Table("xt_dialysis_order as o")
 
-	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1704038400 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1735660800 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
 
 	return order, err
 }

service/new_stock_service.go

@@ -348,15 +348,11 @@ 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_dataconfig_service.go

@@ -182,3 +182,43 @@ func GetLongDoctorAdvice(org_id int64, patient_id int64, start_time int64, end_t
 
 	return advice, err
 }
+
+func GetHisPrecriptionadviceList(org_id int64, patient_id int64, start_time int64, end_time int64) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status =1")
+	if org_id > 0 {
+		db = db.Where("user_org_id =?", org_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("created_time>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("created_time<=?", end_time)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}
+
+func GetHisadviceList(org_id int64, patient_id int64, start_time int64, end_time int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status =1")
+	if org_id > 0 {
+		db = db.Where("user_org_id =?", org_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}

service/patient_service.go

@@ -4735,11 +4735,11 @@ func GetPatientRescueRecord(id int64) (models.XtPatientRescueRecord, error) {
 	return rescueRecords, err
 }
 
-func ModifyCoursePrint(id int64, content string) (models.XtPatientRescueRecord, error) {
+func ModifyCoursePrint(id int64, content string, record_date int64) (models.XtPatientRescueRecord, error) {
 
 	rescueRecord := models.XtPatientRescueRecord{}
 
-	err := XTWriteDB().Model(&rescueRecord).Where("id = ? and status=1", id).Updates(map[string]interface{}{"content": content}).Error
+	err := XTWriteDB().Model(&rescueRecord).Where("id = ? and status=1", id).Updates(map[string]interface{}{"content": content, "record_time": record_date}).Error
 
 	return rescueRecord, err
 }
@@ -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<=?", end_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/patientmanage_service.go

@@ -951,7 +951,7 @@ func GetNewPatient(id int64) (models.XtPatientsNew, error) {
 
 func UpdatedPatient(patients models.Patients, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan, "patient_type": patients.PatientType}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan, "patient_type": patients.PatientType, "updated_time": time.Now().Unix()}).Error
 
 	return err
 }

service/pharmacy_service.go

@@ -2466,7 +2466,7 @@ func ChangeHisDrugCode(id int64, drug_code string, user_org_id int64) (models.Hi
 
 	err := XTWriteDB().Model(&adviceInfo).Where("id = ? and user_org_id = ? and status =1", id, user_org_id).Updates(map[string]interface{}{"drug_code": drug_code}).Error
 
-	fmt.Println("eeeeeeeeeeeeeeeeeeeeeeeeeeeeee", err)
+	fmt.Println("", err)
 	return adviceInfo, err
 }
 
@@ -2560,3 +2560,10 @@ func DispensingMedicineTwo(orgid, patient_id, advice_date, drug_id, creater int6
 
 	return
 }
+
+func GetDrugTocalCountByDrugId(drug_id int64, advice_date int64, user_org_id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and advice_date>=? and user_org_id = ? and status=1 and drug_code!=''", drug_id, advice_date, user_org_id).Find(&advice).Error
+
+	return advice, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -236,13 +236,13 @@ func GetDialysisOrderCountTen(patient_id int64, recordDate int64) (models.VmDial
 
 func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1704038400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
 	return order, err
 }
 
 func GetDialysisOrderCountNight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1704038400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1735660800 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
 	return order, 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

@@ -666,11 +666,11 @@ func CreateNewDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo, t
 	if len(warehousingInfo) > 0 {
 
 		if len(warehousingInfo) > 0 {
-			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number,stock_min_number,storehouse_id) VALUES "
+			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number,stock_min_number,storehouse_id,drug_code) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehousingInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.Number)
@@ -696,6 +696,7 @@ func CreateNewDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo, t
 				insertData = append(insertData, info.BatchNumber)
 				insertData = append(insertData, info.StockMinNumber)
 				insertData = append(insertData, info.StorehouseId)
+				insertData = append(insertData, info.DrugCode)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = tx.Exec(thisSQL, insertData...).Error
@@ -1871,6 +1872,20 @@ func GetNewDrugWarehouseOutIsExit(org_id int64, is_sys int, record_time int64, w
 	return drugWarehouseOut, err
 }
 
+func GetNewDrugWarehouseOutIsExitOne(org_id int64, is_sys int, record_time int64, warehousing_out_order string, tx *gorm.DB, id int64) (models.DrugWarehouseOut, error) {
+
+	drugWarehouseOut := models.DrugWarehouseOut{}
+	err := tx.Where("is_sys = ? AND status = 1 AND org_id = ? AND id = ?", is_sys, org_id, id).Find(&drugWarehouseOut).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return drugWarehouseOut, err
+		}
+	}
+
+	return drugWarehouseOut, err
+}
+
 func AddSigleDrugWarehouseOut(warehouseOut *models.DrugWarehouseOut) error {
 	err := writeDb.Create(&warehouseOut).Error
 	return err
@@ -3527,7 +3542,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 +3552,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 +3567,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 +3580,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 +3590,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 {
@@ -9107,7 +9122,6 @@ func UpdateNewCheckDrugOut(out models.DrugWarehouseOut, id int64, tx *gorm.DB) e
 		tx.Rollback()
 		return err
 	}
-	tx.Commit()
 	return err
 }
 
@@ -9162,6 +9176,18 @@ func UpdateNewDrugMaxNumber(count int64, id int64, tx *gorm.DB) error {
 	return err
 }
 
+func UpdateNewDrugMaxNumberOne(count int64, id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+	return err
+}
+
 func UpdateDrugMinNumber(count int64, id int64) error {
 	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
 	return err
@@ -9319,6 +9345,19 @@ func UpdateNewGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64,
 
 }
 
+func GetGoodFlowByWarehouseOutId(good_id int64, user_org_id int64, id int64, tx *gorm.DB) (flow []*models.VmStockFlow, err error) {
+
+	err = tx.Where("good_id = ? and user_org_id = ? and warehouse_out_detail_id = ? and status=1", good_id, user_org_id, id).Find(&flow).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
+	}
+	return
+}
+
 func UpdateGoodInfoAddSumCount(goodid int64, sum_count int64, orgid int64, sum_in_count int64) error {
 
 	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
@@ -9905,6 +9944,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{}
@@ -10862,7 +10915,7 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 		db = db.Where("is_upload = 2 or is_upload =0")
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
-	fmt.Println("totla====================", total)
+
 	return list, total, err
 }
 
@@ -10872,3 +10925,88 @@ func GetDrugWarehouseOutInfoByDrugCode(drug_id int64, patient_id int64, advice_d
 
 	return outinfo, err
 }
+
+func GetNewGoodWarehouseOutInfo(good_id int64, user_org_id int64, warehouse_out_id int64, tx *gorm.DB) (info []*models.WarehouseOutInfo, err error) {
+
+	err = tx.Where("good_id = ? and org_id = ? and warehouse_out_id = ? and status= 1", good_id, user_org_id, warehouse_out_id).Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
+func GetInitGoodFlow(user_org_id int64, good_id int64, warehousing_detail_id int64, tx *gorm.DB) (list []*models.VmStockFlow, err error) {
+
+	err = tx.Where("user_org_id = ? and good_id = ? and warehousing_detail_id = ? and status=1", user_org_id, good_id, warehousing_detail_id).Find(&list).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return list, err
+		}
+	}
+	return list, err
+}
+
+func GetNewDrugFlowList(drug_id int64, user_org_id int64, warehousing_detail_id int64, tx *gorm.DB) (flow []*models.DrugFlow, err error) {
+
+	err = tx.Where("drug_id = ? and user_org_id =? and warehousing_detail_id = ? and status=1", drug_id, user_org_id, warehousing_detail_id).Find(&flow).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
+	}
+	return flow, err
+}
+
+func GetNewPatientAdviceList(patient_id int64, start_time int64, end_time int64, user_org_id int64) (advice []*models.DoctorAdvice, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1 and advice_type =2")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}
+
+func GetPatientAdviceListDetail(patient_id int64, start_time int64, end_time int64, user_org_id int64, advice_name string) (advice []*models.DoctorAdvice, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status = 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if len(advice_name) > 0 {
+		db = db.Where("advice_name =?", advice_name)
+	}
+	err = db.Order("advice_date asc").Find(&advice).Error
+
+	return advice, err
+}

service/user_service.go

@@ -99,7 +99,12 @@ func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
 
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
-	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+
+	if orgId == 10724 {
+		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
+	} else {
+		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
+	}
 	return
 }
 
@@ -181,7 +186,7 @@ func GetLastData(orgid int64) (models.SgjPatientDryweight, error) {
 
 func UpdateDialysisPrescription(patientid int64, orgid int64, dryweight float64, prescription models.PredialysisEvaluation) error {
 
-	err := XTWriteDB().Model(&prescription).Where("patient_id = ? AND user_org_id = ? and assessment_date = ?", patientid, orgid, prescription.AssessmentDate).Update(map[string]interface{}{"dry_weight": prescription.DryWeight, "mtime": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&prescription).Where("patient_id = ? AND user_org_id = ? and assessment_date = ?", patientid, orgid, prescription.AssessmentDate).Update(map[string]interface{}{"dry_weight": prescription.DryWeight, "updated_time": time.Now().Unix()}).Error
 	fmt.Println("错误是设么", err)
 	return err
 }

service/warhouse_service.go

@@ -6133,6 +6133,18 @@ func UpdateGoodWarehouseOutById(id int64, warehouse_info_id int64, org_id int64,
 	return err
 }
 
+func GetDrugOutFlowByWarehouseOut(drug_id int64, warehouse_out_detail_id int64, org_id int64, tx *gorm.DB) (flow []*models.DrugFlow, err error) {
+
+	err = tx.Where("drug_id = ? and warehouse_out_detail_id = ? and user_org_id = ? and status=1", drug_id, warehouse_out_detail_id, org_id).Find(&flow).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
+	}
+	return flow, err
+}
+
 func UpdateNewGoodWarehouseOutById(id int64, warehouse_info_id int64, org_id int64, over_count int64, tx *gorm.DB) error {
 
 	err := tx.Model(models.WarehouseOutInfo{}).Where("id = ?  and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count}).Error
@@ -6443,18 +6455,15 @@ func ModifyGoodSumCount(storehouse_id int64, count int64, user_org_id int64, goo
 
 func ModifyNewGoodSumCount(storehouse_id int64, count int64, user_org_id int64, good_id int64, tx *gorm.DB) error {
 
-	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", count)).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
+	err := tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", count)).Error
 
 	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count + ?", count)).Error
+
+	fmt.Println("err---------------------------", err)
 	if err != nil {
 		tx.Rollback()
 		return err
 	}
-
 	return err
 }
 
@@ -10907,12 +10916,6 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 		//更新出库数量
 		ModifyNewGoodSumCount(goods.StorehouseId, goods.Count, goods.OrgId, goods.GoodId, tx)
 
-		if warehouse.StockCount < maxNumber {
-			tx.Rollback()
-			return errors.New("库存数量不足")
-
-		}
-
 		return nil
 	} else {
 		// 出库完成后，要将该批次库存清零
@@ -10978,6 +10981,7 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 		ModifyNewGoodSumCount(goods.StorehouseId, stock_number, goods.OrgId, goods.GoodId, tx)
 
 		goods.Count = deliver_number - stock_number
+
 		ConsumablesNewDeliveryThirty(orgID, record_time, goods, warehouseOut, count, creator, tx)
 	}
 	return nil
@@ -11195,6 +11199,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 +11271,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			SystemTime:              advice.SysRecordTime,
 			PatientId:               advice.PatientId,
 			Remark:                  advice.Remark,
+			OperateTime:             time.Now().Unix(),
 		}
 
 		CreateNewDrugFlowOne(drugflow, tx)