Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/coordinate/coordinate_controller.go

 		}
 		var presInfos []*models.PresInfo
 		var presDetails []*models.PresDetail
-		for index, item := range prescriptions {
-			var presDetail models.PresDetail
-			var presInfo models.PresInfo
-			presInfo.Cbmid = strconv.FormatInt(item.ID, 10)
-			if item.Type == 1 {
-				presInfo.Cbm06 = "0"
-			} else {
-				presInfo.Cbm06 = "5"
+
+		var doctoradvices []*models.HisDoctorAdviceInfo
+		var groups []int64
+		for _, item := range prescriptions {
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				doctoradvices = append(doctoradvices, subItem)
 			}
+		}
 
-			if item.Type == 1 {
-				presInfo.Cbm07 = item.MedType
-			} else {
-				presInfo.Cbm07 = item.MedType
+		for _, item := range doctoradvices {
+			groups = append(groups, item.Groupno)
+		}
+		groups = RemoveRepeatedGroupElement(groups)
+
+		type DoctorAdvices struct {
+			GroupNo int64
+			item    []*models.HisDoctorAdviceInfo
+		}
+		var doctoradvice []*DoctorAdvices
+
+		for _, group := range groups {
+			var da DoctorAdvices
+			da.GroupNo = group
+			for _, item := range doctoradvices {
+				if group == item.Groupno {
+					da.item = append(da.item, item)
+				}
 			}
+			doctoradvice = append(doctoradvice, &da)
+		}
 
-			presDetail.Vaf59 = strconv.FormatInt(int64(index+1), 10)
+		for _, item := range doctoradvice {
+			var presDetail models.PresDetail
+			var presInfo models.PresInfo
+			presInfo.Cbmid = strconv.FormatInt(item.GroupNo, 10)
+
+			presInfo.Cbm06 = "0"
+			presInfo.Cbm07 = ""
+			presDetail.Vaf59 = strconv.FormatInt(item.GroupNo, 10)
 			var infoItems []*models.Item
-			for index, subItem := range item.HisDoctorAdviceInfo {
+			for index, subItem := range item.item {
 				ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
 
 				var infoItem models.Item
-				infoItem.Rownr = strconv.FormatInt(int64(index+1), 10)
+				infoItem.Rownr = strconv.FormatInt(int64(index), 10)
 				infoItem.Vaf11 = "2"
-				infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+				infoItem.Vaf36 = time.Unix(subItem.CreatedTime, 0).Format("2006-01-02 15:04:05")
 				infoItem.Bbx01 = subItem.BaseDrugLib.MedicalInsuranceNumber
 				infoItem.Bda01 = "1"
 				infoItem.Bby01 = ""
 				infoItem.Vaf61 = "1"
 				infoItems = append(infoItems, &infoItem)
 			}
+
+			presDetail.Item = infoItems
+			presDetails = append(presDetails, &presDetail)
+			presInfo.PresDetail = presDetails
+			presInfos = append(presInfos, &presInfo)
+
+		}
+
+		for index, item := range prescriptions {
+			var presDetail models.PresDetail
+			var presInfo models.PresInfo
+			presInfo.Cbmid = strconv.FormatInt(item.ID, 10)
+			if item.Type == 1 {
+				presInfo.Cbm06 = "0"
+			} else {
+				presInfo.Cbm06 = "5"
+			}
+
+			if item.Type == 1 {
+				presInfo.Cbm07 = item.MedType
+			} else {
+				presInfo.Cbm07 = item.MedType
+			}
+
+			presDetail.Vaf59 = strconv.FormatInt(int64(index+1), 10)
+			var infoItems []*models.Item
+			//for index, subItem := range item.HisDoctorAdviceInfo {
+			//	ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
+			//
+			//	var infoItem models.Item
+			//	infoItem.Rownr = strconv.FormatInt(int64(index+1), 10)
+			//	infoItem.Vaf11 = "2"
+			//	infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+			//	infoItem.Bbx01 = subItem.BaseDrugLib.MedicalInsuranceNumber
+			//	infoItem.Bda01 = "1"
+			//	infoItem.Bby01 = ""
+			//	if subItem.BaseDrugLib.MinUnit != subItem.BaseDrugLib.DoseUnit {
+			//		infoItem.Vaf22 = subItem.BaseDrugLib.DrugName + " " + subItem.BaseDrugLib.Dose + subItem.BaseDrugLib.DoseUnit + "*" + strconv.FormatInt(subItem.BaseDrugLib.MinNumber, 10) + subItem.BaseDrugLib.MinUnit + "/" + subItem.BaseDrugLib.MaxUnit
+			//	}
+			//	infoItem.Vaf14 = subItem.BaseDrugLib.DrugName
+			//	infoItem.Bdi01 = ef.Code
+			//	infoItem.Vaf17 = strconv.FormatInt(subItem.Day, 10)
+			//	infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
+			//	infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
+			//	infoItem.Vaf35 = "0"
+			//	infoItem.Vaf32 = "0"
+			//	infoItem.Bck01b = departmwnt.Number
+			//	infoItem.Bck01d = departmwnt.Number
+			//	infoItem.Vaf58 = "0"
+			//	infoItem.Vaf61 = "1"
+			//	infoItems = append(infoItems, &infoItem)
+			//}
 			for _, subItem := range item.HisPrescriptionProject {
 				//ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
 
 						var infoItem models.Item
 						infoItem.Rownr = "0"
 						infoItem.Vaf11 = "2"
-						infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+						infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
 						infoItem.Bbx01 = subItem.HisProject.MedicalCode
 						infoItem.Bda01 = "Z"
 						infoItem.Bby01 = ""
 						var infoItem models.Item
 						infoItem.Rownr = "0"
 						infoItem.Vaf11 = "1"
-						infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+						infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
 						infoItem.Bbx01 = subItem.HisProject.MedicalCode
 
 						if subItem.HisProject.CostClassify == 2 {
 			presInfo.PresDetail = presDetails
 			presInfos = append(presInfos, &presInfo)
 		}
+
 		info.PresInfo = presInfos
 		var result2 string
 		var request2 string
 	}
 
 }
+
+func RemoveRepeatedGroupElement(arr []int64) (newArr []int64) {
+	newArr = make([]int64, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i] == arr[j] {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}