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

@@ -10732,35 +10732,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 {
@@ -11284,6 +11306,23 @@ func (this *HisApiController) GetLastOrNextHisPrescription() {
 	}
 }
 
+func RemoveRepeatedPurviewElementByHP(arr []service.VMOtherHisPrescriptionInfo) (newArr []service.VMOtherHisPrescriptionInfo) {
+	newArr = make([]service.VMOtherHisPrescriptionInfo, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].PatientId == arr[j].PatientId && arr[i].RecordDate == arr[j].RecordDate {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}
+
 func (this *HisApiController) GetCallHisPrescription() {
 	patient_id, _ := this.GetInt64("patient_id", 0)
 	timeLayout := "2006-01-02"
@@ -11295,8 +11334,9 @@ func (this *HisApiController) GetCallHisPrescription() {
 
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	adminUserInfo := this.GetAdminUserInfo()
-	prescriptions, err := service.GetCallHisPrescriptions(startime.Unix(), endtime.Unix(), adminUserInfo.CurrentOrgId, patient_id, p_type)
+	new_prescriptions, err := service.GetCallHisPrescriptions(startime.Unix(), endtime.Unix(), adminUserInfo.CurrentOrgId, patient_id, p_type)
 
+	prescriptions := RemoveRepeatedPurviewElementByHP(new_prescriptions)
 	//if
 	//storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 	//