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

controllers/sg/his_api_controller.go

 				order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
 				order.HosplistName = subItem.BaseDrugLib.DrugName
 				order.HilistLv = "1"
-				order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+				order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
 				order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
 				order.HosplistName = subItem.BaseDrugLib.DrugName
-				order.Cnt = strconv.FormatFloat(subItem.PrescribingNumber, 'E', -1, 64)
-				order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-				order.Sumamt = strconv.FormatFloat((subItem.Price * subItem.PrescribingNumber), 'E', -1, 64)
+				order.Cnt = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
+				order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+				order.Sumamt = fmt.Sprintf("%.2f", (subItem.PrescribingNumber * subItem.Price))
 				order.OwnpayAmt = ""
 				order.SelfpayAmt = ""
 				order.Spec = ""
 					order.HilistCode = subItem.HisProject.MedicalCode
 					order.HosplistName = subItem.HisProject.ProjectName
 					order.HilistLv = "1"
-					order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+					order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
 					order.HosplistCode = subItem.HisProject.MedicalCode
 					order.HosplistName = subItem.HisProject.ProjectName
 					order.Cnt = subItem.Count
 					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-
-					order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-					order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
+					order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+					order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
 					order.OwnpayAmt = ""
 					order.SelfpayAmt = ""
 					order.Spec = ""
 					order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
 					order.HosplistName = subItem.GoodInfo.GoodName
 					order.HilistLv = "1"
-					order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+					order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
 					order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
 					order.HosplistName = subItem.GoodInfo.GoodName
 					order.Cnt = subItem.Count
 					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-					order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-					order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
+					order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+					order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
 					order.OwnpayAmt = ""
 					order.SelfpayAmt = ""
 					order.Spec = ""
 	fed.MedType = order.MedType
 	//处方医嘱信息
 	var orders []*models.FsiOrderDtos
+	//for _, item := range prescriptions {
+	//	for _, subItem := range item.HisDoctorAdviceInfo {
+	//		var order models.FsiOrderDtos
+	//		order.RxID = strconv.FormatInt(item.ID, 10)
+	//		order.Rxno = strconv.FormatInt(item.ID, 10)
+	//		order.LongDrordFlag = "0"
+	//		order.HilistType = "1"
+	//		order.ChrgType = "1"
+	//		order.DrordBhvr = "-"
+	//		order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
+	//		order.HosplistName = subItem.BaseDrugLib.DrugName
+	//		order.HilistLv = "1"
+	//		order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+	//		order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
+	//		order.HosplistName = subItem.BaseDrugLib.DrugName
+	//		order.Cnt = strconv.FormatFloat(subItem.PrescribingNumber, 'E', -1, 64)
+	//		order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+	//		order.Sumamt = strconv.FormatFloat((subItem.Price * subItem.PrescribingNumber), 'E', -1, 64)
+	//		order.OwnpayAmt = ""
+	//		order.SelfpayAmt = ""
+	//		order.Spec = ""
+	//		order.SpecUnt = ""
+	//		order.DrordBegnDate = s_tm
+	//		order.DrordStopDate = ""
+	//		order.DrordDrCodg = "1"
+	//		order.DrordDeptName = department.Name
+	//		order.DrordDrCodg = "1"
+	//		order.DrordDrName = doctor_info.UserName
+	//		order.DrordDrProfttl = ""
+	//		order.CurrDrordFlag = "1"
+	//		orders = append(orders, &order)
+	//	}
+	//	for _, subItem := range item.HisPrescriptionProject {
+	//		if subItem.Type == 2 {
+	//			var order models.FsiOrderDtos
+	//			order.RxID = strconv.FormatInt(item.ID, 10)
+	//			order.Rxno = strconv.FormatInt(item.ID, 10)
+	//			order.LongDrordFlag = "0"
+	//			order.HilistType = "1"
+	//			order.ChrgType = "1"
+	//			order.DrordBhvr = "-"
+	//			order.HilistCode = subItem.HisProject.MedicalCode
+	//			order.HosplistName = subItem.HisProject.ProjectName
+	//			order.HilistLv = "1"
+	//			order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+	//			order.HosplistCode = subItem.HisProject.MedicalCode
+	//			order.HosplistName = subItem.HisProject.ProjectName
+	//			order.Cnt = subItem.Count
+	//			cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+	//
+	//			order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+	//			order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
+	//			order.OwnpayAmt = ""
+	//			order.SelfpayAmt = ""
+	//			order.Spec = ""
+	//			order.SpecUnt = ""
+	//			order.DrordBegnDate = s_tm
+	//			order.DrordStopDate = ""
+	//			order.DrordDrCodg = "1"
+	//			order.DrordDeptName = department.Name
+	//			order.DrordDrCodg = "1"
+	//			order.DrordDrName = doctor_info.UserName
+	//			order.DrordDrProfttl = ""
+	//			order.CurrDrordFlag = "1"
+	//			orders = append(orders, &order)
+	//
+	//		}
+	//		if subItem.Type == 3 {
+	//
+	//			var order models.FsiOrderDtos
+	//			order.RxID = strconv.FormatInt(item.ID, 10)
+	//			order.Rxno = strconv.FormatInt(item.ID, 10)
+	//			order.LongDrordFlag = "0"
+	//			order.HilistType = "1"
+	//			order.ChrgType = "1"
+	//			order.DrordBhvr = "-"
+	//			order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
+	//			order.HosplistName = subItem.GoodInfo.GoodName
+	//			order.HilistLv = "1"
+	//			order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+	//			order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
+	//			order.HosplistName = subItem.GoodInfo.GoodName
+	//			order.Cnt = subItem.Count
+	//			cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+	//			order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+	//			order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
+	//			order.OwnpayAmt = ""
+	//			order.SelfpayAmt = ""
+	//			order.Spec = ""
+	//			order.SpecUnt = ""
+	//			order.DrordBegnDate = s_tm
+	//			order.DrordStopDate = ""
+	//			order.DrordDrCodg = "1"
+	//			order.DrordDeptName = department.Name
+	//			order.DrordDrCodg = "1"
+	//			order.DrordDrName = doctor_info.UserName
+	//			order.DrordDrProfttl = ""
+	//			order.CurrDrordFlag = "1"
+	//			orders = append(orders, &order)
+	//
+	//		}
+	//	}
+	//}
 	for _, item := range prescriptions {
 		for _, subItem := range item.HisDoctorAdviceInfo {
 			var order models.FsiOrderDtos
 			order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
 			order.HosplistName = subItem.BaseDrugLib.DrugName
 			order.HilistLv = "1"
-			order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+			order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
 			order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
 			order.HosplistName = subItem.BaseDrugLib.DrugName
-			order.Cnt = strconv.FormatFloat(subItem.PrescribingNumber, 'E', -1, 64)
-			order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-			order.Sumamt = strconv.FormatFloat((subItem.Price * subItem.PrescribingNumber), 'E', -1, 64)
+			order.Cnt = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
+			order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+			order.Sumamt = fmt.Sprintf("%.2f", (subItem.PrescribingNumber * subItem.Price))
 			order.OwnpayAmt = ""
 			order.SelfpayAmt = ""
 			order.Spec = ""
 				order.HilistCode = subItem.HisProject.MedicalCode
 				order.HosplistName = subItem.HisProject.ProjectName
 				order.HilistLv = "1"
-				order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+				order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
 				order.HosplistCode = subItem.HisProject.MedicalCode
 				order.HosplistName = subItem.HisProject.ProjectName
 				order.Cnt = subItem.Count
 				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-
-				order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-				order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
+				order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+				order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
 				order.OwnpayAmt = ""
 				order.SelfpayAmt = ""
 				order.Spec = ""
 				order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
 				order.HosplistName = subItem.GoodInfo.GoodName
 				order.HilistLv = "1"
-				order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+				order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
 				order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
 				order.HosplistName = subItem.GoodInfo.GoodName
 				order.Cnt = subItem.Count
 				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-				order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-				order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
+				order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+				order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
 				order.OwnpayAmt = ""
 				order.SelfpayAmt = ""
 				order.Spec = ""