1111

controllers/his_api_controller.go

@@ -685,7 +685,7 @@ func (c *HisApiController) GetUploadInfo() {
 	medical_insurance_price, _ := c.GetFloat("medical_insurance_price")
 	private_price, _ := c.GetFloat("private_price")
 
-	//settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
+	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -698,106 +698,104 @@ func (c *HisApiController) GetUploadInfo() {
 	adminUser := c.GetAdminUserInfo()
 
 	var prescriptions []*models.HisPrescription
-	prescriptions, _ = service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
 
-	//if settle_accounts_type == 1 { //日结
-	//
-	//} else
-	//{ //月结
-	//	start_time := c.GetString("start_time")
-	//	end_time := c.GetString("end_time")
-	//	timeLayout := "2006-01-02"
-	//	loc, _ := time.LoadLocation("Local")
-	//	theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	//	if err != nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	recordStartTime := theStartTime.Unix()
-	//	theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
-	//	if err != nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	recordEndTime := theEndTime.Unix()
-	//	monthPrescriptions, _ := service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
-	//	var advices []*models.HisDoctorAdviceInfo
-	//	var projects []*models.HisPrescriptionProject
-	//	var additions []*models.HisAdditionalCharge
-	//	var customs []*models.Custom
-	//	for _, item := range monthPrescriptions {
-	//		advices = append(advices, item.HisDoctorAdviceInfo...)
-	//		projects = append(projects, item.HisPrescriptionProject...)
-	//		additions = append(additions, item.HisAdditionalCharge...)
-	//	}
-	//
-	//	var adviceCodes []string
-	//	var projectCodes []string
-	//	var additionCodes []string
-	//
-	//
-	//
-	//
-	//	for _, item := range advices {
-	//		adviceCodes = append(adviceCodes, item.MedListCodg)
-	//	}
-	//	for _, item := range projects {
-	//		projectCodes = append(projectCodes, item.MedListCodg)
-	//	}
-	//	for _, item := range additions {
-	//		additionCodes = append(additionCodes, item.XtHisAddtionConfig.Code)
-	//	}
-	//	adviceCodes = RemoveRepeatedCode(adviceCodes)
-	//	projectCodes = RemoveRepeatedCode(projectCodes)
-	//	additionCodes = RemoveRepeatedCode(additionCodes)
-	//
-	//	for  _, item := range adviceCodes{
-	//		var custom models.Custom
-	//		for _,subItem := range advices{
-	//			if item == subItem.MedListCodg{
-	//				custom.Price =fmt.Sprintf("%.2f", subItem.Price)
-	//				custom.MedListCodg = subItem.MedListCodg
-	//				custom.Cut = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
-	//				custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber)
-	//				custom.FeedetlSn = subItem.FeedetlSn
-	//				customs = append(customs,&custom)
-	//			}
-	//		}
-	//	}
-	//
-	//
-	//	for  _, item := range additionCodes{
-	//		var custom models.Custom
-	//		for _,subItem := range additions{
-	//			if item == subItem.XtHisAddtionConfig.Code{
-	//				custom.Price =fmt.Sprintf("%.2f", subItem.Price)
-	//				custom.MedListCodg = subItem.XtHisAddtionConfig.Code
-	//				custom.Cut = fmt.Sprintf("%.2f", subItem.Count)
-	//				custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count))
-	//				custom.FeedetlSn = subItem.FeedetlSn
-	//				customs = append(customs,&custom)
-	//			}
-	//		}
-	//	}
-	//
-	//	for  _, item := range projectCodes{
-	//		var custom models.Custom
-	//		for _,subItem := range projects{
-	//			if item == subItem.MedListCodg{
-	//				custom.Price =fmt.Sprintf("%.2f", subItem.Price)
-	//				custom.MedListCodg = subItem.MedListCodg
-	//				custom.Cut = fmt.Sprintf("%.2f", subItem.Count)
-	//				custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count))
-	//				custom.FeedetlSn = subItem.FeedetlSn
-	//				customs = append(customs,&custom)
-	//			}
-	//		}
-	//	}
-	//
-	//}
+	data := make(map[string]interface{})
+	if settle_accounts_type == 1 { //日结
+		prescriptions, _ = service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
+		data["pre"] = prescriptions
+
+	} else { //月结
+		start_time := c.GetString("start_time")
+		end_time := c.GetString("end_time")
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordStartTime := theStartTime.Unix()
+		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordEndTime := theEndTime.Unix()
+		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
+		data["pre"] = prescriptions
+
+		//var advices []*models.HisDoctorAdviceInfo
+		//var projects []*models.HisPrescriptionProject
+		//var additions []*models.HisAdditionalCharge
+		//var customs []*models.Custom
+		//for _, item := range monthPrescriptions {
+		//	advices = append(advices, item.HisDoctorAdviceInfo...)
+		//	projects = append(projects, item.HisPrescriptionProject...)
+		//	additions = append(additions, item.HisAdditionalCharge...)
+		//}
+		//
+		//var adviceCodes []string
+		//var projectCodes []string
+		//var additionCodes []string
+		//
+		//
+		//
+		//
+		//for _, item := range advices {
+		//	adviceCodes = append(adviceCodes, item.MedListCodg)
+		//}
+		//for _, item := range projects {
+		//	projectCodes = append(projectCodes, item.MedListCodg)
+		//}
+		//for _, item := range additions {
+		//	additionCodes = append(additionCodes, item.XtHisAddtionConfig.Code)
+		//}
+		//adviceCodes = RemoveRepeatedCode(adviceCodes)
+		//projectCodes = RemoveRepeatedCode(projectCodes)
+		//additionCodes = RemoveRepeatedCode(additionCodes)
+		//
+		//for  _, item := range adviceCodes{
+		//	var custom models.Custom
+		//	for _,subItem := range advices{
+		//		if item == subItem.MedListCodg{
+		//			custom.Price =fmt.Sprintf("%.2f", subItem.Price)
+		//			custom.MedListCodg = subItem.MedListCodg
+		//			custom.Cut = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
+		//			custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber)
+		//			custom.FeedetlSn = subItem.FeedetlSn
+		//			customs = append(customs,&custom)
+		//		}
+		//	}
+		//}
+		//for  _, item := range additionCodes{
+		//	var custom models.Custom
+		//	for _,subItem := range additions{
+		//		if item == subItem.XtHisAddtionConfig.Code{
+		//			custom.Price =fmt.Sprintf("%.2f", subItem.Price)
+		//			custom.MedListCodg = subItem.XtHisAddtionConfig.Code
+		//			custom.Cut = fmt.Sprintf("%.2f", subItem.Count)
+		//			custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count))
+		//			custom.FeedetlSn = subItem.FeedetlSn
+		//			customs = append(customs,&custom)
+		//		}
+		//	}
+		//}
+		//for  _, item := range projectCodes{
+		//	var custom models.Custom
+		//	for _,subItem := range projects{
+		//		if item == subItem.MedListCodg{
+		//			custom.Price =fmt.Sprintf("%.2f", subItem.Price)
+		//			custom.MedListCodg = subItem.MedListCodg
+		//			custom.Cut = fmt.Sprintf("%.2f", subItem.Count)
+		//			custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count))
+		//			custom.FeedetlSn = subItem.FeedetlSn
+		//			customs = append(customs,&custom)
+		//		}
+		//	}
+		//}
 
+	}
 	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
-
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -808,10 +806,8 @@ func (c *HisApiController) GetUploadInfo() {
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 	strconv.FormatInt(his.PatientId, 10)
 	client := &http.Client{}
-	data := make(map[string]interface{})
 	data["psn_no"] = his.PsnNo
 	data["mdtrt_id"] = his.Number
-	data["pre"] = prescriptions
 	data["chrg_bchno"] = chrg_bchno
 	data["org_name"] = miConfig.OrgName
 	data["doctor"] = patientPrescription.Doctor