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

controllers/nm/nm_controller.go

@@ -10,7 +10,6 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
-	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"os"
 	"regexp"
@@ -539,59 +538,18 @@ func (c *NmController) ReadCard() {
 		infocode, _ := strconv.ParseInt(res2.Infcode, 10, 64)
 
 		if infocode == 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "0",
+				"card_info":      res.Output.CardInfo,
+				"busi_card_info": pBusiCardInfo,
+				"result":         res2,
+				"type":           "1",
+			})
 
-			var insutypes []string
-			var insutype string
-			var is390 int = 0
-			var is310 int = 0
-			for _, item := range res2.Output.Iinfo {
-				if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
-					insutypes = append(insutypes, item.Insutype)
-				}
-			}
-			if len(insutypes) == 1 {
-				insutype = insutypes[0]
-			} else {
-				for _, i := range insutypes {
-					if i == "390" {
-						is390 = 1
-					}
-
-					if i == "310" {
-						is310 = 1
-					}
-				}
-			}
-			if is390 == 1 {
-				insutype = "390"
-			}
-			if is310 == 1 {
-				insutype = "310"
-			}
-			if len(insutypes) == 0 {
-				insutype = "310"
-			}
-
-			patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-			if err == gorm.ErrRecordNotFound {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-				return
-			} else if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
-
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"patient":     patient,
-					"number":      basNumber,
-					"info":        res,
-					"insutype":    insutype,
-					"card_number": cardNumber,
-				})
-			}
 		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
 		}
 
 		break
@@ -624,24 +582,20 @@ func (c *NmController) ReadCard() {
 			infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
 
 			if infocode == 0 {
-				patient, err := service.GetPatientByNumber(ele.Data.IdNo, c.GetAdminUserInfo().CurrentOrgId)
-				if err == gorm.ErrRecordNotFound {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-					return
-				} else if err != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-					return
-
-				} else {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"patient": patient,
-						"number":  token,
-						"info":    res,
-					})
-				}
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"status":         "0",
+					"card_info":      pBusiCardInfo,
+					"busi_card_info": pBusiCardInfo,
+					"token":          token,
+					"result":         dat,
+				})
+
 			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-				return
+				c.ServeSuccessJSON(map[string]interface{}{
+					"status": "-1",
+				})
+
 			}
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)