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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10106
+org_id = 10138
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -75,10 +75,106 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/settlelist/get", &HisApiController{}, "get:GetSettleList")
 
+	beego.Router("/api/pwd/check", &HisApiController{}, "get:CheckCardPWD")
+
 	//beego.Router("/api/settlelist/get", &HisApiController{}, "get:GetSettleList")
 	//beego.Router("/api/testinit", &HisApiController{}, "get:TestGetBasBaseInit")
 	//beego.Router("/api/test", &HisApiController{}, "get:TestGetBasBaseInfo")
 
+}
+func (c *HisApiController) CheckCardPWD() {
+	card_pwd := c.GetString("card_pwd")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	his, _ := service.GetNewHisPatientInfoFour(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	result := service.Gdyb90991(his.PsnNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, card_pwd)
+
+	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 Result90991
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	if res.Infcode != 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.ErrMsg,
+		})
+		return
+	} else {
+		if res.Output.Baseinfo.CheckStat == "0" {
+			var msg string
+			switch res.Output.Baseinfo.CardStat {
+			case "00":
+				msg = "未激活"
+				break
+			case "10":
+				msg = "激活"
+
+				break
+			case "20":
+				msg = "窗口挂失"
+
+				break
+			case "21":
+				msg = "电话挂失"
+				break
+			case "22":
+				msg = "单位网上申报挂失"
+
+				break
+			case "23":
+				msg = "保健办挂失"
+
+				break
+			case "24":
+				msg = "个人网上挂失"
+
+				break
+			case "25":
+				msg = "网上服务大厅挂失"
+
+				break
+			case "30":
+				msg = "注销"
+
+				break
+			case "40":
+				msg = "回收"
+
+				break
+			case "99":
+				msg = "制卡中（无效卡）"
+
+				break
+
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         msg,
+			})
+			return
+
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "校验成功",
+			})
+			return
+		}
+	}
+
 }
 
 func (c *HisApiController) ReadCard() {
@@ -1492,6 +1588,25 @@ type ResultSeventeen struct {
 	WarnInfo    string `json:"warn_info"`
 }
 
+type Result90991 struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		Baseinfo struct {
+			PsnNo     string `json:"psn_no"`
+			CardStat  string `json:"card_stat"`
+			Certno    string `json:"certno"`
+			PsnName   string `json:"psn_name"`
+			CheckStat string `json:"check_stat"`
+		} `json:"baseinfo"`
+	} `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

controllers/sz/sz_his_api_controller.go

@@ -2153,7 +2153,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 
 	id_str := c.GetString("ids")
-	ids_arr := strings.Split(id_str,  ",")
+	ids_arr := strings.Split(id_str, ",")
 
 	order_id, _ := c.GetInt64("order_id")
 
@@ -2196,12 +2196,12 @@ func (c *SZHisApiController) GetSettleInfo() {
 		var end_time int64
 
 		if settle_accounts_type == 1 { //日结
-			if reg_type == 11{
+			if reg_type == 11 {
 
-				prescriptions,_ = service.GetPrescriptionByIds(ids_arr,adminUser.CurrentOrgId)
-		   }else{
-			prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
-		   }
+				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
+			} else {
+				prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
+			}
 
 		} else { //月结
 			start_time_str := c.GetString("start_time")
@@ -2555,13 +2555,16 @@ func (c *SZHisApiController) GetSettleInfo() {
 
 			total, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", total), 64)
 
-			yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "|")
+			new_number := miConfig.Code + year + month + day +
+				fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+
+			yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + new_number + "|" + miConfig.Code + "|")
 
 			if ret4 == 0 {
 				//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 				tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 				if tempPatient.ID == patient_id {
-					result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode)
+					result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode, new_number)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 						fmt.Println(dat)
@@ -2728,7 +2731,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 				//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 				tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 				if tempPatient.ID == patient_id {
-					result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, order.MedfeeSumamt, yiliao_number, verifyCode, order.OrgSetlNumber, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode)
+					result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, order.MedfeeSumamt, yiliao_number, verifyCode, order.OrgSetlNumber, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode, number)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 						fmt.Println(dat)
@@ -2994,7 +2997,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 	sick_type, _ := c.GetInt64("sick_type")
 
 	id_str := c.GetString("ids")
-	ids_arr := strings.Split(id_str,  ",")
+	ids_arr := strings.Split(id_str, ",")
 
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -3024,12 +3027,12 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 	var end_time int64
 
 	if settle_accounts_type == 1 { //日结
-		if reg_type == 11{
+		if reg_type == 11 {
 
-			prescriptions,_ = service.GetPrescriptionByIds(ids_arr,adminUser.CurrentOrgId)
-		   }else{
+			prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
+		} else {
 			prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
-		   }
+		}
 
 	} else { //月结
 		start_time_str := c.GetString("start_time")
@@ -3384,13 +3387,16 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 
 		total, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", total), 64)
 
-		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "|")
+		new_number := miConfig.Code + year + month + day +
+			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+
+		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("FY004" + "|" + new_number + "|" + miConfig.Code + "|")
 
 		if ret4 == 0 {
 			//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 			tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 			if tempPatient.ID == patient_id {
-				result_three := service.SzybFY004(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode)
+				result_three := service.SzybFY004(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode, new_number)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 					fmt.Println(dat)

service/gdyb_service.go

@@ -2863,3 +2863,59 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 func StrPtr(s string) uintptr {
 	return uintptr(unsafe.Pointer(syscall.StringBytePtr(s)))
 }
+
+func Gdyb90991(psn_no string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, pwd 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"] = "90991" // 交易编码
+
+	inputData["fixmedins_code"] = fixmedins_code // 就诊凭证编号
+	inputData["psn_no"] = psn_no                 // 开始时间
+	inputData["card_pwd"] = pwd                  // 人员姓名
+	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)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	url := gdyb_url + "90991"
+	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", gdyb_paasid)
+	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()
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str
+}

service/his_service.go

@@ -1099,22 +1099,22 @@ func GetDoctorList(orgid int64) (role []*models.SgjUserAdminRole, err error) {
 
 func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
-	 Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
-	  return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
-	 }).
-	 Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-	  return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
-	 }).
-	 Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-	  return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
-	 }).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
-	 return db.Where("status = 1 AND user_org_id = ?", org_id)
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id)
 	}).
-	 Where("id in (?) AND user_org_id = ? AND status = 1", ids,org_id).
-	 Find(&prescription).Error
-	
+		Where("id in (?) AND user_org_id = ? AND status = 1", ids, org_id).
+		Find(&prescription).Error
+
 	return
-   }
+}
 
 func GetDoctorListTwo(orgid int64) (role []*models.SgjUserAdminRole, err error) {
 
@@ -1308,3 +1308,8 @@ func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_time int64
 		Find(&prescription).Error
 	return
 }
+
+func GetNewHisPatientInfoFour(org_id int64, id int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND id = ?", org_id, id).First(&info).Error
+	return
+}

service/sz_his_service.go

@@ -309,8 +309,8 @@ func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas [
 	str := string(respBytes)
 	return str
 }
-func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, account string, verify_code string, serial_number string, mz_number string, version_code string, drug_doctor string, drug_doctor_name string, medical_care int64, code string) string {
-	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
+func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, account string, verify_code string, serial_number string, mz_number string, version_code string, drug_doctor string, drug_doctor_name string, medical_care int64, code string, new_number string) string {
+	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, new_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "FY004" // 交易编码
 
@@ -370,9 +370,9 @@ func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total f
 	str := string(respBytes)
 	return str
 }
-func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total float64, account string, verify_code string, serial_number string, mz_number string, version_code string, drug_doctor string, drug_doctor_name string, medical_care int64, code string) string {
+func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total float64, account string, verify_code string, serial_number string, mz_number string, version_code string, drug_doctor string, drug_doctor_name string, medical_care int64, code string, new_number string) string {
 	// 生成输入报文
-	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
+	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, new_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "FY005" // 交易编码