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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10028 //机构id
+		subscibe.OrgId = 10164 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 11811 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10028 //机构id小英9675或4
+		subscibe.OrgId = 10164 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 11811 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/drug_stock_api_contorller.go

@@ -3361,6 +3361,8 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 
 		}
 
+		service.ModifyDrugWarehouseInfoById(item.ID, in_cout, tx)
+
 		Creator := c.GetAdminUserInfo().AdminUser.Id
 
 		//查询默认仓库
@@ -3562,6 +3564,9 @@ func (c *StockDrugApiController) ReturnCheckWarehouseingInfo() {
 
 	}
 	for _, item := range list {
+
+		//清空库存
+		service.DeleteModiftyDrugWarehouseInfo(item.ID, tx)
 		//删除流水
 		service.UpdateNewWarehousingInfoFlow(item.ID, orgId, tx)
 		medical, _ := service.GetNewBaseDrugMedical(item.DrugId, tx)

controllers/his_api_controller.go

@@ -2246,11 +2246,97 @@ func (c *HisApiController) CreateHisPrescription() {
 	//已发药和已收费限制逻辑
 	isMidicine := false
 	isCharge := false
+	//是否有库存
+	isSumCount := false
+
+	is_sum_total := false
+
+	var drug_name = ""
+
+	var good_name = ""
+
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
 		if len(prescriptions) > 0 {
 			for _, item := range prescriptions {
 				items := item.(map[string]interface{})
+
+				if adminInfo.CurrentOrgId == 9478 {
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var adviceId int64
+								if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
+									adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
+								}
+								var drug_id int64
+								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+									drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+								}
+								drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
+								//查询该药品是否存在开药记录
+								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+								if advicelist.ID == 0 {
+									if drug.IsUse != 1 {
+										if drug.SumCount == 0 {
+											drug_name = drug.DrugName
+											isSumCount = true
+										}
+									}
+
+								}
+							}
+						}
+					}
+
+					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+						projects := items["project"].([]interface{})
+						if len(projects) > 0 {
+							for _, project := range projects {
+
+								var project_id int64
+								var project_type int64
+								var project_name string
+
+								if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
+									project_id = int64(project.(map[string]interface{})["project_id"].(float64))
+								}
+
+								if project.(map[string]interface{})["type"] != nil || reflect.TypeOf(project.(map[string]interface{})["type"]).String() == "float64" {
+									project_type = int64(project.(map[string]interface{})["type"].(float64))
+								}
+
+								if project.(map[string]interface{})["project_name"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_name"]).String() == "string" {
+									project_name = project.(map[string]interface{})["project_name"].(string)
+
+								}
+
+								if project_type == 3 {
+
+									//查找该耗材的出库记录
+									goodWarehouseInfo, _ := service.GetAutoRecordByGoodIdSevenEight(project_id, patient_id, recordDateTime)
+
+									if len(goodWarehouseInfo) == 0 {
+										//查询耗材库存
+										list, _ := service.GetGoodWarehouseInfoSevenTen(project_id, storeConfig.StorehouseOutInfo)
+
+										var stock_count int64
+										for _, it := range list {
+											stock_count += it.StockCount
+										}
+
+										if stock_count == 0 {
+											good_name = project_name
+											is_sum_total = true
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2278,6 +2364,25 @@ func (c *HisApiController) CreateHisPrescription() {
 		return
 	}
 
+	if adminInfo.CurrentOrgId == 9478 {
+		//不是保存处方出库
+		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
+
+		if drugOutConfig.IsOpen == 1 {
+			if isSumCount == true {
+				c.ServeDynamicFailJsonSend(drug_name + "库存不足,保存失败")
+				return
+			}
+		}
+
+		if goodOutConfig.IsOpen == 1 {
+			if is_sum_total == true {
+				c.ServeDynamicFailJsonSend(good_name + "库存不足,保存失败")
+				return
+			}
+		}
+	}
+
 	// 开始主事务
 	db := service.XTWriteDB()
 	tx := db.Begin()
@@ -3359,8 +3464,6 @@ func (c *HisApiController) CreateHisPrescription() {
 											//查询该患者耗材的历史数据
 											ordProject, _ := service.GetHisProjectPrescriptionByPatientIdOne(id)
 
-											fmt.Println("ordProject-----------------------", ordProject.ProjectId)
-
 											count, _ := strconv.ParseInt(ordProject.Count, 10, 64)
 
 											//数量发生改变
@@ -3534,7 +3637,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10768 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10768 || adminInfo.CurrentOrgId == 10164 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3675,6 +3778,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 						advices := items["advices"].([]interface{})
 						groupNo := int64(0)
+
 						if len(advices) > 0 {
 							for _, advice := range advices {
 								tx := db.Begin()
@@ -3807,6 +3911,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												if base.ID > 0 {
 													tx.Rollback()
 													c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+
 													return
 
 												}
@@ -3816,6 +3921,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												if drugMedical.SumCount == 0 {
 													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+
 													return
 
 												}
@@ -3825,77 +3931,10 @@ func (c *HisApiController) CreateHisPrescription() {
 												if len(list) == 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 {
@@ -3905,20 +3944,13 @@ func (c *HisApiController) CreateHisPrescription() {
 												if base.ID > 0 {
 													tx.Rollback()
 													c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+
 													return
 
 												}
 											}
 										}
 
-										//fmt.Println("药品名称----------------------", drug.DrugName)
-										//fmt.Println("药品名称----------------------", drug.IsUse)
-										//fmt.Println("drug_iiiiiiiiiiiiiiiiiiii", drug.ID)
-										//fmt.Println("is_user_total-------------------------", is_user_total)
-										//fmt.Println("no_user_total-------------------------", no_user_total)
-										//fmt.Println("drug.IsUse---------------", drug.IsUse)
-										//fmt.Println("00000000000000000000", s.UserOrgId)
-
 										if is_user_total != no_user_total {
 											//出库
 											//针对御享天源
@@ -4531,46 +4563,6 @@ 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
-												//	}
-												//}
-
-												fmt.Println("nowCount222=================", nowCount)
-												fmt.Println("historyCount-333----------------", historyCount)
 												//如果当前处方数量大于历史数据,则需要出库
 
 												if nowCount > historyCount {
@@ -6110,7 +6102,6 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 			}
 
-			fmt.Println("耗材----------------------------------", goodOutConfig.IsOpen)
 			//耗材保存处方出库
 			if goodOutConfig.IsOpen == 1 {
 
@@ -6128,8 +6119,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 					parseIntCount, _ := strconv.ParseInt(item.Count, 10, 64)
 
-					fmt.Println("out_count_five-------------------", out_count_five)
-					fmt.Println("parseIntCount---------------", parseIntCount)
 					if out_count_five != parseIntCount {
 
 						//查询耗材最后一次出库记录
@@ -7098,7 +7087,6 @@ func (c *HisApiController) DeletePrescription() {
 			//查询今日是否有出库数据
 			lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, item.AdviceDate, tx, 1)
 
-			fmt.Println("lastWarehouseOut-----------------------------------", lastWarehouseOut)
 			if lastWarehouseOut.ID == 0 {
 				service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
 			}
@@ -7155,7 +7143,6 @@ func (c *HisApiController) DeletePrescription() {
 			warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 		}
 
-		fmt.Println("长度-------------------------------", warehousingOutInfo)
 		for _, it := range warehousingOutInfo {
 			//查询今日是否有出库数据
 			lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, it.SysRecordTime, tx, 1)

controllers/inspection_api_controller.go

@@ -46,6 +46,10 @@ func InspectionApiRegistRouters() {
 
 	beego.Router("/api/getinspectionchildlist", &InspectionApiController{}, "Get:GetInspectionChildList")
 
+	beego.Router("/api/patient/getmajorinpsectionlist", &InspectionApiController{}, "Get:GetMajorInpsectionList")
+
+	beego.Router("/api/patient/getpatientinspectionlist", &InspectionApiController{}, "Get:GetInspectionProjectList")
+
 }
 func (c *InspectionApiController) SetInspectionRemind() {
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
@@ -1198,3 +1202,60 @@ func (c *InspectionApiController) GetInspectionChildList() {
 		"referenceList": referenceList,
 	})
 }
+
+func (c *InspectionApiController) GetMajorInpsectionList() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	org_id := c.GetAdminUserInfo().CurrentOrgId
+
+	patient, _ := service.GetPatientByIDOne(org_id, patient_id)
+	inspection, _ := service.GetInspectionGroup(patient_id, org_id)
+
+	referenceList, _ := service.GetInspetionRefenceList(org_id)
+
+	if len(inspection) > 0 {
+		for _, item := range inspection {
+			lastInspection, _ := service.GetLastInspectionProject(patient_id, org_id, item.ProjectId)
+			item.InspectDate = lastInspection.InspectDate
+			inspecList, _ := service.GetInspectionByProjectId(patient_id, org_id, item.ProjectId)
+			item.Count = int64(len(inspecList))
+		}
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"referenceList": referenceList,
+		"inspection":    inspection,
+		"patient":       patient,
+	})
+}
+
+func (c *InspectionApiController) GetInspectionProjectList() {
+
+	project_id, _ := c.GetInt64("project_id")
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	limit, _ := c.GetInt64("limit")
+
+	page, _ := c.GetInt64("page")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	//先把日期归成整数
+	service.UpdateInspectionProject(project_id, patient_id, orgId)
+
+	inspection, total, _ := service.GetInspectionProjectListByGroup(project_id, orgId, patient_id, limit, page)
+
+	if len(inspection) > 0 {
+		for _, item := range inspection {
+			project, _ := service.GetInspctionListByProject(item.PatientId, item.InspectDate, item.ProjectId)
+			item.Child = project
+		}
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"total":      total,
+		"inspection": inspection,
+	})
+	return
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3044,6 +3044,13 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		}
 
+		if adminUserInfo.Org.Id == 9829 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
+			tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
+		}
+
 		if adminUserInfo.Org.Id == 10766 {
 			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
@@ -3118,7 +3125,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10735 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10766 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10735 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 9829 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 
 		if adminUserInfo.Org.Id != 10702 {
@@ -3130,6 +3137,11 @@ func (c *DialysisAPIController) Finish() {
 					evaluation.SystolicBloodPressure = SystolicBloodPressureOne
 				}
 
+				if adminUserInfo.Org.Id == 9829 {
+					SystolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorSystolicBloodPressureOne, 64)
+					evaluation.SystolicBloodPressure = SystolicBloodPressureOne
+				}
+
 				pre := models.PredialysisEvaluation{
 					SystolicBloodPressure: evaluation.SystolicBloodPressure,
 				}
@@ -3154,6 +3166,11 @@ func (c *DialysisAPIController) Finish() {
 					DiastolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
 					evaluation.DiastolicBloodPressure = DiastolicBloodPressureOne
 				}
+
+				if adminUserInfo.Org.Id == 9829 {
+					DiastolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
+					evaluation.DiastolicBloodPressure = DiastolicBloodPressureOne
+				}
 				pres := models.PredialysisEvaluation{
 					DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
 				}
@@ -3179,6 +3196,11 @@ func (c *DialysisAPIController) Finish() {
 					pulseFrequency, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
 					evaluation.PulseFrequency = pulseFrequency
 				}
+
+				if adminUserInfo.Org.Id == 9829 {
+					pulseFrequency, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
+					evaluation.PulseFrequency = pulseFrequency
+				}
 				press := models.PredialysisEvaluation{
 					PulseFrequency: evaluation.PulseFrequency,
 				}
@@ -3996,11 +4018,11 @@ func (this *DialysisAPIController) StartDialysis() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
 			return
 		}
-		advices, _ := service.GetDialysisPrescriptionDoctorAdviceList(adminUserInfo.Org.Id, patientID, schedulestartTime)
-		if len(advices) == 0 {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
-			return
-		}
+		//advices, _ := service.GetDialysisPrescriptionDoctorAdviceList(adminUserInfo.Org.Id, patientID, schedulestartTime)
+		//if len(advices) == 0 {
+		//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
+		//	return
+		//}
 	}
 
 	//查询该床位是否有人用了
@@ -6316,7 +6338,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		dialysisRecord.EndTime = endTime
 	}
 
-	if adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10164 {
+	if adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 9478 {
 		//查询第一条监测
 		firstMonitor, _ := service.GetFirstMonitor(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3515,7 +3515,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		if groupno > 0 {
 			advices, _ := service.FindAllDoctorAdviceByGoroupNoThree(adminUserInfo.Org.Id, groupno, patient_id, record_date)
 			for _, item := range advices {
-				if item.CheckState == 0 {
+				if item.CheckState == 0 || item.CheckState == 2 {
 					advice = item
 				}
 
@@ -3547,7 +3547,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		} else {
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			for _, item := range advices {
-				if item.CheckState == 0 {
+				if item.CheckState == 0 || item.CheckState == 2 {
 					advice = item
 
 				}

controllers/patient_api_controller.go

@@ -331,6 +331,7 @@ func (c *PatientApiController) GetPatientsList() {
 	patient_type, _ := c.GetInt64("patient_type")
 	nurse, _ := c.GetInt64("nurse")
 	insuplc_admdvs_name := c.GetString("insuplc_admdvs_name")
+	insurance_type, _ := c.GetInt64("insurance_type")
 	if page <= 0 {
 		page = 1
 	}
@@ -369,7 +370,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 	var patients []*models.Patients
 	var total int64
-	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse, patient_type, insuplc_admdvs_name)
+	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse, patient_type, insuplc_admdvs_name, insurance_type)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
@@ -1170,12 +1171,16 @@ func (c *PatientApiController) GetPatient() {
 	diseases := service.GetPatientDiseases(patient.ID)
 	contagions := service.GetPatientContagions(patient.ID)
 	patientVascularAccessOne, _ := service.GetPatientVascularAccessOne(patient.ID)
+
+	viewModels, _, _ := service.GetAdminUsersAndLoginInfo(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, 1, 100)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patient":                  patient,
 		"diseases":                 diseases,
 		"contagions":               contagions,
 		"infections":               infections,
 		"patientVascularAccessOne": patientVascularAccessOne,
+		"viewModels":               viewModels,
 	})
 	return
 }

controllers/role_controller.go

@@ -1292,7 +1292,7 @@ func (this *RoleAPIController) EditAdminInitData() {
 		}
 	}
 	org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
-
+	userAdmin, _ := service.GetAdminUserPassWord(admin_user_id)
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
 	qntoken, _ := redisClient.Get("qn_token").Result()
@@ -1303,6 +1303,7 @@ func (this *RoleAPIController) EditAdminInitData() {
 		"qntoken":         qntoken,
 		"isSubSuperAdmin": isSubSuperAdmin,
 		"org":             org,
+		"userAdmin":       userAdmin,
 	})
 }
 

controllers/self_drug_api_congtroller.go

@@ -4025,6 +4025,7 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 			}
 			//
 			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
+
 			for _, it := range outInfo {
 				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 			}

controllers/stock_in_api_controller.go

@@ -7434,7 +7434,7 @@ func (this *StockManagerApiController) ReturnCheckWarehouseOut() {
 	list, err := service.GetNewWarehouseOutById(id, orgId, tx)
 	for _, item := range list {
 
-		service.ModifyGoodOutInfoLog(item.GoodId, item.ID, tx)
+		service.ModifyGoodOutInfoLog(item.GoodId, item.ID, item.SysRecordTime, item.OrgId, tx)
 		//回退库存
 		service.UpdateaNewGoodWarehouseInfo(item.Count, item.GoodId, item.OrgId, item.WarehouseInfotId, tx)
 

models/drug_stock.go

@@ -92,6 +92,7 @@ type DrugWarehouseInfo struct {
 	ManafacturerName          string  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
 	DealerName                string  `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
 	DrugCode                  string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	SumCount                  int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 }
 
 func (DrugWarehouseInfo) TableName() string {

models/inspection_models.go

@@ -71,6 +71,7 @@ type InspectionReference struct {
 	SystemProjectId  int64  `gorm:"column:system_project_id" json:"system_project_id" form:"system_project_id"`
 	SystemItemId     int64  `gorm:"column:system_item_id" json:"system_item_id" form:"system_item_id"`
 	Sort             int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	InspectionType   int64  `gorm:"column:inspection_type" json:"inspection_type" form:"inspection_type"`
 	//remind 	 XtCheckRemind   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"good_info"`
 }
 

models/patient_models.go

@@ -240,6 +240,7 @@ type Patients struct {
 	FamalityRecord           string  `gorm:"column:famality_record" json:"famality_record" form:"famality_record"`
 	InsuplcAdmdvs            string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	OrgLogo                  string  `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
+	Insutype                 string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
 }
 
 func (Patients) TableName() string {

service/dialysis_service.go

@@ -2809,7 +2809,7 @@ func BatchAdviceDoctorList(patient_id int64, advice_date int64, id int64, user_o
 
 	advice := models.DoctorAdvice{}
 
-	err := XTWriteDB().Model(&advice).Where("id = ? and patient_id = ? and advice_date =? and user_org_id = ? and check_state=0", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
+	err := XTWriteDB().Model(&advice).Where("id = ? and patient_id = ? and advice_date =? and user_org_id = ? and (check_state=0 or check_state =2)", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
 
 	return advice, err
 }
@@ -2818,7 +2818,7 @@ func BatchHisAdviceDoctorList(patient_id int64, advice_date int64, id int64, use
 
 	advice := models.HisDoctorAdvice{}
 
-	err := XTWriteDB().Model(&advice).Where("id = ? and patient_id = ? and advice_date =? and user_org_id = ? and check_state=0", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
+	err := XTWriteDB().Model(&advice).Where("id = ? and patient_id = ? and advice_date =? and user_org_id = ? and (check_state=0 or check_state =2)", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
 
 	return advice, err
 }
@@ -2827,7 +2827,7 @@ func BatchHisPrescriptionProject(patient_id int64, record_date int64, id int64,
 
 	project := models.HisPrescriptionProject{}
 
-	err := XTWriteDB().Model(&project).Where("id = ? and patient_id = ? and record_date =? and user_org_id = ? and check_state=0", id, patient_id, record_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
+	err := XTWriteDB().Model(&project).Where("id = ? and patient_id = ? and record_date =? and user_org_id = ? and (check_state=0 or check_state =2)", id, patient_id, record_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
 
 	return project, err
 

service/inspection_service.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"errors"
-	"fmt"
 	"strings"
 	"time"
 
@@ -112,8 +111,6 @@ func EditPatientInspection(add []models.Inspection, edit []models.Inspection, no
 
 	if len(edit) > 0 {
 		for _, item := range edit {
-			fmt.Println("o----------------------", item.ItemId)
-			fmt.Println("value----------------------", item.InspectValue)
 			err = tx.Save(&item).Error
 			if err != nil {
 				tx.Rollback()
@@ -463,3 +460,39 @@ func GetNewInspectionDetailList(project_id int64, inspect_value int64, patient_i
 
 	return inpection, err
 }
+
+func GetInspetionRefenceList(orgId int64) (reference []*models.InspectionReference, err error) {
+
+	var count int
+	err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Count(&count).Error
+	if count > 0 {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Group("project_id").Order("project_id,created_time").Find(&reference).Error
+	} else {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = 0").Group("project_id").Order("project_id,created_time").Find(&reference).Error
+	}
+
+	return reference, err
+}
+
+func UpdateInspectionProject(project_id int64, patient_id int64, org_id int64) (models.XtInspection, error) {
+
+	inspection := models.XtInspection{}
+	query := `UPDATE xt_inspection SET inspect_date = UNIX_TIMESTAMP(FROM_UNIXTIME(inspect_date, '%Y-%m-%d 00:00:00')) WHERE project_id = ? and patient_id = ? and org_id = ? and status=1`
+	err := XTWriteDB().Model(&inspection).Exec(query, project_id, patient_id, org_id).Error
+	return inspection, err
+
+}
+
+func GetInspectionProjectListByGroup(project_id int64, org_id int64, patient_id int64, limit int64, page int64) (inspection []*models.Inspection, total int64, err error) {
+
+	err = readDb.Where("patient_id =? and project_id = ? and org_id = ? and status=1", patient_id, project_id, org_id).Group("inspect_date").Offset(page - 1).Limit(limit).Find(&inspection).Error
+
+	return inspection, total, err
+}
+
+func GetInspctionListByProject(patient_id int64, inspect_date int64, project_id int64) (inspection []*models.Inspection, err error) {
+
+	err = readDb.Where("patient_id = ? and inspect_date = ? and project_id = ? and status =1", patient_id, inspect_date, project_id).Find(&inspection).Error
+
+	return inspection, err
+}

service/login_service.go

@@ -180,6 +180,15 @@ func GetOrgById(orgID int64) (*models.Org, error) {
 	return &org, nil
 }
 
+func GetAdminUserPassWord(admin_user_id int64) (models.SgjUserAdmin, error) {
+
+	userAdmin := models.SgjUserAdmin{}
+
+	err = XTReadDB().Where("id = ?", admin_user_id).Find(&userAdmin).Error
+
+	return userAdmin, err
+}
+
 func GetAppById(appID int64) (*models.OrgApp, error) {
 	var app models.OrgApp
 	err := readUserDb.Model(&models.OrgApp{}).Where("id = ?", appID).First(&app).Error

service/manage_center_service.go

@@ -253,6 +253,13 @@ func GetSelfDrugAutoWarehouseOutNight(patient_id int64, advicedate int64, drugid
 	return night, err
 }
 
+func ModifyDrugWarehouseInfoId(id int64, count int64) error {
+
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status=1", id).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", count)).Error
+
+	return err
+}
+
 func UpdateDrugWarehouse(id int64, info models.DrugWarehouseInfo) error {
 	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
 	return err
@@ -541,6 +548,9 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMinNumber: its.Count,
 					}
+
+					ModifyDrugWarehouseInfoId(its.WarehouseInfoId, its.Count)
+
 					UpdateDrugWarehouse(its.WarehouseInfoId, warehouseInfo)
 
 					//增加退库数量
@@ -553,6 +563,12 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
+
+					drug, _ := GetBaseDrugMedical(advice.DrugId)
+
+					var sum_count = its.Count * drug.MinNumber
+
+					ModifyDrugWarehouseInfoId(its.WarehouseInfoId, sum_count)
 					UpdateDrugWarehouseOne(its.WarehouseInfoId, warehouseInfo)
 
 					//增加退库数量
@@ -565,6 +581,12 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
+					drug, _ := GetBaseDrugMedical(advice.DrugId)
+
+					var sum_count = its.Count * drug.MinNumber
+
+					ModifyDrugWarehouseInfoId(its.WarehouseInfoId, sum_count)
+
 					UpdateDrugWarehouseOne(its.WarehouseInfoId, warehouseInfo)
 					//增加退库数量
 					AddCancelSumCountOne(storeHouseConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, its.Count*drug.MinNumber)

service/new_warehouse_service.go

@@ -1612,8 +1612,10 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			warehouse.StockMinNumber = 0
 		}
 
+		UpdateDrugWarehouseInfoSumCountOne(warehouse.ID, deliver_number)
 		//扣减库存数据
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+
 		if errThree != nil {
 			drugError := models.XtDrugError{
 				UserOrgId:             orgID,
@@ -2119,6 +2121,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			StorehouseId:      storeConfig.DrugStorehouseOut,
 			IsCheck:           1,
 		}
+		UpdateDrugWarehouseInfoSumCountOne(warehouse.ID, 0)
 		//扣减库存
 		errThree := UpDateDrugWarehouseInfoByStock(&info)
 
@@ -4557,9 +4560,6 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 
-		//fmt.Println("max_Number=====================", maxNumber)
-		//fmt.Println("minNumber=====================", minNumber)
-
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -4596,8 +4596,6 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		warehouse.Mtime = time.Now().Unix()
 
-		//fmt.Println("hahhahahah", warehouse.StockMinNumber)
-		//fmt.Println("howowowoowow", minNumber)
 		if warehouse.StockMinNumber < minNumber {
 
 			if warehouse.MaxUnit != warehouse.MinUnit {
@@ -4608,10 +4606,6 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 			}
-			//fmt.Println("minNumber------", minNumber)
-			//fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
-			//fmt.Println(" warehouse.MaxUnit", warehouse.MaxUnit)
-			//fmt.Println(" warehouse.MinUnit", warehouse.MinUnit)
 
 			if warehouse.MaxUnit == warehouse.MinUnit {
 				//改动的地方
@@ -4643,8 +4637,6 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		}
 
-		//fmt.Println("maxNumber", maxNumber)
-		//fmt.Println("minNumber", maxNumber)
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) >= 0 {
 
@@ -4663,6 +4655,8 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			warehouse.StockMinNumber = 0
 		}
 
+		UpdateDrugWarehouseInfoSumCount(warehouse.ID, deliver_number, tx)
+
 		//扣减库存数据
 		UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
 
@@ -4823,6 +4817,8 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			StorehouseId:      storeConfig.DrugStorehouseOut,
 			IsCheck:           1,
 		}
+
+		UpdateDrugWarehouseInfoSumCount(warehouse.ID, 0, tx)
 		//扣减库存
 		UpDateNewDrugWarehouseInfoByStock(&info, tx)
 
@@ -4989,6 +4985,8 @@ func NewHisDrugCancelInfo(orgID int64, creater int64, advice *models.HisDoctorAd
 		//退库 退回 cha_count 的数量
 		ModifyNewDrugWarehouseInfoStockMinNumber(cha_count, drugOutInfo.DrugId, drugOutInfo.OrgId, drugOutInfo.WarehouseInfoId, tx)
 
+		ModifyDrugWareshoueInfoId(cha_count, drugOutInfo.DrugId, drugOutInfo.OrgId, drugOutInfo.WarehouseInfoId, tx)
+
 		if out_count == cha_count {
 			//删除该出库单
 			DeleteDrugWarehouseOutInfoByNumber(drugOutInfo.ID, tx)
@@ -5120,6 +5118,7 @@ func NewHisDrugCancelInfo(orgID int64, creater int64, advice *models.HisDoctorAd
 		//把该出库单的数量退完
 		ModifyNewDrugWarehouseInfoStockMinNumber(out_count, drugOutInfo.DrugId, drugOutInfo.OrgId, drugOutInfo.WarehouseInfoId, tx)
 
+		ModifyDrugWareshoueInfoId(out_count, drugOutInfo.DrugId, drugOutInfo.OrgId, drugOutInfo.WarehouseInfoId, tx)
 		//删除该出库单
 		DeleteDrugWarehouseOutInfoByNumber(drugOutInfo.ID, tx)
 

service/patient_service.go

@@ -14,7 +14,7 @@ import (
 )
 
 // GetPatientList 返回患者的列表
-func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64, patient_type int64, insuplc_admdvs_name string) (patients []*models.Patients, total int64, err error) {
+func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64, patient_type int64, insuplc_admdvs_name string, insurance_type int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
 	if orgID > 0 {
@@ -65,6 +65,10 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 		db = db.Where("p.reimbursement_way_id = ?", reimbursementWay)
 	}
 
+	if insurance_type > 0 {
+		db = db.Where("p.insutype = ?", insurance_type)
+	}
+
 	if isStartTime {
 		db = db.Where("p.created_time>=?", startTime)
 	}
@@ -102,7 +106,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	}
 
-	return
+	return patients, total, err
 
 }
 

service/stock_service.go

@@ -1211,7 +1211,7 @@ func FindAllWarehousingList(orgId int64, page int64, limit int64, startTime int6
 	if check_type > 0 {
 		db = db.Where("xt_warehouse.is_check = ?", check_type)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("xt_warehouse.ctime desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("xt_warehouse.warehousing_time desc").Find(&list).Error
 	return
 }
 
@@ -1460,7 +1460,7 @@ func FindAllDrugWarehousingListOne(orgId int64, page int64, limit int64, startTi
 	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
-	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse.ctime desc").Find(&list).Error
+	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse.warehousing_time desc").Find(&list).Error
 	return
 }
 
@@ -3172,6 +3172,24 @@ func UpDateDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo) (err error
 	return err
 }
 
+func UpdateDrugWarehouseInfoSumCount(id int64, deliver_number int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status=1 and is_check=1", id).UpdateColumn("sum_count", gorm.Expr("sum_count - ?", deliver_number)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateDrugWarehouseInfoSumCountOne(id int64, deliver_number int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status=1 and is_check=1", id).UpdateColumn("sum_count", gorm.Expr("sum_count - ?", deliver_number)).Error
+
+	return err
+}
+
 func UpDateNewDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo, tx *gorm.DB) (err error) {
 	err = tx.Save(&info).Error
 
@@ -8600,17 +8618,17 @@ func UpdateaGoodWarehouseInfo(count int64, good_id int64, orgid int64, warehouse
 
 }
 
-func ModifyGoodOutInfoLog(good_id int64, id int64, tx *gorm.DB) (models.XtGoodWarehouseOutInfoLog, error) {
+func ModifyGoodOutInfoLog(good_id int64, id int64, record_date int64, user_org_id int64, tx *gorm.DB) error {
 
 	outInfoLog := models.XtGoodWarehouseOutInfoLog{}
 
-	err := tx.Model(&outInfoLog).Where("good_id = ? and warehouse_out_info_id = ?", good_id, id).Updates(map[string]interface{}{"status": 0}).Error
+	err := tx.Model(&outInfoLog).Where("good_id = ? and warehouse_out_info_id = ? and status=1 and record_date = ? and user_org_id = ?", good_id, id, record_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 
 	if err != nil {
 		tx.Rollback()
-		return outInfoLog, err
+		return err
 	}
-	return outInfoLog, err
+	return err
 
 }
 
@@ -8966,6 +8984,17 @@ func UpdateWarehousingInfoFlow(id int64, orgid int64) error {
 	return err
 }
 
+func DeleteModiftyDrugWarehouseInfo(id int64, tx *gorm.DB) error {
+
+	info := models.DrugWarehouseInfo{}
+	err := tx.Model(&info).Where("id= ? and status=1", id).Updates(map[string]interface{}{"sum_count": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func UpdateNewWarehousingInfoFlow(id int64, orgid int64, tx *gorm.DB) error {
 
 	err := tx.Model(&models.DrugFlow{}).Where("warehousing_detail_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
@@ -9003,6 +9032,18 @@ func AddNewDrugWarehouseStockMinNumber(count int64, id int64, tx *gorm.DB) error
 	return err
 }
 
+func ModifyDrugWarehouseInfoById(id int64, sum_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"sum_count": sum_count}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func ReturnCheckWarehouseingInfo(id int64, orgid int64) error {
 	tx := XTWriteDB().Begin()
 	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
@@ -9746,6 +9787,16 @@ func ModifyNewDrugWarehouseInfoStockMinNumber(count int64, drugid int64, orgid i
 	return err
 }
 
+func ModifyDrugWareshoueInfoId(count int64, drugid int64, orgid int64, id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and drug_id = ? and status = 1", id, orgid, drugid).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func ModifyDrugCancelStockInfo(id int64, info *models.DrugCancelStockInfo) error {
 
 	err := XTWriteDB().Model(&models.DrugCancelStockInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "price": info.Price, "total": info.Total, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "register_account": info.RegisterAccount, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit, "batch_number_id": info.BatchNumberId, "storehouse_id": info.StorehouseId}).Error

service/warhouse_service.go

@@ -10000,6 +10000,7 @@ func AutoSelfDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, ware
 			warehouse.StockMinNumber = 0
 		}
 
+		UpdateDrugWarehouseInfoSumCount(warehouse.ID, deliver_number, tx)
 		errThree := UpDateSelfDrugWarehouseInfoByStock(&warehouse, tx)
 
 		if errThree != nil {
@@ -10090,7 +10091,7 @@ func AutoSelfDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, ware
 		warehouse.StockMaxNumber = 0
 		warehouse.StockMinNumber = 0
 		warehouse.Mtime = time.Now().Unix()
-
+		UpdateDrugWarehouseInfoSumCount(warehouse.ID, 0, tx)
 		errThree := UpDateSelfDrugWarehouseInfoByStock(&warehouse, tx)
 		if errThree != nil {
 			return errThree
@@ -10333,6 +10334,7 @@ func AutoSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, ware
 			warehouse.StockMinNumber = 0
 		}
 
+		UpdateDrugWarehouseInfoSumCount(warehouse.ID, deliver_number, tx)
 		errThree := UpDateSelfDrugWarehouseInfoByStock(&warehouse, tx)
 
 		if errThree != nil {
@@ -10413,10 +10415,6 @@ func AutoSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, ware
 		//出库数量相加
 		AddSelfDrugCount(advice.DrugId, orgID, advice.PatientId, drugflow.Count, tx)
 
-		//fmt.Println("advice-------------------------------------", advice.ID)
-		//fmt.Println("warehouse-------------------------------------", warehouse.ID)
-		//fmt.Println("over_count====================================", over_count)
-
 		return nil
 
 	} else {
@@ -10427,7 +10425,7 @@ func AutoSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, ware
 		warehouse.StockMaxNumber = 0
 		warehouse.StockMinNumber = 0
 		warehouse.Mtime = time.Now().Unix()
-
+		UpdateDrugWarehouseInfoSumCount(warehouse.ID, 0, tx)
 		errThree := UpDateSelfDrugWarehouseInfoByStock(&warehouse, tx)
 		if errThree != nil {
 			return errThree