Browse Source

提交代码

陈少旭 1 year ago
parent
commit
492ad8c68f
1 changed files with 6 additions and 4 deletions
  1. 6 4
      controllers/his_api_controller.go

+ 6 - 4
controllers/his_api_controller.go View File

1190
 			}
1190
 			}
1191
 		}
1191
 		}
1192
 	}
1192
 	}
1193
-
1194
-	order.PsnCashPay = order.MedfeeSumamt
1193
+	if order.IsMedicineInsurance != 1 {
1194
+		order.PsnCashPay = order.MedfeeSumamt
1195
+	}
1195
 
1196
 
1196
 	for _, item := range orderInfos {
1197
 	for _, item := range orderInfos {
1197
 		if item.MedChrgitmType == "01" { //床位费
1198
 		if item.MedChrgitmType == "01" { //床位费
3552
 								//	}
3553
 								//	}
3553
 								//
3554
 								//
3554
 								//}
3555
 								//}
3556
+
3557
+								service.CreateNewHisProjectTwo(&p, tx)
3555
 								var randNum int
3558
 								var randNum int
3556
 								randNum = rand.Intn(10000) + 1000
3559
 								randNum = rand.Intn(10000) + 1000
3557
 								timestamp := time.Now().Unix()
3560
 								timestamp := time.Now().Unix()
3558
 								tempTime := time.Unix(timestamp, 0)
3561
 								tempTime := time.Unix(timestamp, 0)
3559
 								timeFormat := tempTime.Format("20060102150405")
3562
 								timeFormat := tempTime.Format("20060102150405")
3560
 								p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
3563
 								p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
3561
-
3562
 								service.CreateNewHisProjectTwo(&p, tx)
3564
 								service.CreateNewHisProjectTwo(&p, tx)
3563
 
3565
 
3564
 								//查询保存耗材出库开关是否打开
3566
 								//查询保存耗材出库开关是否打开
10467
 
10469
 
10468
 							break
10470
 							break
10469
 						case 3:
10471
 						case 3:
10470
-							item.MedChrgitmType = "03"
10472
+							item.MedChrgitmType = "04"
10471
 
10473
 
10472
 							break
10474
 							break
10473
 						case 4:
10475
 						case 4: