2024/6/17

controllers/his_api_controller.go

@@ -3764,70 +3764,70 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 
 												//针对康德
-												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.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
+												//	}
+												//
+												//}
 
 												//查询该药品所有入库数量
 
@@ -4396,43 +4396,43 @@ 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 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

@@ -2322,7 +2322,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")
 

service/patient_service.go

@@ -4920,7 +4920,7 @@ func GetPatientDryWeightList(patient_id int64, user_org_id int64, start_time int
 		db = db.Where("ctime>=?", start_time)
 	}
 	if end_time > 0 {
-		db = db.Where("ctime<=?", start_time)
+		db = db.Where("ctime<=?", end_time)
 	}
 	err = db.Find(&dry).Error