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

controllers/zh/zh_his_api_controller.go

@@ -1086,7 +1086,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
-	allTotal := fmt.Sprintf("%.2f", order.MedfeeSumamt)
+	allTotal := fmt.Sprintf("%.4f", order.MedfeeSumamt)
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 
 	var rf []*ResultFive
@@ -1406,10 +1406,10 @@ func (c *ZHHisApiController) GetUploadInfo() {
 						//var randNum int
 						//randNum = rand.Intn(10000) + 1000
 						cus := &models.NewCustom{
-							DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-							Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+							Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
 							FeedetlSn:        subItem.FeedetlSn,
-							Price:            fmt.Sprintf("%.2f", subItem.Price),
+							Price:            fmt.Sprintf("%.4f", subItem.Price),
 							MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 							HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
 						}
@@ -1427,10 +1427,10 @@ func (c *ZHHisApiController) GetUploadInfo() {
 						if len(subItem.HisProject.MedicalCode) > 0 {
 							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 							cus := &models.NewCustom{
-								DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cnt),
-								Cut:              fmt.Sprintf("%.2f", cnt),
+								DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+								Cut:              fmt.Sprintf("%.4f", cnt),
 								FeedetlSn:        subItem.FeedetlSn,
-								Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+								Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 								MedListCodg:      subItem.HisProject.MedicalCode,
 								HospApprFlag:     -1,
 							}
@@ -1441,10 +1441,10 @@ func (c *ZHHisApiController) GetUploadInfo() {
 							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 
 							cus := &models.NewCustom{
-								DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cnt),
-								Cut:              fmt.Sprintf("%.2f", cnt),
+								DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+								Cut:              fmt.Sprintf("%.4f", cnt),
 								FeedetlSn:        subItem.FeedetlSn,
-								Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+								Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 								MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
 								HospApprFlag:     -1,
 							}
@@ -1457,10 +1457,10 @@ func (c *ZHHisApiController) GetUploadInfo() {
 			for _, subItem := range item.HisAdditionalCharge {
 				if len(subItem.XtHisAddtionConfig.Code) > 0 {
 					cus := &models.NewCustom{
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*float64(subItem.Count)),
+						Cut:              fmt.Sprintf("%.4f", float64(subItem.Count)),
 						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 						MedListCodg:      subItem.XtHisAddtionConfig.Code,
 						HospApprFlag:     -1,
 					}
@@ -1638,7 +1638,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 						total = total + (subItem.Price * float64(subItem.Count))
 					}
 				}
-				allTotal := fmt.Sprintf("%.2f", total)
+				allTotal := fmt.Sprintf("%.4f", total)
 				totals, _ := strconv.ParseFloat(allTotal, 64)
 
 				order := &models.HisOrder{