111

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10138
+org_id = 10217
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,7 +53,7 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-# gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #test
 # gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
 gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
@@ -66,7 +66,7 @@ gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #gdyb_paasid = "sg03_prd"
 # gdyb_paasid = "test_hosp"
 #江门
-# gdyb_paasid = "jm_sc_yjyy"
+#gdyb_paasid = "jm_sc_yjyy"
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳

controllers/sg/his_api_controller.go

@@ -137,7 +137,7 @@ func (c *HisApiController) ReadEleToken() {
 		tokens := ReadEleCard(admin_user_id, c.GetAdminUserInfo().CurrentOrgId, c)
 		if len(tokens) > 0 {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "读取成功，请在5分钟内进行结算操作",
+				"msg": "读取成功",
 			})
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -153,9 +153,52 @@ func (c *HisApiController) ReadEleToken() {
 		token := c.GetEleBaseInfo()
 		token = Remove0000(token)
 		if len(token) > 0 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "读取成功，请在5分钟内进行结算操作",
-			})
+			result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, token)
+			saveLog(result2, requestLog2, "1101", "获取人员信息")
+			var res ResultTwo
+			if err := json.Unmarshal([]byte(result2), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == 0 {
+				patient, err := service.GetPatientByNumber(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 {
+					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:     "",
+						VerifyNumber: token,
+					}
+					service.CreateHisPsn(psn)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "读取成功",
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"failed_code": -10,
@@ -213,7 +256,7 @@ func (c *HisApiController) ReadEleToken() {
 
 			if len(token) > 0 {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "读取成功，请在5分钟内进行结算操作",
+					"msg": "读取成功",
 				})
 			} else {
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -2458,27 +2501,42 @@ func (c *HisApiController) ReadCard() {
 			}
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
+
 			type ELeData struct {
+				Code string `json:"code"`
 				Data struct {
-					IdNo        string `json:"idNo"`
-					IdType      string `json:"idType"`
-					UserName    string `json:"userName"`
-					EcToken     string `json:"ecToken"`
-					InsuOrg     string `json:"insuOrg"`
-					Gender      string `json:"gender"`
-					Birthday    string `json:"birthday"`
-					Nationality string `json:"nationality"`
-					Email       string `json:"email"`
-					Extra       string `json:"extra"`
+					Aac002        string `json:"aac002"`
+					Aaz500        string `json:"aaz500"`
+					ActCardNo     string `json:"actCardNo"`
+					Bab520        string `json:"bab520"`
+					Bkz543        string `json:"bkz543"`
+					BusinessType  string `json:"businessType"`
+					CertfCodg     string `json:"certfCodg"`
+					EcIndexNo     string `json:"ecIndexNo"`
+					EcToken       string `json:"ecToken"`
+					ID0000        string `json:"id0000"`
+					IDNo          string `json:"idNo"`
+					IDType        string `json:"idType"`
+					Idcode        string `json:"idcode"`
+					IdentityToken string `json:"identity_token"`
+					InsuOrg       string `json:"insuOrg"`
+					OfficeID      string `json:"officeId"`
+					OfficeName    string `json:"officeName"`
+					OperatorID    string `json:"operatorId"`
+					OperatorName  string `json:"operatorName"`
+					OrgID         string `json:"orgId"`
+					UserName      string `json:"userName"`
 				} `json:"data"`
-				Code    int    `json:"code"`
-				Message string `json:"message"`
+				Infno     interface{} `json:"infno"`
+				Message   string      `json:"message"`
+				OrgID     string      `json:"orgId"`
+				TransType string      `json:"transType"`
 			}
 
 			inputInfo, outPutInfo, errMsg := service.ReadEleCard(miConfig.Code)
 			fmt.Println(errMsg)
 
-			if len(errMsg) == 0 {
+			if len(outPutInfo) > 0 {
 				var ele ELeData
 				err := json.Unmarshal([]byte(outPutInfo), &ele)
 				if err != nil {
@@ -2487,113 +2545,106 @@ func (c *HisApiController) ReadCard() {
 				token := ele.Data.EcToken
 				fmt.Println(inputInfo)
 				fmt.Println(outPutInfo)
-				result, requestLog, errMsgLog := service.FJyb1101ForEleToken(ele.Data.IdNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, "", certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, token)
-
+				result, requestLog, errMsgLog := service.FJyb1101ForEleToken(ele.Data.IDNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, "", certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, token)
 				saveLog(result, requestLog, "1101", "获取人员信息")
-				fmt.Println(errMsgLog)
-
-				if len(errMsgLog) > 0 {
-
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result), &dat); err == nil {
+					fmt.Println(dat)
 				} else {
+					fmt.Println(err)
+				}
 
-					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)
+				userJSONBytes, _ := json.Marshal(dat)
+				var res ResultTwo
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res.ErrMsg = errMsgLog
+				if res.Infcode == 0 {
+					patient, err := service.GetPatientByNumber(ele.Data.IDNo, c.GetAdminUserInfo().CurrentOrgId)
+					if err == gorm.ErrRecordNotFound {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+						return
+					} else if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 						return
-					}
-					res.ErrMsg = errMsgLog
-					if res.Infcode == 0 {
-						patient, err := service.GetPatientByNumber(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
-						if err == gorm.ErrRecordNotFound {
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-							return
-						} else if err != nil {
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-							return
 
-						} else {
-							fmt.Println(res)
-							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:     outPutInfo,
-								VerifyNumber: token,
-							}
-							service.CreateHisPsn(psn)
+					} else {
+						fmt.Println(res)
+						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:     outPutInfo,
+							VerifyNumber: token,
+						}
+						service.CreateHisPsn(psn)
 
-							var rf []*ResultFive
-							json.Unmarshal([]byte(infoStr), &rf)
+						var rf []*ResultFive
+						json.Unmarshal([]byte(infoStr), &rf)
 
-							var insutypes []*ResultFive
-							var insutype string
-							var is390 int = 0
-							var is310 int = 0
+						var insutypes []*ResultFive
+						var insutype string
+						var is390 int = 0
+						var is310 int = 0
 
-							for _, item := range rf {
-								if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
-									insutypes = append(insutypes, item)
-								}
+						for _, item := range rf {
+							if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+								insutypes = append(insutypes, item)
 							}
+						}
 
-							if len(insutypes) == 1 {
-								insutype = insutypes[0].Insutype
-								//insuplc_admdvs = insutypes[0].InsuplcAdmdvs
-							} else {
-								for _, i := range insutypes {
-									if i.Insutype == "390" {
-										is390 = 1
-									}
+						if len(insutypes) == 1 {
+							insutype = insutypes[0].Insutype
+							//insuplc_admdvs = insutypes[0].InsuplcAdmdvs
+						} else {
+							for _, i := range insutypes {
+								if i.Insutype == "390" {
+									is390 = 1
+								}
 
-									if i.Insutype == "310" {
-										is310 = 1
-									}
+								if i.Insutype == "310" {
+									is310 = 1
 								}
 							}
-							if is390 == 1 {
-								insutype = "390"
-							}
+						}
+						if is390 == 1 {
+							insutype = "390"
+						}
 
-							if is310 == 1 {
-								insutype = "310"
-							}
+						if is310 == 1 {
+							insutype = "310"
+						}
 
-							if len(insutypes) == 0 {
-								insutype = "310"
-							}
-							c.ServeSuccessJSON(map[string]interface{}{
-								"patient":  patient,
-								"number":   token,
-								"insutype": insutype,
-							})
+						if len(insutypes) == 0 {
+							insutype = "310"
 						}
-					} else {
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-						return
+						c.ServeSuccessJSON(map[string]interface{}{
+							"patient":  patient,
+							"number":   token,
+							"insutype": insutype,
+						})
 					}
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+					return
 				}
+
 			}
 		}
 		break
@@ -3895,9 +3946,9 @@ func (c *HisApiController) GetSettleListHospital() {
 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrder(10106)
+	orders, _ := service.GetAllHisOrderErr(10106, 101060)
 	for _, item := range orders {
-		order_id := item.ID
+		order_id := item.PatientId
 		order, _ := service.GetHisOrderByIDTwo(order_id)
 		roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
@@ -7728,14 +7779,15 @@ func (c *HisApiController) GetUploadInfo() {
 					} else {
 						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 						psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
-
-						//psn_info, _ := service.GetPsnByPatientId(id)
 						bas := strings.Split(psn_info.CardInfo, "|")
-
 						if his.IdCardType == 1 {
 							cert_no = bas[2]
-						} else {
-							cert_no = bas[1]
+						} else if his.IdCardType == 3 {
+							cert_no = his.Certno
+							psn_info.VerifyNumber = his.Certno + "|" + psn_info.VerifyNumber
+						} else if his.IdCardType == 4 {
+							cert_no = his.Certno
+							psn_info.VerifyNumber = psn_info.VerifyNumber
 						}
 
 						//江苏地区国家医保医疗类别
@@ -9286,15 +9338,17 @@ func (c *HisApiController) GetPreUploadInfo() {
 								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 								if his.IdCardType != 4 {
 									psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
-								}
-
-								bas := strings.Split(psn_info.CardInfo, "|")
+									bas := strings.Split(psn_info.CardInfo, "|")
+									if his.IdCardType == 1 {
+										cert_no = bas[2]
+									} else {
+										cert_no = bas[1]
+									}
 
-								if his.IdCardType == 1 {
-									cert_no = bas[2]
 								} else {
-									cert_no = bas[1]
+									cert_no = his.Certno
 								}
+
 								//江苏地区国家医保医疗类别
 								//职工透析：医疗类别选特殊情况门诊9933
 								//居民血透门慢： 医疗类别选门诊慢病1402

main.go

@@ -4,15 +4,14 @@ import (
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
-	//"gdyb/models"
 	_ "gdyb/routers"
+	"gdyb/service"
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
 	//"github.com/qiniu/roapi.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
-	"gdyb/service"
 	"github.com/astaxie/beego"
 	//"strconv"
 	//"time"
@@ -20,13 +19,13 @@ import (
 
 func init() {
 	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 	//CreateLog(miConfig)
 	//UploadLog(miConfig)
-	if org_id == 10191 {
-		service.GetFjAuthorizationInfo(miConfig.Code)
-	}
+	//if org_id == 10191 {
+	//	service.GetFjAuthorizationInfo(miConfig.Code)
+	//}
 }
 func main() {
 	beego.Run()

service/fj_service.go

@@ -2695,7 +2695,7 @@ func ReadEleCard(code string) (string, string, string) {
 	inputData["operatorId"] = "1"
 	inputData["operatorName"] = "admin"
 	inputData["officeId"] = "001"
-	inputData["officeName"] = "血透科"
+	inputData["officeName"] = "111"
 	data["data"] = inputData
 	data["transType"] = "ec.query"
 	data["orgId"] = code
@@ -2710,7 +2710,7 @@ func ReadEleCard(code string) (string, string, string) {
 	if ret2 != 0 {
 		return "", "", ""
 	}
-	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pErrMsg))), GB18030)
+	return ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"), ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"), ConvertToString(DeleteExtraSpace(string(pErrMsg)), "gbk", "utf-8")
 
 }
 

service/gz_gdyb_service.go

@@ -1,5 +1,6 @@
 package service
 
+//
 //
 //import (
 //	"bytes"
@@ -10,8 +11,6 @@ package service
 //	"fmt"
 //	"gdyb/models"
 //	"github.com/astaxie/beego"
-//	"github.com/go-ole/go-ole"
-//	"github.com/go-ole/go-ole/oleutil"
 //	"io"
 //	"io/ioutil"
 //	"log"
@@ -56,77 +55,8 @@ package service
 //	gdyb_url := beego.AppConfig.String("gdyb_url")
 //	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 //	url := gdyb_url + "1201"
-//	//var str string
-//	//str1 := make([]byte, 1024)
-//
-//	//var x interface{}
-//	//s3 := make([]byte, 256)
-//	ole.CoInitialize(0)
-//	unknown, err := oleutil.CreateObject("yinhai.yh_hb_sctr")
-//	if err != nil {
-//		log.Fatal("CreateObject: ", err)
-//	}
 //
-//	xxxx := unknown.MustQueryInterface(ole.IID_IDispatch)
 //
-//	var str6 map[string]interface{}
-//
-//	//str6 = ""
-//
-//	////p := (*string)(unsafe.Pointer(str))
-//	////var str6 *string
-//	//var str6 *ole.VARIANT
-//	////str := make([]*byte, 256)
-//	//if err != nil {
-//	//	log.Fatal("QueryInterface: ", err)
-//	//}
-//	//
-//	r, err1 := xxxx.CallMethod("yh_hb_call", "1201", string(bytesData), str6)
-//	////result := oleutil.MustGetProperty(xxxx, "astr_jysc")
-//	//
-//	if err1 != nil {
-//		log.Fatal("CallMethod: ", err1, " | ", r)
-//	}
-//	fmt.Println("~~~~~~~")
-//	//fmt.Println(str6.ToString())
-//	fmt.Println(r.ToString())
-//	fmt.Println("~~~~~~~")
-//	//
-//	//xxxx.Release()
-//	//
-//	//ole.CoUninitialize()
-//	//
-//	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.Printf("call yh_hb_call %q\n", string(out))
-//	fmt.Printf(json2)
-//	//
-//	//DllDef := syscall.MustLoadDLL("yh_hb_sctrl.dll")
-//	//Iinit := DllDef.MustFindProc("DllGetClassObject")
-//
-//	//ole.CoInitialize(0)
-//	//
-//	//ole.CLSIDFromProgID("yinhai.yh_hb_sctr")
-//	//
-//	//
-//	//unknown, err := CreateInstance(clsid, IID_IUnknown)
-//	//if err != nil {
-//	//	return
-//	//}
-//	//defer unknown.Release()
-//	//
-//	//dispatch, err := unknown.QueryInterface(IID_IDispatch)
-//	//if err != nil {
-//	//	return
-//	//}
-//	//
-//	//
-//	//
 //
 //	request, err := http.NewRequest("POST", url, reader)
 //	if err != nil {

service/his_service.go

@@ -1421,7 +1421,7 @@ func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {
-	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = ?", org_id, stage).Find(&his).Error
+	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = 101060", org_id).Find(&his).Error
 	return
 }