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

controllers/sg/his_api_controller.go

@@ -220,15 +220,51 @@ func (c *HisApiController) ReadCard() {
 
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	if initFlag == 0 {
-		c.TestGetBasBaseInit()
-	}
+
 	switch id_card_type {
 	case 1:
 		if miConfig.MdtrtareaAdmvs == "421300" {
-			result := service.Gdyb1101C("", miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates)
-			fmt.Println(result)
+			result, request_log := service.Gdyb1101C("", miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates)
+			fmt.Println(request_log)
+			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 ResultTwo
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if res.Infcode == 0 {
+				patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
+				if err == gorm.ErrRecordNotFound {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+					return
+				} else if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+					return
+
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"patient": patient,
+						"number":  res.Output.Baseinfo.Certno,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+
 		} else {
+			if initFlag == 0 {
+				c.TestGetBasBaseInit()
+			}
 			basStr := c.GetBasBaseInfo()
 			if len(basStr) == 0 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
@@ -1759,7 +1795,10 @@ func (c *HisApiController) GetRegisterInfo() {
 
 	if config.IsOpen == 1 {
 		//service.Gdyb1201("", miConfig.OrgName, "1122", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1, "")
-		result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10))
+
+		result, requestLog := service.Gdyb1101C(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates)
+
+		//result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10))
 		saveLog(result, requestLog, "1101")
 		//register_log = requestLog + "\r\n" + "\r\n" + "\r\n" + result
 		var res ResultTwo

service/gdyb_service.go

@@ -3059,7 +3059,7 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 }
 
 //人员信息版本4
-func Gdyb1101C(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64) string {
+func Gdyb1101C(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -3099,7 +3099,7 @@ func Gdyb1101C(certNo string, org_name string, doctor string, fixmedins_code str
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	var json2 string
 	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
@@ -3108,7 +3108,7 @@ func Gdyb1101C(certNo string, org_name string, doctor string, fixmedins_code str
 		fmt.Println("error:", err.Error())
 	}
 	fmt.Println(string(out))
-	return string(out)
+	return string(out), string(bytesData)
 }
 
 func StrPtr(s string) uintptr {