|
@@ -1521,6 +1521,7 @@ func (c *SZHisApiController) GetDrugList() {
|
1521
|
1521
|
|
1522
|
1522
|
adminUserInfo := c.GetAdminUserInfo()
|
1523
|
1523
|
orgId := adminUserInfo.CurrentOrgId
|
|
1524
|
+ fmt.Println(orgId)
|
1524
|
1525
|
//获取药品库数据
|
1525
|
1526
|
list, _ := service.GetDrugList(orgId)
|
1526
|
1527
|
//获取药品剂型
|
|
@@ -1534,7 +1535,7 @@ func (c *SZHisApiController) GetDrugList() {
|
1534
|
1535
|
}
|
1535
|
1536
|
}
|
1536
|
1537
|
}
|
1537
|
|
- fmt.Print("list22222222", list)
|
|
1538
|
+ fmt.Print("长度", len(list))
|
1538
|
1539
|
miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
|
1539
|
1540
|
var doctor_name string
|
1540
|
1541
|
var doctor_code string
|
|
@@ -1550,7 +1551,7 @@ func (c *SZHisApiController) GetDrugList() {
|
1550
|
1551
|
var isSuccess bool = true
|
1551
|
1552
|
//总页数,向上取整,注意除之前要先转换类型为float64
|
1552
|
1553
|
pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
|
1553
|
|
-
|
|
1554
|
+ fmt.Println("pageCount22222", pagecount)
|
1554
|
1555
|
var ress []*Result
|
1555
|
1556
|
for curpage = 1; curpage <= pagecount; curpage++ {
|
1556
|
1557
|
if curpage == 1 {
|
|
@@ -1563,7 +1564,6 @@ func (c *SZHisApiController) GetDrugList() {
|
1563
|
1564
|
stop = len(list)
|
1564
|
1565
|
}
|
1565
|
1566
|
//这里就可以查看开始和结束了
|
1566
|
|
- fmt.Println(list[start-1 : stop])
|
1567
|
1567
|
var customs []*models.DrugDetail
|
1568
|
1568
|
for _, item := range list {
|
1569
|
1569
|
|
|
@@ -1583,14 +1583,14 @@ func (c *SZHisApiController) GetDrugList() {
|
1583
|
1583
|
customs = append(customs, detail)
|
1584
|
1584
|
}
|
1585
|
1585
|
|
1586
|
|
- result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, customs)
|
1587
|
|
- fmt.Println("reuslt", result)
|
|
1586
|
+ result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop])
|
|
1587
|
+ fmt.Println("reuslt9999999999999", result)
|
1588
|
1588
|
|
1589
|
1589
|
var dat map[string]interface{}
|
1590
|
1590
|
if err := json.Unmarshal([]byte(result), &dat); err == nil {
|
1591
|
|
- fmt.Println(dat)
|
|
1591
|
+ //fmt.Println(dat)
|
1592
|
1592
|
} else {
|
1593
|
|
- fmt.Println(err)
|
|
1593
|
+ //fmt.Println(err)
|
1594
|
1594
|
}
|
1595
|
1595
|
|
1596
|
1596
|
userJSONBytes, _ := json.Marshal(dat)
|
|
@@ -2345,6 +2345,7 @@ func (c *SZHisApiController) GetGoodsList() {
|
2345
|
2345
|
|
2346
|
2346
|
adminUserInfo := c.GetAdminUserInfo()
|
2347
|
2347
|
orgId := adminUserInfo.CurrentOrgId
|
|
2348
|
+ fmt.Println(orgId)
|
2348
|
2349
|
//获取所有耗材信息
|
2349
|
2350
|
list, _ := service.GetGoodInformationList(orgId)
|
2350
|
2351
|
fmt.Println("list22222", list)
|
|
@@ -2394,7 +2395,7 @@ func (c *SZHisApiController) GetGoodsList() {
|
2394
|
2395
|
customs = append(customs, detail)
|
2395
|
2396
|
}
|
2396
|
2397
|
|
2397
|
|
- result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, customs)
|
|
2398
|
+ result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop])
|
2398
|
2399
|
fmt.Println("reuslt8888", result)
|
2399
|
2400
|
var dat map[string]interface{}
|
2400
|
2401
|
if err := json.Unmarshal([]byte(result), &dat); err == nil {
|