提交代码

controllers/his_api_controller.go

@@ -10730,35 +10730,57 @@ func (c *HisApiController) GetUploadInfo() {
 		for _, item := range prescriptions {
 			if item.Type == 1 { //药品a
 				for _, subItem := range item.HisDoctorAdviceInfo {
-					cus := &Custom{
-						AdviceId:         subItem.ID,
-						ProjectId:        0,
-						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.4f", subItem.Price),
-						MedListCodg:      subItem.MedListCodg,
-						Type:             1,
-						CostType:         9,
+					if subItem.Drug.IsUser != 1 {
+						cus := &Custom{
+							AdviceId:         subItem.ID,
+							ProjectId:        0,
+							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+							Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.4f", subItem.Price),
+							MedListCodg:      subItem.MedListCodg,
+							Type:             1,
+							CostType:         9,
+						}
+						customs = append(customs, cus)
 					}
-					customs = append(customs, cus)
 				}
 			}
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
-					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-					cus := &Custom{
-						AdviceId:         0,
-						ProjectId:        subItem.ID,
-						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
-						Cut:              fmt.Sprintf("%.4f", cnt),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
-						MedListCodg:      subItem.MedListCodg,
-						Type:             2,
-						CostType:         subItem.HisProject.CostClassify,
+					if subItem.Type == 2 {
+						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+						cus := &Custom{
+							AdviceId:         0,
+							ProjectId:        subItem.ID,
+							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+							Cut:              fmt.Sprintf("%.4f", cnt),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+							MedListCodg:      subItem.MedListCodg,
+							Type:             2,
+							CostType:         subItem.HisProject.CostClassify,
+						}
+						customs = append(customs, cus)
+					} else {
+						if subItem.GoodInfo.IsUser != 1 {
+							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+							cus := &Custom{
+								AdviceId:         0,
+								ProjectId:        subItem.ID,
+								DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+								Cut:              fmt.Sprintf("%.4f", cnt),
+								FeedetlSn:        subItem.FeedetlSn,
+								Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+								MedListCodg:      subItem.MedListCodg,
+								Type:             2,
+								CostType:         subItem.HisProject.CostClassify,
+							}
+							customs = append(customs, cus)
+						}
+
 					}
-					customs = append(customs, cus)
+
 				}
 			}
 			for _, item := range item.HisAdditionalCharge {