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

controllers/hb/hbyb_controller.go

@@ -365,6 +365,8 @@ func (c *HBybController) PostTen() {
 	setlId := c.GetString("setl_id")
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
+	med_type := c.GetString("med_type")
+
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
@@ -385,7 +387,7 @@ func (c *HBybController) PostTen() {
 		SetlId:  setlId,
 	}
 
-	result := service.Hbyb5203(baseParams, businessParams)
+	result := service.Hbyb5203(baseParams, businessParams, med_type)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -270,6 +270,27 @@ 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,
+					}
+					service.CreateHisPsn(psn)
+
 					c.ServeSuccessJSON(map[string]interface{}{
 						"patient": patient,
 						"number":  res.Output.Baseinfo.Certno,
@@ -1817,39 +1838,30 @@ func (c *HisApiController) GetRegisterInfo() {
 
 	if config.IsOpen == 1 {
 		var res ResultTwo
+		var PsnNo string
+		var PsnCertType string
+		var Certno string
+		var PsnName string
+		var Gend string
+		var Naty string
+		var Brdy string
+		var Age float64
+		var infoStr string
+		var idetinfoStr string
 		if miConfig.MdtrtareaAdmvs == "421300" {
-			api := "http://192.168.124.4:9532/" + "hbyb/1101?cert_no=" + id_card +
-				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10)
-			resp, requestErr := http.Get(api)
-			if requestErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			body, ioErr := ioutil.ReadAll(resp.Body)
-			if ioErr != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			var respJSON map[string]interface{}
-			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-			result, _ := json.Marshal(respJSON)
-			fmt.Println("log")
-			fmt.Println(string(result))
-
-			if err := json.Unmarshal([]byte(result), &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
+			psn_info, _ := service.GetPsnByPatientId(id)
+			PsnNo = psn_info.PsnNo
+			PsnCertType = psn_info.PsnCertType
+			Certno = psn_info.Certno
+			PsnName = psn_info.PsnName
+			Gend = psn_info.Gend
+			Naty = psn_info.Naty
+			Brdy = psn_info.Brdy
+			Age = psn_info.Age
+			Iinfos, _ := json.Marshal(psn_info.Insuinfo)
+			Idetinfos, _ := json.Marshal(psn_info.Idetinfo)
+			infoStr = string(Iinfos)
+			idetinfoStr = string(Idetinfos)
 
 		} else {
 			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))
@@ -1860,12 +1872,20 @@ func (c *HisApiController) GetRegisterInfo() {
 				return
 			}
 
-		}
+			PsnNo = res.Output.Baseinfo.PsnNo
+			PsnCertType = res.Output.Baseinfo.PsnCertType
+			Certno = res.Output.Baseinfo.Certno
+			PsnName = res.Output.Baseinfo.PsnName
+			Gend = res.Output.Baseinfo.Gend
+			Naty = res.Output.Baseinfo.Naty
+			Brdy = res.Output.Baseinfo.Brdy
+			Age = res.Output.Baseinfo.Age
+			Iinfos, _ := json.Marshal(res.Output.Iinfo)
+			Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+			infoStr = string(Iinfos)
+			idetinfoStr = string(Idetinfos)
 
-		Iinfos, _ := json.Marshal(res.Output.Iinfo)
-		Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-		infoStr := string(Iinfos)
-		idetinfoStr := string(Idetinfos)
+		}
 
 		if res.Infcode == 0 {
 			his := models.VMHisPatient{
@@ -1884,14 +1904,14 @@ func (c *HisApiController) GetRegisterInfo() {
 				Status:                 1,
 				Ctime:                  time.Now().Unix(),
 				Mtime:                  time.Now().Unix(),
-				PsnNo:                  res.Output.Baseinfo.PsnNo,
-				PsnCertType:            res.Output.Baseinfo.PsnCertType,
-				Certno:                 res.Output.Baseinfo.Certno,
-				PsnName:                res.Output.Baseinfo.PsnName,
-				Gend:                   res.Output.Baseinfo.Gend,
-				Naty:                   res.Output.Baseinfo.Naty,
-				Brdy:                   res.Output.Baseinfo.Brdy,
-				Age:                    res.Output.Baseinfo.Age,
+				PsnNo:                  PsnNo,
+				PsnCertType:            PsnCertType,
+				Certno:                 Certno,
+				PsnName:                PsnName,
+				Gend:                   Gend,
+				Naty:                   Naty,
+				Brdy:                   Brdy,
+				Age:                    Age,
 				Iinfo:                  infoStr,
 				Idetinfo:               idetinfoStr,
 				PatientId:              patient.ID,
@@ -5253,7 +5273,7 @@ func (c *HisApiController) GetSettleAccounts() {
 
 			api := "http://192.168.124.4:9532/" + "hbyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&med_type=" + order.MedType
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -5262,14 +5282,14 @@ func (c *HisApiController) GetSettleAccounts() {
 
 			body, ioErr := ioutil.ReadAll(resp.Body)
 			if ioErr != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				//utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 			var respJSON map[string]interface{}
 			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				//utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 
@@ -5278,11 +5298,15 @@ func (c *HisApiController) GetSettleAccounts() {
 			fmt.Println("log")
 			fmt.Println(string(result))
 			if err := json.Unmarshal([]byte(result), &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				//utils.ErrorLog("解析失败：%v", err)
+				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "成功",
+			})
+
 		} else {
 			result := service.Gdyb5203(baseParams, businessParams)
 			var dat map[string]interface{}
@@ -5297,97 +5321,97 @@ func (c *HisApiController) GetSettleAccounts() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-		}
 
-		printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-		charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
+			printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+			charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
 
-		patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, order.PatientId, order.SettleAccountsDate)
-		adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
+			patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, order.PatientId, order.SettleAccountsDate)
+			adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
-		roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+			roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 
-		var doctor_name string
-		if roles.ID == 0 {
-			doctor_name = "管理员"
-		} else {
-			doctor_name = roles.UserName
-		}
+			var doctor_name string
+			if roles.ID == 0 {
+				doctor_name = "管理员"
+			} else {
+				doctor_name = roles.UserName
+			}
 
-		yiliao_leibie := ""
+			yiliao_leibie := ""
 
-		switch order.MedType {
-		case "11":
-			yiliao_leibie = "普通门诊"
-			break
-		case "12":
-			yiliao_leibie = "门诊挂号"
-			break
-		case "13":
-			yiliao_leibie = "急诊"
-			break
-		case "14":
-			yiliao_leibie = "门诊特殊病"
-			break
-		case "15":
-			yiliao_leibie = "门诊统筹"
-			break
-		case "16":
-			yiliao_leibie = "门诊慢性病"
-			break
-		case "21":
-			yiliao_leibie = "普通住院"
-			break
-		}
-		departments, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+			switch order.MedType {
+			case "11":
+				yiliao_leibie = "普通门诊"
+				break
+			case "12":
+				yiliao_leibie = "门诊挂号"
+				break
+			case "13":
+				yiliao_leibie = "急诊"
+				break
+			case "14":
+				yiliao_leibie = "门诊特殊病"
+				break
+			case "15":
+				yiliao_leibie = "门诊统筹"
+				break
+			case "16":
+				yiliao_leibie = "门诊慢性病"
+				break
+			case "21":
+				yiliao_leibie = "普通住院"
+				break
+			}
+			departments, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
-		if res.Infcode == 0 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"diagnosis":                                   name,
-				"order_infos":                                 orderInfos,
-				"number":                                      order.MdtrtId,
-				"date":                                        order.SettleAccountsDate,
-				"charge_admin":                                charge_admin,
-				"printor_admin":                               printor_admin,
-				"info":                                        res.Output.Setlinfo,
-				"bedCostTotal":                                bedCostTotal,
-				"bedCostSelfTotal":                            bedCostSelfTotal,
-				"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
-				"operationCostTotal":                          operationCostTotal,
-				"operationCostSelfTotal":                      operationCostSelfTotal,
-				"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
-				"otherCostTotal":                              otherCostTotal,
-				"otherCostSelfTotal":                          otherCostSelfTotal,
-				"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
-				"materialCostTotal":                           materialCostTotal,
-				"materialCostSelfTotal":                       materialCostSelfTotal,
-				"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
-				"westernMedicineCostTotal":                    westernMedicineCostTotal,
-				"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
-				"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
-				"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
-				"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
-				"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
-				"checkCostTotal":                              checkCostTotal,
-				"checkCostSelfTotal":                          checkCostSelfTotal,
-				"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
-				"laboratoryCostTotal":                         laboratoryCostTotal,
-				"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
-				"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
-				"treatCostTotal":                              treatCostTotal,
-				"treatCostSelfTotal":                          treatCostSelfTotal,
-				"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
-				"doctor_code":                                 adminRole_two.DoctorCode,
-				"doctor_name":                                 doctor_name,
-				"health_card_no":                              order.PsnNo,
-				"department":                                  departments.Name,
-				"yiliao_leibie":                               yiliao_leibie,
-				"after_money":                                 order.AccountPrice,
-				"patient":                                     patient,
-				"org_name":                                    miConfig.OrgName,
-				"org_code":                                    miConfig.Code,
-				"order_number":                                order.Number,
-			})
+			if res.Infcode == 0 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"diagnosis":                                   name,
+					"order_infos":                                 orderInfos,
+					"number":                                      order.MdtrtId,
+					"date":                                        order.SettleAccountsDate,
+					"charge_admin":                                charge_admin,
+					"printor_admin":                               printor_admin,
+					"info":                                        res.Output.Setlinfo,
+					"bedCostTotal":                                bedCostTotal,
+					"bedCostSelfTotal":                            bedCostSelfTotal,
+					"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
+					"operationCostTotal":                          operationCostTotal,
+					"operationCostSelfTotal":                      operationCostSelfTotal,
+					"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
+					"otherCostTotal":                              otherCostTotal,
+					"otherCostSelfTotal":                          otherCostSelfTotal,
+					"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
+					"materialCostTotal":                           materialCostTotal,
+					"materialCostSelfTotal":                       materialCostSelfTotal,
+					"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
+					"westernMedicineCostTotal":                    westernMedicineCostTotal,
+					"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
+					"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
+					"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
+					"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
+					"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
+					"checkCostTotal":                              checkCostTotal,
+					"checkCostSelfTotal":                          checkCostSelfTotal,
+					"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
+					"laboratoryCostTotal":                         laboratoryCostTotal,
+					"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
+					"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
+					"treatCostTotal":                              treatCostTotal,
+					"treatCostSelfTotal":                          treatCostSelfTotal,
+					"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
+					"doctor_code":                                 adminRole_two.DoctorCode,
+					"doctor_name":                                 doctor_name,
+					"health_card_no":                              order.PsnNo,
+					"department":                                  departments.Name,
+					"yiliao_leibie":                               yiliao_leibie,
+					"after_money":                                 order.AccountPrice,
+					"patient":                                     patient,
+					"org_name":                                    miConfig.OrgName,
+					"org_code":                                    miConfig.Code,
+					"order_number":                                order.Number,
+				})
+			}
 		}
 	}
 

models/his_models.go

@@ -1262,3 +1262,23 @@ type NewCustom struct {
 	LmtUsedFlag      int64
 	HospApprFlag     int64
 }
+
+type HisPsn struct {
+	ID          int64   `gorm:"column:id" json:"id" form:"id"`
+	PsnNo       string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	Age         float64 `gorm:"column:age" json:"age" form:"age"`
+	PatientId   int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Certno      string  `gorm:"column:certno" json:"certno" form:"certno"`
+	Brdy        string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Gend        string  `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty        string  `gorm:"column:naty" json:"naty" form:"naty"`
+	PsnCertType string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	PsnName     string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Idetinfo    string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	Insuinfo    string  `gorm:"column:insuinfo" json:"insuinfo" form:"insuinfo"`
+	UserOrgId   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+}
+
+func (HisPsn) TableName() string {
+	return "his_psn"
+}

service/hbyb_service.go

@@ -621,7 +621,7 @@ func Hbyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 
 }
 
-func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams) string {
+func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams, med_type string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -630,10 +630,12 @@ func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "5203" // 交易编码
+	inputMessage["infno"] = "YH03" // 交易编码
 	inputData["psn_no"] = businessParams.PsnNo
 	inputData["setl_id"] = businessParams.SetlId
 	inputData["mdtrt_id"] = businessParams.MdtrtId
+	inputData["med_type"] = med_type
+
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)

service/his_service.go

@@ -1330,3 +1330,12 @@ func GetOrderCountByNumber(org_id int64, patient_id int64, record_time int64, nu
 
 	return
 }
+
+func CreateHisPsn(psn *models.HisPsn) {
+	writeDb.Save(&psn)
+}
+
+func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
+	err = readDb.Model(&models.HisPsn{}).Where("patient_id = ?", patient_id).Last(&psn).Error
+	return
+}