提交代码

controllers/his_api_controller.go

@@ -1076,6 +1076,9 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 					case 9:
 						item.MedChrgitmType = "14"
 						break
+					default:
+						item.MedChrgitmType = "14"
+						break
 					}
 				}
 			} else if item.HisPrescriptionProject.Type == 3 {
@@ -10795,12 +10798,25 @@ func (c *HisApiController) GetHisMonthChargePatientInfo() {
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 
+	month_p_info, _ := service.FindPatientPrescriptionInfoTen(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
+
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 
+	var dia string
+	for _, item := range month_p_info {
+		if len(dia) == 0 {
+			dia = item.Diagnosis
+		} else {
+			dia = dia + "," + item.Diagnosis
+		}
+	}
+
+	dia_arr := removeDuplicates(strings.Split(dia, ","))
+	dia_arr = removeEmptyStrings(dia_arr)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":            his_patient_info,
 		"xt_info":             xt_patient_info,
@@ -10812,10 +10828,37 @@ func (c *HisApiController) GetHisMonthChargePatientInfo() {
 		"doctors":             doctors,
 		"department":          department,
 		"settle_total":        settle_total,
+		"dia_arr":             dia_arr,
 	})
 	return
 }
 
+func removeEmptyStrings(input []string) []string {
+	var output []string
+
+	for _, s := range input {
+		if s != "" {
+			output = append(output, s)
+		}
+	}
+
+	return output
+}
+
+func removeDuplicates(input []string) []string {
+	seen := make(map[string]bool)
+	output := []string{}
+
+	for _, s := range input {
+		if _, exists := seen[s]; !exists {
+			seen[s] = true
+			output = append(output, s)
+		}
+	}
+
+	return output
+}
+
 func (c *HisApiController) GetHisMonthPatientInfo() {
 	patient_id, _ := c.GetInt64("patient_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")