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

controllers/sg/gdyb_controller.go

@@ -118,7 +118,7 @@ func (c *GdybController) PostTwo() {
 
 	id_card_type, _ := c.GetInt64("id_card_type")
 
-	result, _ := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type)
+	result, _ := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, "")
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/sg/his_api_controller.go

@@ -1801,7 +1801,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	config, _ := service.GetMedicalInsuranceConfig(adminInfo.CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
 
-	//doctor_info, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
+	doctor_info, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
 
 	//就诊结算未完成，不能进行二次挂号
 	his, _ := service.GetHisPatientInfoTwo(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
@@ -1992,7 +1992,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 
 			} else {
-				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type)
+				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName)
 				saveLog(result, requestLog, "2201", "挂号")
 				if err := json.Unmarshal([]byte(result), &resThree); err != nil {
 					utils.ErrorLog("解析失败：%v", err)

routers/router.go

@@ -18,7 +18,7 @@ func init() {
 		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
-		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission"},
+		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission", "Content-Security-Policy"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		AllowCredentials: true,
 	}))

service/gdyb_service.go

@@ -338,7 +338,7 @@ func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 }
 
 // 门诊挂号
-func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64) (string, string) {
+func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -347,7 +347,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2201"        // 交易编码
@@ -365,7 +365,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 
 	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
 	inputData["atddr_no"] = doctor_id    // 医师编码
-	inputData["dr_name"] = doctor        // 医师姓名
+	inputData["dr_name"] = doctor_name   // 医师姓名
 	inputData["dept_code"] = dept_code   // 科室编码
 	inputData["dept_name"] = dept        // 科室名称
 	inputData["caty"] = "A03.06"         // 科别