Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -8657,13 +8657,21 @@ func (c *HisApiController) GetSettleAccounts() {
 	orderInfos = append(orderInfos, orderInfos_two...)
 	his_hospital, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 	//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
-	diagnosis_ids := strings.Split(his.Diagnosis, ",")
+	var diagnosis_ids []string
+	if his.ID > 0 {
+		diagnosis_ids = strings.Split(his.Diagnosis, ",")
+
+	} else {
+		diagnosis_ids = strings.Split(his_hospital.Diagnosis, ",")
+
+	}
 	patient, _ := service.GetPatientByIDTwo(adminUser.CurrentOrgId, order.PatientId)
-	//var config []*models.HisXtDiagnoseConfig
+	var dia_config []*models.HisXtDiagnoseConfig
 	var name string
 	for _, item := range diagnosis_ids {
 		id, _ := strconv.ParseInt(item, 10, 64)
 		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		dia_config = append(config, &diagnosisConfig)
 		if len(name) == 0 {
 			name = diagnosisConfig.ClassName
 
@@ -9014,6 +9022,7 @@ func (c *HisApiController) GetSettleAccounts() {
 				"order_number":   order.Number,
 				"his_hospital":   his_hospital,
 				"his":            his,
+				"dia_config":     dia_config,
 
 				//"check_order_info":                            cus_slice,
 			})