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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -44,13 +44,14 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9504
+org_id = 10028
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
-url = "http://192.168.1.88:6666/szsi-portal/transData"
+url  = "http://192.168.1.228:17001/szsi-portal/transData"
+#url = "http://192.168.1.88:6666/szsi-portal/transData"
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh

controllers/sg/gdyb_controller.go

@@ -162,8 +162,12 @@ func (c *GdybController) PostFour() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 
-	result := service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)
-
+	var result string
+	if c.GetAdminUserInfo().CurrentOrgId == 10106 {
+		result = service.Gdyb2203A(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)
+	} else {
+		result = service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)
+	}
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 

controllers/sg/his_api_controller.go

@@ -56,6 +56,14 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/310", &HisApiController{}, "get:Check310")
 	beego.Router("/api/390", &HisApiController{}, "get:Check390")
 
+	//备案撤销相关接口
+	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/ncds/putonrecord", &HisApiController{}, "get:PsnPutNCDSOnRecord")
+	beego.Router("/api/psn/ncds/unputonrecord", &HisApiController{}, "get:PsnPutUnNCDSOnRecord")
+
 }
 
 //func (c *HisApiController) TestPay() {
@@ -203,7 +211,6 @@ func (c *HisApiController) GetHisPatientInfo() {
 		Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 		infoStr := string(Iinfos)
 		idetinfoStr := string(Idetinfos)
-
 		if res.Infcode == 0 {
 			his := models.VMHisPatient{
 				Status:      1,
@@ -231,7 +238,6 @@ func (c *HisApiController) GetHisPatientInfo() {
 			return
 		}
 	}
-
 }
 
 //func (c *HisApiController) Sscard() {
@@ -811,6 +817,33 @@ type ResultTwelve struct {
 	WarnMsg     interface{} `json:"warn_msg"`
 }
 
+type ResultThirteen struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		Result struct {
+			TrtDclaDetlSn string `json:"trt_dcla_detl_sn"`
+		} `json:"result"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
+type ResultFourteen struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
 type Custom struct {
 	DetItemFeeSumamt string
 	Cut              string
@@ -2738,9 +2771,7 @@ func (c *HisApiController) GetCheckAccount() {
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
-
 	orders_two, _ := service.GetOrderByTimeThree(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
-
 	fixmedins_setl_cnt := int64(len(orders_two))
 
 	//撤销的算2条数据为一笔
@@ -2764,7 +2795,6 @@ func (c *HisApiController) GetCheckAccount() {
 	} else {
 		user_name = role.UserName
 	}
-
 	if config.IsOpen == 1 {
 		api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
 			"insutype=" + insutype +
@@ -2802,46 +2832,48 @@ func (c *HisApiController) GetCheckAccount() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-
 		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		userJSONBytes, _ := json.Marshal(respJSON)
-
 		var res ResultEight
 		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-
 		if res.Infcode == 0 {
-			micc := &models.MedicalInsuranceCostCompare{
-				StartTime: startime.Unix(),
-				EndTime:   endtime.Unix(),
-				Insutype:  insutype,
-				CheckType: 1,
-				Num:       fixmedins_setl_cnt,
-				Mtime:     time.Now().Unix(),
-				Status:    1,
-				UserOrgId: adminUser.CurrentOrgId,
-				CostTotal: medfee_sumamt,
-				FuncTotal: fund_pay_sumamt,
-				PsnPay:    acct_pay,
-				Creator:   admin_user_id,
-				Ctime:     time.Now().Unix(),
-			}
-
-			err := service.CreateMedicalInsuranceCostCompareRecord(micc)
+			if res.Output.Stmtinfo.StmtRslt == "0" {
+				micc := &models.MedicalInsuranceCostCompare{
+					StartTime: startime.Unix(),
+					EndTime:   endtime.Unix(),
+					Insutype:  insutype,
+					CheckType: 1,
+					Num:       fixmedins_setl_cnt,
+					Mtime:     time.Now().Unix(),
+					Status:    1,
+					UserOrgId: adminUser.CurrentOrgId,
+					CostTotal: medfee_sumamt,
+					FuncTotal: fund_pay_sumamt,
+					PsnPay:    acct_pay,
+					Creator:   admin_user_id,
+					Ctime:     time.Now().Unix(),
+				}
+				err := service.CreateMedicalInsuranceCostCompareRecord(micc)
+				if err == nil {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"stmt_rslt":      res.Output.Stmtinfo.StmtRslt,
+						"stmt_rslt_dscr": res.Output.Stmtinfo.StmtRsltDscr,
+					})
 
-			if err == nil {
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				}
+			} else {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"stmt_rslt":      res.Output.Stmtinfo.StmtRslt,
-					"stmt_rslt_dscr": res.Output.Stmtinfo.StmtRsltDscr,
+					"code": -10,
+					"msg":  res.ErrMsg,
 				})
 
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			}
-
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		}
@@ -3347,46 +3379,6 @@ func (c *HisApiController) GetSettleAccounts() {
 
 }
 
-func (c *HisApiController) GetCode() {
-
-	name := c.GetString("name")
-	codg := c.GetString("codg")
-
-	adminUser := c.GetAdminUserInfo()
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-
-	var user_name string
-	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
-	if role.ID == 0 {
-		user_name = "xxx"
-	} else {
-		user_name = role.UserName
-	}
-
-	baseParams := &models.BaseParams{
-		SecretKey:      miConfig.SecretKey,
-		FixmedinsCode:  miConfig.Code,
-		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
-		MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
-		OrgName:        miConfig.OrgName,
-		Doctor:         user_name,
-	}
-
-	if config.IsOpen == 1 {
-		result := service.Gdyb3301(baseParams, name, codg)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-
-	}
-
-}
-
 func (c *HisApiController) CheckTreatment() {
 	patient_id, _ := c.GetInt64("patient_id", 0)
 	record_time := c.GetString("record_time")
@@ -3647,6 +3639,396 @@ func (c *HisApiController) GetUploadDiag() {
 
 }
 
+func (c *HisApiController) GetCheckCode() {
+	name := c.GetString("name")
+	codg := c.GetString("codg")
+	list_type_code := c.GetString("list_type_code")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	adminUser := c.GetAdminUserInfo()
+
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "xxx"
+	} else {
+		user_name = role.UserName
+	}
+
+	baseParams := &models.BaseParams{
+		SecretKey:      miConfig.SecretKey,
+		FixmedinsCode:  miConfig.Code,
+		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
+		MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
+		OrgName:        miConfig.OrgName,
+		Doctor:         user_name,
+	}
+
+	if config.IsOpen == 1 {
+		result := service.Gdyb3301(baseParams, name, codg, list_type_code, "", "")
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+	}
+
+}
+func (c *HisApiController) UnCheckCode() {
+	name := c.GetString("name")
+	codg := c.GetString("codg")
+	list_type_code := c.GetString("list_type_code")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	adminUser := c.GetAdminUserInfo()
+
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "xxx"
+	} else {
+		user_name = role.UserName
+	}
+
+	baseParams := &models.BaseParams{
+		SecretKey:      miConfig.SecretKey,
+		FixmedinsCode:  miConfig.Code,
+		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
+		MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
+		OrgName:        miConfig.OrgName,
+		Doctor:         user_name,
+	}
+
+	if config.IsOpen == 1 {
+		result := service.Gdyb3302(baseParams, name, codg, list_type_code)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+	}
+
+}
+func (c *HisApiController) PsnPutOnRecord() {
+	record_type, _ := c.GetInt64("type")
+	patient_id, _ := c.GetInt64("patient_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+
+	var patients []*models.Patients
+	if record_type == 1 { //全部备案
+
+		patient, _ := service.GetAllPatient(adminUser.CurrentOrgId)
+		patients = append(patients, patient...)
+
+	} else { //单个备案
+		patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
+		patients = append(patients, patient)
+
+	}
+
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "xxx"
+	} else {
+		user_name = role.UserName
+	}
+
+	if config.IsOpen == 1 {
+		for _, item := range patients {
+			api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + item.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + user_name + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(userJSON)
+			var res ResultTwo
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if res.Infcode == 0 {
+				result := service.Gdyb2505(res.Output.Baseinfo.PsnNo, user_name, miConfig.OrgName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, start_time, end_time)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+
+				userJSONBytes, _ := json.Marshal(dat)
+
+				var res2 ResultThirteen
+				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				if res2.Infcode == 0 {
+					psnResult := &models.GdybPsnRecord{
+						UserOrgId:     adminUser.CurrentOrgId,
+						PatientId:     item.ID,
+						PsnNo:         res.Output.Baseinfo.PsnNo,
+						Ctime:         time.Now().Unix(),
+						Mtime:         time.Now().Unix(),
+						Status:        1,
+						IsCancel:      1,
+						TrtDclaDetlSn: res2.Output.Result.TrtDclaDetlSn,
+					}
+					service.CreatePsnRecord(psnResult)
+
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res2.ErrMsg,
+					})
+					return
+				}
+
+			}
+
+		}
+	}
+
+}
+func (c *HisApiController) PsnUnPutOnRecord() {
+	id, _ := c.GetInt64("id")
+	//record_type, _ := c.GetInt64("type")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "xxx"
+	} else {
+		user_name = role.UserName
+	}
+
+	psn_record, _ := service.GetPsnRecordById(id)
+	if psn_record.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorPsnRecordNoExistWrong)
+		return
+	}
+	if config.IsOpen == 1 {
+		result := service.Gdyb2506(psn_record.PsnNo, user_name, miConfig.OrgName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_record.TrtDclaDetlSn)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultFourteen
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res.Infcode == 0 {
+			psn_record.IsCancel = 2
+			service.CreatePsnRecord(&psn_record)
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+			return
+		}
+	}
+
+}
+func (c *HisApiController) PsnPutNCDSOnRecord() {
+	record_type, _ := c.GetInt64("type")
+	patient_id, _ := c.GetInt64("patient_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	var patients []*models.Patients
+	if record_type == 1 { //全部备案
+		patient, _ := service.GetAllPatient(adminUser.CurrentOrgId)
+		patients = append(patients, patient...)
+	} else { //单个备案
+		patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
+		patients = append(patients, patient)
+	}
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "xxx"
+	} else {
+		user_name = role.UserName
+	}
+
+	if config.IsOpen == 1 {
+		for _, item := range patients {
+			api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + item.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + user_name + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(userJSON)
+			var res ResultTwo
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if res.Infcode == 0 {
+				result := service.Gdyb2503(res.Output.Baseinfo.PsnNo, res.Output.Iinfo[0].Insutype, miConfig.OrgName, user_name, miConfig.Code, strconv.FormatInt(admin_user_id, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "慢性肾功能不全（血透治疗）", "M07803")
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+
+				userJSONBytes, _ := json.Marshal(dat)
+
+				var res2 ResultThirteen
+				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				//patient, _ := service.GetPatientByIDCard(item.IdCardNo, adminUser.CurrentOrgId)
+
+				if res2.Infcode == 0 {
+					psnResult := &models.GdybPsnNcdsRecord{
+						UserOrgId:     adminUser.CurrentOrgId,
+						PatientId:     item.ID,
+						PsnNo:         res.Output.Baseinfo.PsnNo,
+						Ctime:         time.Now().Unix(),
+						Mtime:         time.Now().Unix(),
+						Status:        1,
+						IsCancel:      1,
+						TrtDclaDetlSn: res2.Output.Result.TrtDclaDetlSn,
+					}
+					service.CreatePsnNCDSRecord(psnResult)
+
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res2.ErrMsg,
+					})
+					return
+				}
+			}
+
+		}
+
+	}
+
+}
+func (c *HisApiController) PsnPutUnNCDSOnRecord() {
+	id, _ := c.GetInt64("id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "xxx"
+	} else {
+		user_name = role.UserName
+	}
+
+	psn_record, _ := service.GetPsnNCDSRecordById(id)
+	if psn_record.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorPsnRecordNoExistWrong)
+		return
+	}
+	if config.IsOpen == 1 {
+		result := service.Gdyb2504(psn_record.PsnNo, miConfig.OrgName, user_name, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_record.TrtDclaDetlSn)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultFourteen
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res.Infcode == 0 {
+			psn_record.IsCancel = 2
+			service.CreatePsnNCDSRecord(&psn_record)
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+			return
+		}
+	}
+
+}
+
 func PathExists(path string) (bool, error) {
 	_, err := os.Stat(path)
 	if err == nil {
@@ -3760,23 +4142,3 @@ func RemoveRepeatedCode(arr []string) (newArr []string) {
 	}
 	return
 }
-
-//func ShowMessage1(caption, text string, style uintptr) (result int) {
-//	user32, _ := syscall.LoadLibrary("SSCard.dll")
-//	messageBox, _ := syscall.GetProcAddress(user32, "MessageBoxW")
-//	defer syscall.FreeLibrary(user32)
-//
-//	ret, _, _ := syscall.Syscall9(messageBox,
-//		4,
-//		0,
-//		StrPtr(text),
-//		StrPtr(caption),
-//		style,
-//		0, 0, 0, 0, 0)
-//	result = int(ret)
-//	return
-//}
-
-//func StrPtr3(s string) uintptr {
-//	return uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(s)))
-//}

enums/error_code.go

@@ -247,6 +247,8 @@ const ( // ErrorCode
 	ErrorNoReadCardException = 30005
 
 	ErrorCodeParamSickTypeWrong = 30006
+
+	ErrorPsnRecordNoExistWrong = 30007
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -476,6 +478,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorNoReadCardException: "无法读取除社保卡以外的卡",
 
 	ErrorCodeParamSickTypeWrong: "医生所开处方的疾病类型不能为空",
+
+	ErrorPsnRecordNoExistWrong: "人员备案信息不存在",
 }
 
 type SGJError struct {

models/gdyb_models.go

@@ -0,0 +1,33 @@
+package models
+
+type GdybPsnRecord 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"`
+	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PsnNo         string `gorm:"column:psn_no" json:"psn_no" form:"psn_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"`
+	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+}
+
+func (GdybPsnRecord) TableName() string {
+	return "gdyb_psn_record"
+}
+
+type GdybPsnNcdsRecord 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"`
+	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PsnNo         string `gorm:"column:psn_no" json:"psn_no" form:"psn_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"`
+	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+}
+
+func (GdybPsnNcdsRecord) TableName() string {
+	return "gdyb_psn_ncds_record"
+}

models/his_models.go

@@ -119,6 +119,7 @@ type HisPatient struct {
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 }
 
 func (HisPatient) TableName() string {
@@ -577,6 +578,7 @@ type XtHisPatient struct {
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 }
 
 func (XtHisPatient) TableName() string {
@@ -767,6 +769,7 @@ type VMHisPatient struct {
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 }
 
 func (VMHisPatient) TableName() string {

service/gdyb_service.go

@@ -370,6 +370,91 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	return str
 }
 
+// 门诊就诊信息上传
+func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	diseinfo := make([]map[string]interface{}, 0)
+
+	inputMessage["infno"] = "2203A"       // 交易编码
+	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
+	inputData["begntime"] = timeFormatOne // 开始时间
+	inputData["main_cond_dscr"] = ""      // 主要病情描述
+	inputData["dise_codg"] = sick_code    // 病种编码
+	inputData["dise_name"] = sick_name    // 病种名称
+	inputData["birctrl_type"] = ""        // 计划生育手术类别
+	inputData["birctrl_matn_date"] = ""   // 计划生育手术或生育日期
+
+	inputData["matn_type"] = "" // 生育类别
+	inputData["geso_val"] = ""  // 孕周数
+
+	diseinfo_sun := make(map[string]interface{})
+	diseinfo_sun["diag_type"] = "1"           // 诊断类别
+	diseinfo_sun["diag_srt_no"] = "1"         // 诊断排序号
+	diseinfo_sun["diag_code"] = diag_code     // 诊断代码
+	diseinfo_sun["diag_name"] = diag          // 诊断名称
+	diseinfo_sun["diag_dept"] = department    // 诊断科室
+	diseinfo_sun["dise_dor_no"] = doctor_id   // 诊断医生编码
+	diseinfo_sun["dise_dor_name"] = doctor    // 诊断医生姓名
+	diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
+	diseinfo_sun["vali_flag"] = "1"           // 有效标志
+
+	diseinfo = append(diseinfo, diseinfo_sun)
+	input["diseinfo"] = diseinfo
+	input["mdtrtinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2203A"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+
 type Custom struct {
 	DetItemFeeSumamt string
 	Cut              string
@@ -1242,7 +1327,7 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
-func Gdyb3301(baseParams *models.BaseParams, name string, codg string) string {
+func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1252,15 +1337,66 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string) string {
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3301" // 交易编码
+	inputMessage["infno"] = "2001" // 交易编码
+	inputData["psn_no"] = psn_no
+	inputData["insutype"] = insutype
+	inputData["med_type"] = med_type
+	inputData["begntime"] = "2021-01-01 00:00:00"
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
 
-	inputData["fixmedins_hilist_id"] = baseParams.FixmedinsCode
+func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, baseParams.SecretKey)
 
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3301" // 交易编码
+	inputData["fixmedins_hilist_id"] = codg
 	inputData["fixmedins_hilist_name"] = name
-	inputData["list_type"] = "西药"
+	inputData["list_type"] = list_type_code
 	inputData["med_list_codg"] = codg
-	inputData["begndate"] = "2021-01-01"
-	inputData["enddate"] = "2021-01-07"
+	inputData["begndate"] = start_time
+	inputData["enddate"] = ent_time
 
 	inputData["aprvno"] = ""
 	inputData["dosform"] = ""
@@ -1308,8 +1444,7 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string) string {
 	fmt.Println(str)
 	return str
 }
-
-func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
+func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1319,12 +1454,15 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "2001" // 交易编码
-	inputData["psn_no"] = psn_no
-	inputData["insutype"] = insutype
-	inputData["med_type"] = med_type
-	inputData["begntime"] = "2021-01-01 00:00:00"
-	input["data"] = inputData
+	inputMessage["infno"] = "3302" // 交易编码
+	inputData["fixmedins_hilist_id"] = codg
+	inputData["fixmedins_hilist_name"] = name
+	inputData["list_type"] = list_type_code
+	inputData["med_list_codg"] = codg
+	inputData["begndate"] = "2021-01-01"
+	inputData["enddate"] = "2099-01-07"
+
+	input["catalogcompin"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
@@ -1333,7 +1471,7 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3302"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
 	request, err := http.NewRequest("POST", url, reader)
@@ -1361,6 +1499,237 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 	fmt.Println(str)
 	return str
 }
+func Gdyb2505(psnNo string, doctor string, org_name string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, start_time string, end_time string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2505"
+	inputData["psn_no"] = psnNo
+	inputData["biz_appy_type"] = "03"
+	inputData["begndate"] = start_time
+	inputData["enddate"] = end_time
+	inputData["fixmedins_code"] = fixmedins_code
+	inputData["fixmedins_name"] = org_name
+	inputData["tel"] = ""
+	inputData["addr"] = ""
+	inputData["agnter_name"] = ""
+	inputData["agnter_cert_type"] = ""
+	inputData["agnter_certno"] = ""
+	inputData["agnter_tel"] = ""
+	inputData["agnter_addr"] = ""
+	inputData["agnter_rlts"] = ""
+	inputData["fix_srt_no"] = ""
+	inputData["memo"] = ""
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2505"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb2506(psnNo string, doctor string, org_name string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, trt_dcla_detl_sn string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2506"
+	inputData["psn_no"] = psnNo
+	inputData["trt_dcla_detl_sn"] = trt_dcla_detl_sn
+	inputData["memo"] = ""
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2506"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	timeFormatTwo := tempTime.Format("2006-01-02")
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2503"                 // 交易编码
+	inputData["psn_no"] = psnNo                    // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype               // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_code"] = sick_code        // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_name"] = sick_name        // 险种类型（来自1101接口返回）
+	inputData["insu_optins"] = insuplc_admdvs      // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_no"] = fixmedins_code // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_name"] = org_name     // 险种类型（来自1101接口返回）
+	inputData["hosp_ide_date"] = timeFormatTwo     // 险种类型（来自1101接口返回）
+	inputData["diag_dr_codg"] = doctor_id          // 开始时间
+	inputData["diag_dr_name"] = doctor             // 开始时间
+	inputData["begndate"] = timeFormatTwo          // 医师编码
+	inputData["tel"] = ""                          // 医师编码
+	inputData["addr"] = ""                         // 医师编码
+	inputData["enddate"] = ""                      // 医师编码
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2503"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb2504(psnNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, trt_dcla_detl_sn string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2504"                   // 交易编码
+	inputData["psn_no"] = psnNo                      // 人员编号 （来自1101接口返回）
+	inputData["trt_dcla_detl_sn"] = trt_dcla_detl_sn // 人员编号 （来自1101接口返回）
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2504"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
 
 //func Gdyb2503(psnNo string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string) string {
 //	// 生成签名
@@ -1441,73 +1810,6 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 //	fmt.Println(str)
 //	return str
 //}
-func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string) string {
-	// 生成签名
-	nonce := GetRandomString(32)
-	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
-	tempTime := time.Unix(timestamp, 0)
-	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
-
-	timeFormatTwo := tempTime.Format("2006-01-02")
-
-	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "2503"                 // 交易编码
-	inputData["psn_no"] = psnNo                    // 人员编号 （来自1101接口返回）
-	inputData["insutype"] = insutype               // 险种类型（来自1101接口返回）
-	inputData["opsp_dise_code"] = sick_code        // 险种类型（来自1101接口返回）
-	inputData["opsp_dise_name"] = sick_name        // 险种类型（来自1101接口返回）
-	inputData["insu_optins"] = "440229"            // 险种类型（来自1101接口返回）
-	inputData["ide_fixmedins_no"] = fixmedins_code // 险种类型（来自1101接口返回）
-	inputData["ide_fixmedins_name"] = org_name     // 险种类型（来自1101接口返回）
-	inputData["hosp_ide_date"] = timeFormatTwo     // 险种类型（来自1101接口返回）
-	inputData["diag_dr_codg"] = doctor_id          // 开始时间
-	inputData["diag_dr_name"] = doctor             // 开始时间
-	inputData["begndate"] = timeFormatTwo          // 医师编码
-	inputData["tel"] = ""                          // 医师编码
-	inputData["addr"] = ""                         // 医师编码
-	inputData["enddate"] = ""                      // 医师编码
-
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
-	bytesData, err := json.Marshal(inputMessage)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2503"
-	request, err := http.NewRequest("POST", url, reader)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-
-	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
-
-	client := http.Client{}
-	resp, err := client.Do(request)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	respBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	str := string(respBytes)
-	fmt.Println(str)
-	return str
-}
 
 func Gdyb5301(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string) string {
 	// 生成签名
@@ -1999,3 +2301,28 @@ func CreateMedicalInsuranceCostCompareRecord(record *models.MedicalInsuranceCost
 //	str := string(respBytes)
 //	return str
 //}
+
+func CreatePsnRecord(record *models.GdybPsnRecord) {
+	writeDb.Save(&record)
+	return
+}
+
+func GetPsnRecordById(id int64) (record models.GdybPsnRecord, err error) {
+	err = readDb.Model(&models.GdybPsnRecord{}).Where("id = ?").First(&record).Error
+	return
+}
+
+func CreatePsnNCDSRecord(record *models.GdybPsnNcdsRecord) {
+	writeDb.Save(&record)
+	return
+}
+
+func GetPsnNCDSRecordById(id int64) (record models.GdybPsnNcdsRecord, err error) {
+	err = readDb.Model(&models.GdybPsnNcdsRecord{}).Where("id = ?").First(&record).Error
+	return
+}
+
+func GetPatientsByIds(ids []string, current_org_id int64) (patients []*models.Patients, err error) {
+	err = readDb.Model(&models.Patients{}).Where("id IN (?) AND user_org_id = ?", ids, current_org_id).Find(&patients).Error
+	return
+}

service/his_service.go

@@ -18,6 +18,7 @@ type HisPatient struct {
 	HisPrescription []*HisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"prescription"`
 	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	Number          string             `gorm:"column:number" json:"number" form:"number"`
+	PatientInfo     string             `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 }
 
 func (HisPatient) TableName() string {
@@ -1096,3 +1097,8 @@ func GetBatchDoctorList(idss []int64) (role []*models.SgjUserAdminRole, err erro
 	return role, err
 
 }
+
+func GetAllPatient(org_id int64) (patients []*models.Patients, err error) {
+	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", org_id).Find(&patients).Error
+	return
+}

service/sz_his_service.go

@@ -14,6 +14,50 @@ import (
 	_ "unsafe"
 )
 
+func SzybXX001(doctor string, doctor_code string, fixmedins_code string, account string, verify_code string, serial_number string, version_code string) string {
+	// 生成输入报文
+	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
+	inputData := make(map[string]interface{})
+	inputMessage["transType"] = "XX001"         // 交易编码
+	inputMessage["transVersion"] = version_code // 交易编码
+
+	inputData["aaz500"] = account
+	inputData["bzz269"] = "000000"
+	inputData["bke384"] = inputMessage["serialNumber"]
+	inputMessage["transBody"] = inputData
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://192.168.1.228:17001/szsi-portal/transData"
+	url := "http://192.168.1.88:6666/szsi-portal/transData"
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str
+
+}
+
 func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string, mz_number string, version_code string, custom_code string, project_name string, price float64, medical_care int64) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)