提交代码

controllers/his_api_controller.go

@@ -921,6 +921,12 @@ func (c *HisApiController) GetTestOrder() {
 
 }
 
+type CustomFundPay struct {
+	FundPayType string  `json:"fund_pay_type"`
+	FundPayamt  float64 `json:"fund_payamt"`
+	InscpScpAmt float64 `json:"inscp_scp_amt"`
+}
+
 func (c *PublicApiController) GetBaiLinExportData() {
 	data := service.GetBaiLinOrderData()
 	fmt.Println(len(data))
@@ -1252,9 +1258,25 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 	org, _ := service.GetOrgById(adminUser.CurrentOrgId)
 	printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
+	var dia_config []*models.HisXtDiagnoseConfig
+	var diagnosis_ids []string
+	if his.ID > 0 {
+		diagnosis_ids = strings.Split(his.Diagnosis, ",")
 
-	patient, _ := service.GetFaPiaoPatientByID(order.UserOrgId, order.PatientId)
+	} else {
+		diagnosis_ids = strings.Split(his_hospital.Diagnosis, ",")
 
+	}
+
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		dia_config = append(dia_config, diagnosisConfig)
+	}
+
+	var rf []CustomFundPay
+	json.Unmarshal([]byte(order.SetlDetail), &rf)
+	patient, _ := service.GetFaPiaoPatientByID(order.UserOrgId, order.PatientId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patient":                                     patient,
 		"order_infos":                                 orderInfos,
@@ -1296,8 +1318,11 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 		"number":                                      order.MdtrtId,
 		"date":                                        order.SettleAccountsDate,
 		"info":                                        order,
+		"new_order":                                   order,
 		"his_hospital":                                his_hospital,
 		"his":                                         his,
+		"funds":                                       rf,
+		"dia_config":                                  dia_config,
 	})
 
 }