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

controllers/sg/his_api_controller.go

@@ -244,7 +244,10 @@ func (c *HisApiController) CheckCardPWD() {
 	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)
+	psn, _ := service.GetPsnByPatientId(his.PatientId)
+	bas := strings.Split(psn.CardInfo, "|")
+	basNumber := bas[2]
+	result := service.Gdyb90991(his.PsnNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, card_pwd, basNumber)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -616,6 +619,28 @@ func (c *HisApiController) ReadCard() {
 					return
 
 				} else {
+					Iinfos, _ := json.Marshal(res.Output.Iinfo)
+					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+					infoStr := string(Iinfos)
+					idetinfoStr := string(Idetinfos)
+					psn := &models.HisPsn{
+						PsnNo:        res.Output.Baseinfo.PsnNo,
+						Age:          res.Output.Baseinfo.Age,
+						PatientId:    patient.ID,
+						Certno:       res.Output.Baseinfo.Certno,
+						Brdy:         res.Output.Baseinfo.Brdy,
+						Gend:         res.Output.Baseinfo.Gend,
+						Naty:         res.Output.Baseinfo.Naty,
+						PsnCertType:  res.Output.Baseinfo.PsnCertType,
+						PsnName:      res.Output.Baseinfo.PsnName,
+						Idetinfo:     idetinfoStr,
+						Insuinfo:     infoStr,
+						UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+						CardInfo:     basStr,
+						VerifyNumber: "",
+					}
+					service.CreateHisPsn(psn)
+
 					c.ServeSuccessJSON(map[string]interface{}{
 						"patient": patient,
 						"number":  basNumber,

controllers/zh/zh_his_api_controller.go

@@ -944,7 +944,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			data["struct_2401"] = struct2401
 			var req *http.Request
 			bytesData, _ := json.Marshal(data)
-			req, _ = http.NewRequest("POST", "http://172.16.13.254:9532/"+"jsyb/2401", bytes.NewReader(bytesData))
+			req, _ = http.NewRequest("POST", "http://172.16.13.254:9532/"+"nmyb/2401", bytes.NewReader(bytesData))
 			client := &http.Client{}
 			resp, _ := client.Do(req)
 			defer resp.Body.Close()

service/gdyb_service.go

@@ -3858,7 +3858,7 @@ 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 {
+func Gdyb90991(psn_no string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, pwd string, card_number string) string {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -3872,6 +3872,8 @@ func Gdyb90991(psn_no string, org_name string, doctor string, fixmedins_code str
 	inputData["fixmedins_code"] = fixmedins_code // 就诊凭证编号
 	inputData["psn_no"] = psn_no                 // 开始时间
 	inputData["card_pwd"] = pwd                  // 人员姓名
+	inputData["sscno"] = card_number             // 人员姓名
+
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入