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

controllers/his_api_controller.go

@@ -72,7 +72,6 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/incomestatistics/get", &HisApiController{}, "get:GetIncomeStatisticsData")
 
 	beego.Router("/api/postprojectinformation", &HisApiController{}, "post:PostProjectInformation")
-	//beego.Router("/api/editprojectinformation", &HisApiController{}, "post:EditProjectInformation")
 	beego.Router("/api/hisprescriptiontemplate/create", &HisApiController{}, "post:CreateHisPrescriptionTemplate")
 	beego.Router("/api/privateexpenses/get", &HisApiController{}, "get:GetPrivateExpensesInfo")
 	beego.Router("/api/changemedtype/post", &HisApiController{}, "post:ChangeMedType")
@@ -101,14 +100,10 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/batch/settleaccount", &HisApiController{}, "get:GetBatchSettleAccounts")
 
 	beego.Router("/api/monthhispatient", &HisApiController{}, "get:GetMonthHisPatient")
-
 	beego.Router("/api/changeorderdesc", &HisApiController{}, "get:ChangeOrderDesc")
-
 	beego.Router("/api/getfapiaonumber", &HisApiController{}, "get:GetFaPiaoNumber")
-
 	beego.Router("/api/associationprescription", &HisApiController{}, "get:AssociationHisPrescription")
 	beego.Router("/api/checkhispatient", &HisApiController{}, "get:CheckHisPatient")
-
 	beego.Router("/api/hisorder/listtwo", &HisApiController{}, "get:GetHisOrderListTwo")
 
 }
@@ -10284,6 +10279,46 @@ func (this *HisApiController) GetLastOrNextHisPrescription() {
 	record_time := theAdviceRecordTime.Unix()
 	adminUserInfo := this.GetAdminUserInfo()
 	prescriptions, err := service.GetHisPrescriptionByType(change_type, record_time, adminUserInfo.CurrentOrgId, patient_id, p_type)
+
+	if adminUserInfo.CurrentOrgId == 10265 {
+		_, config := service.FindHisStockPriceRecordByOrgId(adminUserInfo.CurrentOrgId)
+		if config.ID > 0 && config.IsOpen == 1 {
+			for _, subitems := range prescriptions {
+				for _, item := range subitems.VMHisPrescription {
+					for _, subItem := range item.HisDoctorAdviceInfo {
+						drug, _ := service.GetDrugByGoodId(subItem.DrugId)
+						info, _ := service.GetWarehoseInfoByDrugId(subItem.DrugId, adminUserInfo.CurrentOrgId)
+						if info.RetailPrice > 0 {
+							if subItem.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+								subItem.Drug.RetailPrice = drug.RetailPrice
+							}
+							if subItem.PrescribingNumberUnit == drug.MinUnit {
+								subItem.Drug.MinPrice = info.RetailPrice
+								subItem.Drug.RetailPrice = info.RetailPrice
+							}
+
+						}
+					}
+				}
+			}
+		}
+
+		if config.ID > 0 && config.IsOpen == 1 {
+			for _, subitems := range prescriptions {
+				for _, item := range subitems.VMHisPrescription {
+					for _, subItem := range item.HisPrescriptionProject {
+						if subItem.Type == 3 {
+							info, _ := service.GetGoodWarehoseInfoByGoodId(subItem.ProjectId, adminUserInfo.CurrentOrgId)
+							if info.Price > 0 {
+								subItem.GoodInfo.PackingPrice = info.Price
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	if err == nil {
 		if len(prescriptions) == 0 {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)
@@ -10340,7 +10375,6 @@ func (this *HisApiController) GetCallHisPrescription() {
 				}
 			}
 		}
-
 		if config.ID > 0 && config.IsOpen == 1 {
 			for _, subitems := range prescriptions {
 				for _, item := range subitems.VMHisPrescription {