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

service/gdyb_service.go

@@ -3395,7 +3395,7 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	msec := time.Now().Format("000")
 
 	// 生成输入报文
-	GetSignInInfo()
+	GetSignInInfo(fixmedins_code)
 
 	inputMessage := make(map[string]interface{})
 	inputMessage["msgid"] = fixmedins_code + year + month + day + hour + min + sec + msec + "0" // 发送方报文 ID
@@ -4760,8 +4760,8 @@ func CreateSignIn(record *models.HisSignIn) (err error) {
 	return
 }
 
-func GetSignInInfo(org_id int64) string {
+func GetSignInInfo(code string) string {
 	var sign models.HisSignIn
-	err = readDb.Model(&models.HisSignIn{}).Where("user_org_id = ? AND status = 1", org_id).Last(&sign).Error
+	err = readDb.Model(&models.HisSignIn{}).Where("fixmedins_code = ? AND status = 1", code).Last(&sign).Error
 	return sign.SignNo
 }