Explorar el Código

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

csx hace 2 años
padre
commit
80a47137ca
Se han modificado 1 ficheros con 123 adiciones y 22 borrados
  1. 123 22
      controllers/sg/his_api_controller.go

+ 123 - 22
controllers/sg/his_api_controller.go Ver fichero

@@ -207,12 +207,12 @@ func (c *HisApiController) Check3101() {
207 207
 				order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
208 208
 				order.HosplistName = subItem.BaseDrugLib.DrugName
209 209
 				order.HilistLv = "1"
210
-				order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
210
+				order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
211 211
 				order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
212 212
 				order.HosplistName = subItem.BaseDrugLib.DrugName
213
-				order.Cnt = strconv.FormatFloat(subItem.PrescribingNumber, 'E', -1, 64)
214
-				order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
215
-				order.Sumamt = strconv.FormatFloat((subItem.Price * subItem.PrescribingNumber), 'E', -1, 64)
213
+				order.Cnt = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
214
+				order.Pric = fmt.Sprintf("%.2f", subItem.Price)
215
+				order.Sumamt = fmt.Sprintf("%.2f", (subItem.PrescribingNumber * subItem.Price))
216 216
 				order.OwnpayAmt = ""
217 217
 				order.SelfpayAmt = ""
218 218
 				order.Spec = ""
@@ -239,14 +239,13 @@ func (c *HisApiController) Check3101() {
239 239
 					order.HilistCode = subItem.HisProject.MedicalCode
240 240
 					order.HosplistName = subItem.HisProject.ProjectName
241 241
 					order.HilistLv = "1"
242
-					order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
242
+					order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
243 243
 					order.HosplistCode = subItem.HisProject.MedicalCode
244 244
 					order.HosplistName = subItem.HisProject.ProjectName
245 245
 					order.Cnt = subItem.Count
246 246
 					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
247
-
248
-					order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
249
-					order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
247
+					order.Pric = fmt.Sprintf("%.2f", subItem.Price)
248
+					order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
250 249
 					order.OwnpayAmt = ""
251 250
 					order.SelfpayAmt = ""
252 251
 					order.Spec = ""
@@ -274,13 +273,13 @@ func (c *HisApiController) Check3101() {
274 273
 					order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
275 274
 					order.HosplistName = subItem.GoodInfo.GoodName
276 275
 					order.HilistLv = "1"
277
-					order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
276
+					order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
278 277
 					order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
279 278
 					order.HosplistName = subItem.GoodInfo.GoodName
280 279
 					order.Cnt = subItem.Count
281 280
 					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
282
-					order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
283
-					order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
281
+					order.Pric = fmt.Sprintf("%.2f", subItem.Price)
282
+					order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
284 283
 					order.OwnpayAmt = ""
285 284
 					order.SelfpayAmt = ""
286 285
 					order.Spec = ""
@@ -464,6 +463,109 @@ func (c *HisApiController) Check3102() {
464 463
 	fed.MedType = order.MedType
465 464
 	//处方医嘱信息
466 465
 	var orders []*models.FsiOrderDtos
466
+	//for _, item := range prescriptions {
467
+	//	for _, subItem := range item.HisDoctorAdviceInfo {
468
+	//		var order models.FsiOrderDtos
469
+	//		order.RxID = strconv.FormatInt(item.ID, 10)
470
+	//		order.Rxno = strconv.FormatInt(item.ID, 10)
471
+	//		order.LongDrordFlag = "0"
472
+	//		order.HilistType = "1"
473
+	//		order.ChrgType = "1"
474
+	//		order.DrordBhvr = "-"
475
+	//		order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
476
+	//		order.HosplistName = subItem.BaseDrugLib.DrugName
477
+	//		order.HilistLv = "1"
478
+	//		order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
479
+	//		order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
480
+	//		order.HosplistName = subItem.BaseDrugLib.DrugName
481
+	//		order.Cnt = strconv.FormatFloat(subItem.PrescribingNumber, 'E', -1, 64)
482
+	//		order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
483
+	//		order.Sumamt = strconv.FormatFloat((subItem.Price * subItem.PrescribingNumber), 'E', -1, 64)
484
+	//		order.OwnpayAmt = ""
485
+	//		order.SelfpayAmt = ""
486
+	//		order.Spec = ""
487
+	//		order.SpecUnt = ""
488
+	//		order.DrordBegnDate = s_tm
489
+	//		order.DrordStopDate = ""
490
+	//		order.DrordDrCodg = "1"
491
+	//		order.DrordDeptName = department.Name
492
+	//		order.DrordDrCodg = "1"
493
+	//		order.DrordDrName = doctor_info.UserName
494
+	//		order.DrordDrProfttl = ""
495
+	//		order.CurrDrordFlag = "1"
496
+	//		orders = append(orders, &order)
497
+	//	}
498
+	//	for _, subItem := range item.HisPrescriptionProject {
499
+	//		if subItem.Type == 2 {
500
+	//			var order models.FsiOrderDtos
501
+	//			order.RxID = strconv.FormatInt(item.ID, 10)
502
+	//			order.Rxno = strconv.FormatInt(item.ID, 10)
503
+	//			order.LongDrordFlag = "0"
504
+	//			order.HilistType = "1"
505
+	//			order.ChrgType = "1"
506
+	//			order.DrordBhvr = "-"
507
+	//			order.HilistCode = subItem.HisProject.MedicalCode
508
+	//			order.HosplistName = subItem.HisProject.ProjectName
509
+	//			order.HilistLv = "1"
510
+	//			order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
511
+	//			order.HosplistCode = subItem.HisProject.MedicalCode
512
+	//			order.HosplistName = subItem.HisProject.ProjectName
513
+	//			order.Cnt = subItem.Count
514
+	//			cnt, _ := strconv.ParseFloat(subItem.Count, 64)
515
+	//
516
+	//			order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
517
+	//			order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
518
+	//			order.OwnpayAmt = ""
519
+	//			order.SelfpayAmt = ""
520
+	//			order.Spec = ""
521
+	//			order.SpecUnt = ""
522
+	//			order.DrordBegnDate = s_tm
523
+	//			order.DrordStopDate = ""
524
+	//			order.DrordDrCodg = "1"
525
+	//			order.DrordDeptName = department.Name
526
+	//			order.DrordDrCodg = "1"
527
+	//			order.DrordDrName = doctor_info.UserName
528
+	//			order.DrordDrProfttl = ""
529
+	//			order.CurrDrordFlag = "1"
530
+	//			orders = append(orders, &order)
531
+	//
532
+	//		}
533
+	//		if subItem.Type == 3 {
534
+	//
535
+	//			var order models.FsiOrderDtos
536
+	//			order.RxID = strconv.FormatInt(item.ID, 10)
537
+	//			order.Rxno = strconv.FormatInt(item.ID, 10)
538
+	//			order.LongDrordFlag = "0"
539
+	//			order.HilistType = "1"
540
+	//			order.ChrgType = "1"
541
+	//			order.DrordBhvr = "-"
542
+	//			order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
543
+	//			order.HosplistName = subItem.GoodInfo.GoodName
544
+	//			order.HilistLv = "1"
545
+	//			order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
546
+	//			order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
547
+	//			order.HosplistName = subItem.GoodInfo.GoodName
548
+	//			order.Cnt = subItem.Count
549
+	//			cnt, _ := strconv.ParseFloat(subItem.Count, 64)
550
+	//			order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
551
+	//			order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
552
+	//			order.OwnpayAmt = ""
553
+	//			order.SelfpayAmt = ""
554
+	//			order.Spec = ""
555
+	//			order.SpecUnt = ""
556
+	//			order.DrordBegnDate = s_tm
557
+	//			order.DrordStopDate = ""
558
+	//			order.DrordDrCodg = "1"
559
+	//			order.DrordDeptName = department.Name
560
+	//			order.DrordDrCodg = "1"
561
+	//			order.DrordDrName = doctor_info.UserName
562
+	//			order.DrordDrProfttl = ""
563
+	//			order.CurrDrordFlag = "1"
564
+	//			orders = append(orders, &order)
565
+	//
566
+	//		}
567
+	//	}
568
+	//}
467 569
 	for _, item := range prescriptions {
468 570
 		for _, subItem := range item.HisDoctorAdviceInfo {
469 571
 			var order models.FsiOrderDtos
@@ -476,12 +578,12 @@ func (c *HisApiController) Check3102() {
476 578
 			order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
477 579
 			order.HosplistName = subItem.BaseDrugLib.DrugName
478 580
 			order.HilistLv = "1"
479
-			order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
581
+			order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
480 582
 			order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
481 583
 			order.HosplistName = subItem.BaseDrugLib.DrugName
482
-			order.Cnt = strconv.FormatFloat(subItem.PrescribingNumber, 'E', -1, 64)
483
-			order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
484
-			order.Sumamt = strconv.FormatFloat((subItem.Price * subItem.PrescribingNumber), 'E', -1, 64)
584
+			order.Cnt = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
585
+			order.Pric = fmt.Sprintf("%.2f", subItem.Price)
586
+			order.Sumamt = fmt.Sprintf("%.2f", (subItem.PrescribingNumber * subItem.Price))
485 587
 			order.OwnpayAmt = ""
486 588
 			order.SelfpayAmt = ""
487 589
 			order.Spec = ""
@@ -508,14 +610,13 @@ func (c *HisApiController) Check3102() {
508 610
 				order.HilistCode = subItem.HisProject.MedicalCode
509 611
 				order.HosplistName = subItem.HisProject.ProjectName
510 612
 				order.HilistLv = "1"
511
-				order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
613
+				order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
512 614
 				order.HosplistCode = subItem.HisProject.MedicalCode
513 615
 				order.HosplistName = subItem.HisProject.ProjectName
514 616
 				order.Cnt = subItem.Count
515 617
 				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
516
-
517
-				order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
518
-				order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
618
+				order.Pric = fmt.Sprintf("%.2f", subItem.Price)
619
+				order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
519 620
 				order.OwnpayAmt = ""
520 621
 				order.SelfpayAmt = ""
521 622
 				order.Spec = ""
@@ -543,13 +644,13 @@ func (c *HisApiController) Check3102() {
543 644
 				order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
544 645
 				order.HosplistName = subItem.GoodInfo.GoodName
545 646
 				order.HilistLv = "1"
546
-				order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
647
+				order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
547 648
 				order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
548 649
 				order.HosplistName = subItem.GoodInfo.GoodName
549 650
 				order.Cnt = subItem.Count
550 651
 				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
551
-				order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
552
-				order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
652
+				order.Pric = fmt.Sprintf("%.2f", subItem.Price)
653
+				order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
553 654
 				order.OwnpayAmt = ""
554 655
 				order.SelfpayAmt = ""
555 656
 				order.Spec = ""