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

controllers/sz/sz_his_api_controller.go

@@ -1739,6 +1739,7 @@ func (c *SZHisApiController) GetDrugList() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println(orgId)
 	//获取药品库数据
 	list, _ := service.GetDrugList(orgId)
 	//获取药品剂型
@@ -1752,7 +1753,7 @@ func (c *SZHisApiController) GetDrugList() {
 			}
 		}
 	}
-	fmt.Print("list22222222", list)
+	fmt.Print("长度", len(list))
 	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
@@ -1768,7 +1769,7 @@ func (c *SZHisApiController) GetDrugList() {
 	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 {
@@ -1781,7 +1782,6 @@ func (c *SZHisApiController) GetDrugList() {
 			stop = len(list)
 		}
 		//这里就可以查看开始和结束了
-		fmt.Println(list[start-1 : stop])
 		var customs []*models.DrugDetail
 		for _, item := range list {
 
@@ -1801,14 +1801,14 @@ func (c *SZHisApiController) GetDrugList() {
 			customs = append(customs, detail)
 		}
 
-		result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, customs)
-		fmt.Println("reuslt", result)
+		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)
+			//fmt.Println(dat)
 		} else {
-			fmt.Println(err)
+			//fmt.Println(err)
 		}
 
 		userJSONBytes, _ := json.Marshal(dat)
@@ -2563,6 +2563,7 @@ func (c *SZHisApiController) GetGoodsList() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println(orgId)
 	//获取所有耗材信息
 	list, _ := service.GetGoodInformationList(orgId)
 	fmt.Println("list22222", list)
@@ -2612,7 +2613,7 @@ func (c *SZHisApiController) GetGoodsList() {
 			customs = append(customs, detail)
 		}
 
-		result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, customs)
+		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 {

service/sz_his_service.go

@@ -543,7 +543,7 @@ func SzybML008(doctor string, doctor_code string, fixmedins_code string, datas [
 	//inputData["bke384"] = setl_number
 
 	for _, item := range datas {
-		fmt.Println("中国222222", item.DrugDosageName)
+
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["ake001"] = item.MedicalInsuranceNumber
 		feedetailInfo["bkm017"] = item.Code