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

controllers/sg/his_api_controller.go

@@ -106,14 +106,15 @@ func (c *HisApiController) Get9001() {
 	}
 	if res.Infcode == 0 {
 		sign := models.HisSignIn{
-			UserOrgId: c.GetAdminUserInfo().CurrentOrgId,
-			SignNo:    res.Output.Result.SignNo,
-			SignTime:  res.Output.Result.SignTime,
-			Ctime:     time.Now().Unix(),
-			Mtime:     time.Now().Unix(),
-			Status:    1,
-			InputLog:  inputLog,
-			OutputLog: result,
+			UserOrgId:     c.GetAdminUserInfo().CurrentOrgId,
+			SignNo:        res.Output.Result.SignNo,
+			SignTime:      res.Output.Result.SignTime,
+			Ctime:         time.Now().Unix(),
+			Mtime:         time.Now().Unix(),
+			Status:        1,
+			InputLog:      inputLog,
+			OutputLog:     result,
+			FixmedinsCode: miConfig.Code,
 		}
 		err := service.CreateSignIn(&sign)
 		if err == nil {

models/his_models.go

@@ -1431,15 +1431,16 @@ func (HisPrescriptionProjectTen) TableName() string {
 }
 
 type HisSignIn struct {
-	ID        int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	SignNo    string `gorm:"column:sign_no" json:"sign_no" form:"sign_no"`
-	Ctime     int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime     int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status    int64  `gorm:"column:status" json:"status" form:"status"`
-	SignTime  string `gorm:"column:sign_time" json:"sign_time" form:"sign_time"`
-	InputLog  string `gorm:"column:input_log" json:"input_log" form:"input_log"`
-	OutputLog string `gorm:"column:output_log" json:"output_log" form:"output_log"`
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	SignNo        string `gorm:"column:sign_no" json:"sign_no" form:"sign_no"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	SignTime      string `gorm:"column:sign_time" json:"sign_time" form:"sign_time"`
+	InputLog      string `gorm:"column:input_log" json:"input_log" form:"input_log"`
+	OutputLog     string `gorm:"column:output_log" json:"output_log" form:"output_log"`
+	FixmedinsCode string `gorm:"column:fixmedins_code" json:"fixmedins_code" form:"fixmedins_code"`
 }
 
 func (HisSignIn) TableName() string {

service/gdyb_service.go

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