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

controllers/sz/sz_his_api_controller.go

@@ -279,25 +279,25 @@ func SZHisManagerApiRegistRouters() {
 	beego.Router("/sz/api/settle/query", &SZHisApiController{}, "get:GetSettleAccounts")
 	//撤销明细
 	beego.Router("/sz/api/detail/cancel", &SZHisApiController{}, "get:CancelOrderDetail")
-
-	//机构药品目录备案
-	beego.Router("/sz/api/drug/get", &SZHisApiController{}, "get:GetDrugList")
-	//协议机构诊疗项目
-	beego.Router("/sz/api/treatment/get", &SZHisApiController{}, "get:GetTreatmentProject")
-	//协议机构目录备案撤销
-	beego.Router("/sz/api/revocation/get", &SZHisApiController{}, "get:GetRevocation")
-
-	//定点机构约定信息查询
-	//beego.Router("/sz/api/information/query/get",&SZHisApiController{},"get:GetInformationQuery")
-	//-医药师信息登记
-	beego.Router("/sz/api/doctor/get", &SZHisApiController{}, "get:GetDoctorList")
-	//医药师执业状态变更
-	beego.Router("/sz/api/medical/get", &SZHisApiController{}, "get:GetMedicalList")
-	//医药师信息更新
-	beego.Router("/sz/api/update/medical/get", &SZHisApiController{}, "get:GetUpdateMedicalList")
-	//协议机构材料目录备案
-
-	beego.Router("/sz/api/goods/get", &SZHisApiController{}, "get:GetGoodsList")
+	//
+	////机构药品目录备案
+	//beego.Router("/sz/api/drug/get", &SZHisApiController{}, "get:GetDrugList")
+	////协议机构诊疗项目
+	//beego.Router("/sz/api/treatment/get", &SZHisApiController{}, "get:GetTreatmentProject")
+	////协议机构目录备案撤销
+	//beego.Router("/sz/api/revocation/get", &SZHisApiController{}, "get:GetRevocation")
+	//
+	////定点机构约定信息查询
+	////beego.Router("/sz/api/information/query/get",&SZHisApiController{},"get:GetInformationQuery")
+	////-医药师信息登记
+	//beego.Router("/sz/api/doctor/get", &SZHisApiController{}, "get:GetDoctorList")
+	////医药师执业状态变更
+	//beego.Router("/sz/api/medical/get", &SZHisApiController{}, "get:GetMedicalList")
+	////医药师信息更新
+	//beego.Router("/sz/api/update/medical/get", &SZHisApiController{}, "get:GetUpdateMedicalList")
+	////协议机构材料目录备案
+	//
+	//beego.Router("/sz/api/goods/get", &SZHisApiController{}, "get:GetGoodsList")
 }
 
 func IntPtr(n int) uintptr {
@@ -1807,182 +1807,182 @@ func ReadBasCardGetNumber(request string) (string, string, string, string, error
 //	return ""
 //}
 
-func (c *SZHisApiController) GetDrugList() {
-
-	adminUserInfo := c.GetAdminUserInfo()
-	orgId := adminUserInfo.CurrentOrgId
-	fmt.Println(orgId)
-	//获取药品库数据
-	list, _ := service.GetDrugList(orgId)
-	//获取药品剂型
-	drugs, _ := service.GetDrugDosageForm(orgId)
-	for _, item := range list {
-		fmt.Println(item.DrugDosageForm)
-		for _, it := range drugs {
-
-			if item.DrugDosageForm == it.Value {
-				item.DrugDosageName = it.Name
-			}
-		}
-	}
-	fmt.Print("长度", len(list))
-	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
-	var doctor_name string
-	var doctor_code string
-
-	doctor_name = "黄亦轩"
-	doctor_code = "1001"
-
-	var pagesize int = 50
-	var start int = 1
-	var stop int
-	var pagecount int
-	var curpage int
-	var isSuccess bool = true
-	//总页数,向上取整,注意除之前要先转换类型为float64
-	pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
-	fmt.Println("pageCount22222", pagecount)
-	var ress []*Result
-	for curpage = 1; curpage <= pagecount; curpage++ {
-		if curpage == 1 {
-			start = 1
-		} else {
-			start = (curpage-1)*pagesize + 1
-		}
-		stop = curpage * pagesize
-		if stop > len(list) {
-			stop = len(list)
-		}
-		//这里就可以查看开始和结束了
-		var customs []*models.DrugDetail
-		for _, item := range list {
-
-			detail := &models.DrugDetail{
-
-				MedicalInsuranceNumber: item.MedicalInsuranceNumber,
-				Code:             item.Code,
-				DrugName:         item.DrugName,
-				DrugSpec:         item.DrugSpec,
-				DrugDosageName:   item.DrugDosageName,
-				ManufacturerName: item.ManufacturerName,
-				MinUnit:          item.MinUnit,
-				RetailPrice:      item.RetailPrice,
-				LastPrice:        item.LastPrice,
-				LimitRemark:      item.LimitRemark,
-			}
-			customs = append(customs, detail)
-		}
-
-		result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop])
-		fmt.Println("reuslt9999999999999", result)
-
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			//fmt.Println(dat)
-		} else {
-			//fmt.Println(err)
-		}
-
-		userJSONBytes, _ := json.Marshal(dat)
-
-		var res Result
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Transreturncode == "00000000" {
-			ress = append(ress, &res)
-		} else {
-			isSuccess = false
-			//失败
-
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
-			return
-		}
-		fmt.Println(isSuccess)
-	}
-}
-
-func (c *SZHisApiController) GetTreatmentProject() {
-	fmt.Println("触发了吗2222222222")
-	adminUserInfo := c.GetAdminUserInfo()
-	orgId := adminUserInfo.CurrentOrgId
-
-	//获取药品库数据
-	list, _ := service.GetMyPorjecgList(orgId)
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
-	var doctor_name string
-	var doctor_code string
-
-	doctor_name = "黄亦轩"
-	doctor_code = "1001"
-
-	var pagesize int = 50
-	var start int = 1
-	var stop int
-	var pagecount int
-	var curpage int
-	var isSuccess bool = true
-	//总页数,向上取整,注意除之前要先转换类型为float64
-	pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
-
-	var ress []*Result
-	for curpage = 1; curpage <= pagecount; curpage++ {
-		if curpage == 1 {
-			start = 1
-		} else {
-			start = (curpage-1)*pagesize + 1
-		}
-		stop = curpage * pagesize
-		if stop > len(list) {
-			stop = len(list)
-		}
-		//这里就可以查看开始和结束了
-		fmt.Println(list[start-1 : stop])
-		var customs []*models.ProjectDetail
-		for _, item := range list {
-
-			detail := &models.ProjectDetail{
-
-				SocialSecurityDirectoryCode: item.MedicalCode, //社保目录
-				ProjectName:                 item.ProjectName,
-				Price:                       item.Price,
-				Category:                    strconv.FormatInt(item.Category, 10),
-				Remark:                      item.Remark,
-			}
-			customs = append(customs, detail)
-		}
-		result := service.SzybML009(doctor_name, doctor_code, miConfig.Code, customs)
-		fmt.Println("reuslt9999999999999999", result)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-
-		userJSONBytes, _ := json.Marshal(dat)
-
-		var res Result
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Transreturncode == "00000000" {
-			ress = append(ress, &res)
-		} else {
-			isSuccess = false
-			//失败
+//func (c *SZHisApiController) GetDrugList() {
+//
+//	adminUserInfo := c.GetAdminUserInfo()
+//	orgId := adminUserInfo.CurrentOrgId
+//	fmt.Println(orgId)
+//	//获取药品库数据
+//	list, _ := service.GetDrugList(orgId)
+//	//获取药品剂型
+//	drugs, _ := service.GetDrugDosageForm(orgId)
+//	for _, item := range list {
+//		fmt.Println(item.DrugDosageForm)
+//		for _, it := range drugs {
+//
+//			if item.DrugDosageForm == it.Value {
+//				item.DrugDosageName = it.Name
+//			}
+//		}
+//	}
+//	fmt.Print("长度", len(list))
+//	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+//	var doctor_name string
+//	var doctor_code string
+//
+//	doctor_name = "黄亦轩"
+//	doctor_code = "1001"
+//
+//	var pagesize int = 50
+//	var start int = 1
+//	var stop int
+//	var pagecount int
+//	var curpage int
+//	var isSuccess bool = true
+//	//总页数,向上取整,注意除之前要先转换类型为float64
+//	pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
+//	fmt.Println("pageCount22222", pagecount)
+//	var ress []*Result
+//	for curpage = 1; curpage <= pagecount; curpage++ {
+//		if curpage == 1 {
+//			start = 1
+//		} else {
+//			start = (curpage-1)*pagesize + 1
+//		}
+//		stop = curpage * pagesize
+//		if stop > len(list) {
+//			stop = len(list)
+//		}
+//		//这里就可以查看开始和结束了
+//		var customs []*models.DrugDetail
+//		for _, item := range list {
+//
+//			detail := &models.DrugDetail{
+//
+//				MedicalInsuranceNumber: item.MedicalInsuranceNumber,
+//				Code:             item.Code,
+//				DrugName:         item.DrugName,
+//				DrugSpec:         item.DrugSpec,
+//				DrugDosageName:   item.DrugDosageName,
+//				ManufacturerName: item.ManufacturerName,
+//				MinUnit:          item.MinUnit,
+//				RetailPrice:      item.RetailPrice,
+//				LastPrice:        item.LastPrice,
+//				LimitRemark:      item.LimitRemark,
+//			}
+//			customs = append(customs, detail)
+//		}
+//
+//		result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop])
+//		fmt.Println("reuslt9999999999999", result)
+//
+//		var dat map[string]interface{}
+//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//			//fmt.Println(dat)
+//		} else {
+//			//fmt.Println(err)
+//		}
+//
+//		userJSONBytes, _ := json.Marshal(dat)
+//
+//		var res Result
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//		if res.Transreturncode == "00000000" {
+//			ress = append(ress, &res)
+//		} else {
+//			isSuccess = false
+//			//失败
+//
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+//			return
+//		}
+//		fmt.Println(isSuccess)
+//	}
+//}
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
-			return
-		}
-		fmt.Println(isSuccess)
-	}
-}
+//func (c *SZHisApiController) GetTreatmentProject() {
+//	fmt.Println("触发了吗2222222222")
+//	adminUserInfo := c.GetAdminUserInfo()
+//	orgId := adminUserInfo.CurrentOrgId
+//
+//	//获取药品库数据
+//	list, _ := service.GetMyPorjecgList(orgId)
+//
+//	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+//	var doctor_name string
+//	var doctor_code string
+//
+//	doctor_name = "黄亦轩"
+//	doctor_code = "1001"
+//
+//	var pagesize int = 50
+//	var start int = 1
+//	var stop int
+//	var pagecount int
+//	var curpage int
+//	var isSuccess bool = true
+//	//总页数,向上取整,注意除之前要先转换类型为float64
+//	pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
+//
+//	var ress []*Result
+//	for curpage = 1; curpage <= pagecount; curpage++ {
+//		if curpage == 1 {
+//			start = 1
+//		} else {
+//			start = (curpage-1)*pagesize + 1
+//		}
+//		stop = curpage * pagesize
+//		if stop > len(list) {
+//			stop = len(list)
+//		}
+//		//这里就可以查看开始和结束了
+//		fmt.Println(list[start-1 : stop])
+//		var customs []*models.ProjectDetail
+//		for _, item := range list {
+//
+//			detail := &models.ProjectDetail{
+//
+//				SocialSecurityDirectoryCode: item.MedicalCode, //社保目录
+//				ProjectName:                 item.ProjectName,
+//				Price:                       item.Price,
+//				Category:                    strconv.FormatInt(item.Category, 10),
+//				Remark:                      item.Remark,
+//			}
+//			customs = append(customs, detail)
+//		}
+//		result := service.SzybML009(doctor_name, doctor_code, miConfig.Code, customs)
+//		fmt.Println("reuslt9999999999999999", result)
+//		var dat map[string]interface{}
+//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//			fmt.Println(dat)
+//		} else {
+//			fmt.Println(err)
+//		}
+//
+//		userJSONBytes, _ := json.Marshal(dat)
+//
+//		var res Result
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//		if res.Transreturncode == "00000000" {
+//			ress = append(ress, &res)
+//		} else {
+//			isSuccess = false
+//			//失败
+//
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+//			return
+//		}
+//		fmt.Println(isSuccess)
+//	}
+//}
 
 func (c *SZHisApiController) GetRevocation() {
 
@@ -2630,90 +2630,90 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 	}
 }
 
-func (c *SZHisApiController) GetGoodsList() {
-
-	adminUserInfo := c.GetAdminUserInfo()
-	orgId := adminUserInfo.CurrentOrgId
-	fmt.Println(orgId)
-	//获取所有耗材信息
-	list, _ := service.GetGoodInformationList(orgId)
-	fmt.Println("list22222", list)
-	//获取单位
-	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
-	var doctor_name string
-	var doctor_code string
-
-	doctor_name = "黄亦轩"
-	doctor_code = "1001"
-
-	var pagesize int = 50
-	var start int = 1
-	var stop int
-	var pagecount int
-	var curpage int
-	var isSuccess bool = true
-	//总页数,向上取整,注意除之前要先转换类型为float64
-	pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
-
-	var ress []*Result
-	for curpage = 1; curpage <= pagecount; curpage++ {
-		if curpage == 1 {
-			start = 1
-		} else {
-			start = (curpage-1)*pagesize + 1
-		}
-		stop = curpage * pagesize
-		if stop > len(list) {
-			stop = len(list)
-		}
-		//这里就可以查看开始和结束了
-		fmt.Println(list[start-1 : stop])
-		var customs []*models.GoodDetail
-		for _, item := range list {
-
-			detail := &models.GoodDetail{
-				GoodName:                    item.GoodName,
-				SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
-				ManufacturerName:            item.ManufacturerName,
-				ProductionType:              item.ProductionType,
-				SpecialMedical:              item.SpecialMedical,
-				BuyPrice:                    item.BuyPrice,
-				SellPrice:                   item.SellPrice,
-				Remark:                      item.Remark,
-			}
-			customs = append(customs, detail)
-		}
-
-		result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop])
-		fmt.Println("reuslt8888", result)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-
-		userJSONBytes, _ := json.Marshal(dat)
-
-		var res Result
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Transreturncode == "00000000" {
-			ress = append(ress, &res)
-		} else {
-			isSuccess = false
-			//失败
-
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
-			return
-		}
-		fmt.Println(isSuccess)
-
-	}
-}
+//func (c *SZHisApiController) GetGoodsList() {
+//
+//	adminUserInfo := c.GetAdminUserInfo()
+//	orgId := adminUserInfo.CurrentOrgId
+//	fmt.Println(orgId)
+//	//获取所有耗材信息
+//	list, _ := service.GetGoodInformationList(orgId)
+//	fmt.Println("list22222", list)
+//	//获取单位
+//	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+//	var doctor_name string
+//	var doctor_code string
+//
+//	doctor_name = "黄亦轩"
+//	doctor_code = "1001"
+//
+//	var pagesize int = 50
+//	var start int = 1
+//	var stop int
+//	var pagecount int
+//	var curpage int
+//	var isSuccess bool = true
+//	//总页数,向上取整,注意除之前要先转换类型为float64
+//	pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
+//
+//	var ress []*Result
+//	for curpage = 1; curpage <= pagecount; curpage++ {
+//		if curpage == 1 {
+//			start = 1
+//		} else {
+//			start = (curpage-1)*pagesize + 1
+//		}
+//		stop = curpage * pagesize
+//		if stop > len(list) {
+//			stop = len(list)
+//		}
+//		//这里就可以查看开始和结束了
+//		fmt.Println(list[start-1 : stop])
+//		var customs []*models.GoodDetail
+//		for _, item := range list {
+//
+//			detail := &models.GoodDetail{
+//				GoodName:                    item.GoodName,
+//				SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
+//				ManufacturerName:            item.ManufacturerName,
+//				ProductionType:              item.ProductionType,
+//				SpecialMedical:              item.SpecialMedical,
+//				BuyPrice:                    item.BuyPrice,
+//				SellPrice:                   item.SellPrice,
+//				Remark:                      item.Remark,
+//			}
+//			customs = append(customs, detail)
+//		}
+//
+//		result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop])
+//		fmt.Println("reuslt8888", result)
+//		var dat map[string]interface{}
+//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//			fmt.Println(dat)
+//		} else {
+//			fmt.Println(err)
+//		}
+//
+//		userJSONBytes, _ := json.Marshal(dat)
+//
+//		var res Result
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//		if res.Transreturncode == "00000000" {
+//			ress = append(ress, &res)
+//		} else {
+//			isSuccess = false
+//			//失败
+//
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+//			return
+//		}
+//		fmt.Println(isSuccess)
+//
+//	}
+//}
 
 //type Charset string
 

service/sz_his_service.go

@@ -1308,3 +1308,9 @@ func UpdateMyProjectById(id int64) (models.MyHisProject, error) {
 	err := XTWriteDB().Model(&project).Where("id = ?", id).Updates(map[string]interface{}{"is_mark": 0}).Error
 	return project, err
 }
+
+func UpdataOrderInfoStatus(id int64, number string, user_org_id int64) {
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+	err = writeDb.Model(&models.HisOrderInfo{}).Where("status = 1 AND user_org_id = ? AND order_number = ?", user_org_id, number).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+	return
+}