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

controllers/sg/his_api_controller.go

@@ -225,53 +225,58 @@ func (c *HisApiController) ReadCard() {
 	}
 	switch id_card_type {
 	case 1:
-		basStr := c.GetBasBaseInfo()
-		if len(basStr) == 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-			return
-		}
-		fmt.Println(basStr)
-		bas := strings.Split(basStr, "|")
-		basNumber := bas[1]
-		fmt.Println(basNumber)
-		card_sn := bas[3]
-		fmt.Println(card_sn)
-		result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
+		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)
 		} 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.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-			if err == gorm.ErrRecordNotFound {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+			basStr := c.GetBasBaseInfo()
+			if len(basStr) == 0 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
 				return
-			} else if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			}
+			fmt.Println(basStr)
+			bas := strings.Split(basStr, "|")
+			basNumber := bas[1]
+			fmt.Println(basNumber)
+			card_sn := bas[3]
+			fmt.Println(card_sn)
+			result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
+			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.GetPatientByNumber(basNumber, 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":  basNumber,
+					})
+				}
 			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"patient": patient,
-					"number":  basNumber,
-				})
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
 			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
+			break
 		}
-		break
 	case 2:
 		SFZStr := c.GetSFZBaseInfo()
 		id_card_str := strings.Split(SFZStr, "^")

service/gdyb_service.go

@@ -3058,6 +3058,59 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	return 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 {
+	//生成签名
+	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"] = "1101" // 交易编码
+
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = ""            // 证件号码
+			inputData["psn_cert_type"] = ""     // 人员证件类型
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "1"    // 人员证件类型
+		}
+	}
+
+	inputData["mdtrt_cert_no"] = "" // 就诊凭证编号
+	inputData["begntime"] = ""      // 开始时间
+	inputData["psn_name"] = ""      // 人员姓名
+	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()
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	fmt.Println(string(out))
+	return string(out)
+}
+
 func StrPtr(s string) uintptr {
 	return uintptr(unsafe.Pointer(syscall.StringBytePtr(s)))
 }