提交代码

controllers/his_api_controller.go

@@ -1918,17 +1918,6 @@ func (c *HisApiController) CreateHisPrescription() {
 		return
 	}
 
-	// 开始主事务
-	db := service.XTWriteDB()
-	tx := db.Begin()
-
-	// 在函数结束时处理事务回滚
-	defer func() {
-		if r := recover(); r != nil {
-			tx.Rollback()
-		}
-	}()
-
 	pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
 
 	//药品发药出库
@@ -3101,6 +3090,16 @@ func (c *HisApiController) CreateHisPrescription() {
 	var projectList []models.HisPrescriptionProject
 
 	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10164 {
+		// 开始主事务
+		db := service.XTWriteDB()
+		tx := db.Begin()
+
+		// 在函数结束时处理事务回滚
+		defer func() {
+			if r := recover(); r != nil {
+				tx.Rollback()
+			}
+		}()
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -10516,7 +10515,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				laboratoryCostSelfTotal = laboratoryCostTotal
 			}
 
-			if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" { //治疗费
+			if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" || item.MedChrgitmType == "201" { //治疗费
 				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				treatCostSelfTotal = treatCostTotal
 			}
@@ -10526,12 +10525,12 @@ func (c *HisApiController) GetFaPiaoData() {
 				operationCostSelfTotal = treatCostTotal
 			}
 
-			if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
+			if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" || item.MedChrgitmType == "301" { //材料费
 				materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				materialCostSelfTotal = materialCostTotal
 			}
 
-			if item.MedChrgitmType == "09" { //西药费
+			if item.MedChrgitmType == "09" || item.MedChrgitmType == "101" { //西药费
 				westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				westernMedicineCostSelfTotal = westernMedicineCostTotal
 			}
@@ -10593,7 +10592,7 @@ func (c *HisApiController) GetFaPiaoData() {
 
 			}
 
-			if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" { //治疗费
+			if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" || item.MedChrgitmType == "201" { //治疗费
 				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
@@ -10606,19 +10605,19 @@ func (c *HisApiController) GetFaPiaoData() {
 				operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
-			if item.MedChrgitmType == "08" || item.MedChrgitmType == "1401" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //材料费
+			if item.MedChrgitmType == "08" || item.MedChrgitmType == "1401" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "301" { //材料费
 				materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 				materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
-			if item.MedChrgitmType == "07" { //西药费
+			if item.MedChrgitmType == "07" { //护理
 				hiliCostTotal, _ = decimal.NewFromFloat(hiliCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				hiliCostSelfTotal, _ = decimal.NewFromFloat(hiliCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 				hiliCostPartSelfTotal, _ = decimal.NewFromFloat(hiliCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
-			if item.MedChrgitmType == "09" { //西药费
+			if item.MedChrgitmType == "09" || item.MedChrgitmType == "101" { //西药费
 				westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 				westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()