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

controllers/sg/his_api_controller.go

@@ -61,7 +61,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/checkcode/get", &HisApiController{}, "get:GetCheckCode")
 	beego.Router("/api/uncheckcode/get", &HisApiController{}, "get:UnCheckCode")
 	beego.Router("/api/psn/putonrecord", &HisApiController{}, "get:PsnPutOnRecord")
-	beego.Router("/api/psn/unputonrecord", &HisApiController{}, "get:PsnUnPutOnRecord")
+	beego.Router("/api/psn/unputonrecord", &HisApiController{}, "get:PsnUnPutOn·Record")
 	beego.Router("/api/psn/ncds/putonrecord", &HisApiController{}, "get:PsnPutNCDSOnRecord")
 	beego.Router("/api/psn/ncds/unputonrecord", &HisApiController{}, "get:PsnPutUnNCDSOnRecord")
 	beego.Router("/api/reversal", &HisApiController{}, "get:ReversalData")
@@ -2534,7 +2534,7 @@ func (c *HisApiController) ReadCard() {
 			}
 
 			inputInfo, outPutInfo, errMsg := service.ReadEleCard(miConfig.Code)
-			fmt.Println(errMsg)
+			outPutInfo = Remove0000(outPutInfo)
 
 			if len(outPutInfo) > 0 {
 				var ele ELeData

models/drug.go

@@ -64,7 +64,7 @@ type BaseDrugLib struct {
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 
 	MinNumber int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose      float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	Dose      string  `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit  string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	DrugDay   string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	MinPrice  float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`

service/fj_service.go

@@ -2683,9 +2683,9 @@ func ReadEleCard(code string) (string, string, string) {
 	DllDef := syscall.MustLoadDLL("chs_fjs_standard.dll")
 	readCard := DllDef.MustFindProc("ec_decode")
 
-	pCardInfo := make([]byte, 8192)
-	pBusiCardInfo := make([]byte, 8192)
-	pErrMsg := make([]byte, 8192)
+	pCardInfo := make([]byte, 2048)
+	pBusiCardInfo := make([]byte, 2048)
+	pErrMsg := make([]byte, 2048)
 
 	data := make(map[string]interface{})