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

@@ -1190,8 +1190,9 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 			}
 		}
 	}
-
-	order.PsnCashPay = order.MedfeeSumamt
+	if order.IsMedicineInsurance != 1 {
+		order.PsnCashPay = order.MedfeeSumamt
+	}
 
 	for _, item := range orderInfos {
 		if item.MedChrgitmType == "01" { //床位费
@@ -3552,13 +3553,14 @@ func (c *HisApiController) CreateHisPrescription() {
 								//	}
 								//
 								//}
+
+								service.CreateNewHisProjectTwo(&p, tx)
 								var randNum int
 								randNum = rand.Intn(10000) + 1000
 								timestamp := time.Now().Unix()
 								tempTime := time.Unix(timestamp, 0)
 								timeFormat := tempTime.Format("20060102150405")
 								p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
-
 								service.CreateNewHisProjectTwo(&p, tx)
 
 								//查询保存耗材出库开关是否打开
@@ -10467,7 +10469,7 @@ func (c *HisApiController) GetFaPiaoData() {
 
 							break
 						case 3:
-							item.MedChrgitmType = "03"
+							item.MedChrgitmType = "04"
 
 							break
 						case 4: