Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/his_api_controller.go

@@ -10922,13 +10922,24 @@ func (c *HisApiController) GetUploadInfo() {
 			fmt.Println(item)
 			if item.Type == 1 { //药品
 				for _, subItem := range item.HisDoctorAdviceInfo {
-					total = total + (subItem.Price * subItem.PrescribingNumber)
+					if subItem.Drug.IsUser != 1 {
+						total = total + (subItem.Price * subItem.PrescribingNumber)
+					}
 				}
+
 			}
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
-					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-					total = total + (subItem.Price * cnt)
+					if subItem.Type == 2 {
+						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+						total = total + (subItem.Price * cnt)
+
+					} else {
+						if subItem.GoodInfo.IsUser != 1 {
+							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+							total = total + (subItem.Price * cnt)
+						}
+					}
 				}
 			}