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

routers/router.go

@@ -2,7 +2,6 @@ package routers
 
 import (
 	"gdyb/controllers/sz"
-
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"

service/gdyb_service.go

@@ -1200,9 +1200,9 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "5203" // 交易编码
-	inputData["psn_no"] = "44020000001104246641"
-	inputData["setl_id"] = "3029927"
-	inputData["mdtrt_id"] = "3966681"
+	inputData["psn_no"] = businessParams.PsnNo
+	inputData["setl_id"] = businessParams.SetlId
+	inputData["mdtrt_id"] = businessParams.MdtrtId
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)

service/his_service.go

@@ -685,6 +685,11 @@ func UpDateOrder(order models.HisOrder) (err error) {
 	return
 }
 
+func UpDateOrderTwo(order *models.HisOrder) (err error) {
+	err = writeDb.Save(&order).Error
+	return
+}
+
 func UpdataOrderStatusTwo(number string, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 2, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 3, "mtime": time.Now().Unix()}).Error

service/sz_his_service.go

@@ -607,7 +607,6 @@ func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedru
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "JY003" // 交易编码
 
-	inputData["listsize"] = 1
 	inputMessage["transType"] = "ML008" // 交易编码S
 	feedetail := make([]map[string]interface{}, 0)
 	feedetailInfo := make(map[string]interface{})
@@ -708,7 +707,7 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *mo
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
-	inputData["listsize"] = 1
+
 	inputMessage["transType"] = "ML009" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
@@ -836,8 +835,8 @@ func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas [
 	for _, item := range datas {
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["ake003"] = strconv.FormatInt(typeId, 10)
-		feedetailInfo["ake001"] = item.SocialSecurityDirectoryCode //社保目录编码
-		feedetailInfo["ake005"] = item.SocialSecurityDirectoryCode //协议机构内部目录编码
+		feedetailInfo["ake001"] = item.MedicalInsuranceNumber //社保目录编码
+		feedetailInfo["ake005"] = item.MedicalInsuranceNumber //协议机构内部目录编码
 		feedetail = append(feedetail, feedetailInfo)
 	}
 
@@ -879,55 +878,58 @@ func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas [
 
 }
 
-func SzybYS001(doctor string, doctor_code string, fixmedins_code string, doc *models.DocDetail) string {
+func SzybYS001(doctor string, doctor_code string, fixmedins_code string, datas []*models.DocDetail) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
 
-	inputData["listsize"] = 1
+	inputData["listsize"] = len(datas)
 	inputMessage["transType"] = "YS001" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
-	feedetailInfo := make(map[string]interface{})
-	feedetailInfo["aac003"] = doc.UserName                                //医护人员姓名
-	feedetailInfo["bka633"] = "1"                                         //医护人员类别
-	feedetailInfo["aac004"] = doc.Sex                                     //性别
-	feedetailInfo["aac058"] = doc.CardType                                //证件类型
-	feedetailInfo["aac147"] = doc.IdCard                                  //证件号码
-	feedetailInfo["aae005"] = doc.Phone                                   //联系电话
-	feedetailInfo["bkc322"] = doc.WorkMajorName                           //现从事专业名称
-	feedetailInfo["aac005"] = doc.Nation                                  //民族
-	feedetailInfo["aac006"] = doc.BirthDay                                //出生日期
-	feedetailInfo["aac007"] = doc.WorkTime                                //参加工作日期
-	feedetailInfo["aac011"] = doc.Education                               //学历
-	feedetailInfo["aac183"] = doc.StudyMajorName                          //所学的专业名称
-	feedetailInfo["bkc323"] = doc.CertificateCode                         //医（药）师执业证书编码
-	feedetailInfo["bke955"] = doc.MedicalCode                             //医（药）师资格证编码
-	feedetailInfo["akc055"] = doc.MedicalRangeCode                        //	医师执业范围代码
-	feedetailInfo["bcc950"] = doc.MedicalLevel                            //医生执业资格证中的医师级别
-	feedetailInfo["bcc955"] = doc.TypeJob                                 //医生执业资格证中的执业类别
-	feedetailInfo["bka503"] = doc.DoctorNumber                            //医保医师编号
-	feedetailInfo["bkc324"] = doc.Licensing                               //多点执业标志
-	feedetailInfo["bkc326"] = doc.DoctorServiceStatus                     //医师医保服务资格状态
-	feedetailInfo["bkc328"] = doc.MonitoringLevel                         //监控等级
-	feedetailInfo["bkc329"] = doc.DrugPsychotropicSubstances              //毒麻精神药品资格
-	feedetailInfo["bke801"] = doc.HealthCareCode                          //母婴保健技术考核合格证书编号
-	feedetailInfo["bkc330"] = doc.PlanningTechnicalServiceCode            //bkc330	计划生育技术服务人员合格证编号
-	feedetailInfo["bkc332"] = doc.PharmacistType                          //药师类别
-	feedetailInfo["bkc333"] = doc.PharmacistPracticeCategory              //药师执业类别
-	feedetailInfo["bkc334"] = doc.PharmacistsLicensing                    //药师执业范围
-	feedetailInfo["bkc335"] = doc.PharmacistRegistrationNumber            //执业药师注册证编号
-	feedetailInfo["akf001"] = doc.OfficeCode                              //所属科室编码
-	feedetailInfo["acc501"] = doc.JobNumber                               //工号
-	feedetailInfo["ahc451"] = doc.PostName                                //职务名称
-	feedetailInfo["aaf009"] = doc.TechnicalJobLevelCode                   //专业技术职务级别编码
-	feedetailInfo["bkc321"] = doc.IsActive                                //在职与否
-	feedetailInfo["ckc302"] = doc.PrescriptionQualificationIdentification //处方资格标识
-	feedetailInfo["bkc325"] = doc.IdentificationOutpatients               //门诊大病医师 标识
-	feedetailInfo["ckc304"] = doc.OutpatientIllnessCategory               //门诊大病类别
-	feedetailInfo["aae030"] = doc.StartTime                               //开始日期
-	feedetail = append(feedetail, feedetailInfo)
+	for _, item := range datas {
+		fmt.Println("item222222", item.RoleId)
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["aac003"] = item.UserName
+		feedetailInfo["bka633"] = "1"
+		feedetailInfo["aac004"] = item.Sex
+		feedetailInfo["aac058"] = item.CardType
+		feedetailInfo["aac147"] = item.IdCard
+		feedetailInfo["aae005"] = item.Phone
+		feedetailInfo["bkc322"] = item.WorkMajorName
+		feedetailInfo["aac005"] = item.Nation
+		feedetailInfo["aac006"] = item.BirthDay
+		feedetailInfo["aac007"] = item.WorkTime
+		feedetailInfo["aac011"] = item.Education
+		feedetailInfo["aac183"] = item.StudyMajorName
+		feedetailInfo["bkc323"] = item.CertificateCode
+		feedetailInfo["bke955"] = item.MedicalCode
+		feedetailInfo["akc055"] = item.MedicalRangeCode
+		feedetailInfo["bcc950"] = item.MedicalLevel
+		feedetailInfo["bcc955"] = item.TypeJob
+		feedetailInfo["bka503"] = item.DoctorNumber
+		feedetailInfo["bkc324"] = item.Licensing
+		feedetailInfo["bkc326"] = item.DoctorServiceStatus
+		feedetailInfo["bkc328"] = item.MonitoringLevel
+		feedetailInfo["bkc329"] = item.DrugPsychotropicSubstances
+		feedetailInfo["bke801"] = item.HealthCareCode
+		feedetailInfo["bkc330"] = item.PlanningTechnicalServiceCode
+		feedetailInfo["bkc332"] = item.PharmacistType
+		feedetailInfo["bkc333"] = item.PharmacistPracticeCategory
+		feedetailInfo["bkc334"] = item.PharmacistsLicensing
+		feedetailInfo["bkc335"] = item.PharmacistRegistrationNumber
+		feedetailInfo["akf001"] = item.OfficeCode
+		feedetailInfo["acc501"] = item.JobNumber
+		feedetailInfo["ahc451"] = item.PostName
+		feedetailInfo["aaf009"] = item.TechnicalJobLevelCode
+		feedetailInfo["bkc321"] = item.IsActive
+		feedetailInfo["ckc302"] = item.PrescriptionQualificationIdentification
+		feedetailInfo["bkc325"] = item.IdentificationOutpatients
+		feedetailInfo["ckc304"] = item.OutpatientIllnessCategory
+		feedetailInfo["aae030"] = item.StartTime
+		feedetail = append(feedetail, feedetailInfo)
+	}
 
 	inputData["inputlist"] = feedetail
 	inputMessage["transBody"] = inputData
@@ -967,112 +969,24 @@ func SzybYS001(doctor string, doctor_code string, fixmedins_code string, doc *mo
 
 }
 
-//func SzybYS001(doctor string, doctor_code string, fixmedins_code string, datas []*models.DocDetail) string {
-//	//生成输入报文
-//	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
-//
-//	inputData := make(map[string]interface{})
-//
-//	inputData["listsize"] = len(datas)
-//	inputMessage["transType"] = "YS001" // 交易编码
-//	feedetail := make([]map[string]interface{}, 0)
-//
-//	for _, item := range datas {
-//		fmt.Println("item222222", item.RoleId)
-//		feedetailInfo := make(map[string]interface{})
-//		feedetailInfo["aac003"] = item.UserName
-//		feedetailInfo["bka633"] = "1"
-//		feedetailInfo["aac004"] = item.Sex
-//		feedetailInfo["aac058"] = item.CardType
-//		feedetailInfo["aac147"] = item.IdCard
-//		feedetailInfo["aae005"] = item.Phone
-//		feedetailInfo["bkc322"] = item.WorkMajorName
-//		feedetailInfo["aac005"] = item.Nation
-//		feedetailInfo["aac006"] = item.BirthDay
-//		feedetailInfo["aac007"] = item.WorkTime
-//		feedetailInfo["aac011"] = item.Education
-//		feedetailInfo["aac183"] = item.StudyMajorName
-//		feedetailInfo["bkc323"] = item.CertificateCode
-//		feedetailInfo["bke955"] = item.MedicalCode
-//		feedetailInfo["akc055"] = item.MedicalRangeCode
-//		feedetailInfo["bcc950"] = item.MedicalLevel
-//		feedetailInfo["bcc955"] = item.TypeJob
-//		feedetailInfo["bka503"] = item.DoctorNumber
-//		feedetailInfo["bkc324"] = item.Licensing
-//		feedetailInfo["bkc326"] = item.DoctorServiceStatus
-//		feedetailInfo["bkc328"] = item.MonitoringLevel
-//		feedetailInfo["bkc329"] = item.DrugPsychotropicSubstances
-//		feedetailInfo["bke801"] = item.HealthCareCode
-//		feedetailInfo["bkc330"] = item.PlanningTechnicalServiceCode
-//		feedetailInfo["bkc332"] = item.PharmacistType
-//		feedetailInfo["bkc333"] = item.PharmacistPracticeCategory
-//		feedetailInfo["bkc334"] = item.PharmacistsLicensing
-//		feedetailInfo["bkc335"] = item.PharmacistRegistrationNumber
-//		feedetailInfo["akf001"] = item.OfficeCode
-//		feedetailInfo["acc501"] = item.JobNumber
-//		feedetailInfo["ahc451"] = item.PostName
-//		feedetailInfo["aaf009"] = item.TechnicalJobLevelCode
-//		feedetailInfo["bkc321"] = item.IsActive
-//		feedetailInfo["ckc302"] = item.PrescriptionQualificationIdentification
-//		feedetailInfo["bkc325"] = item.IdentificationOutpatients
-//		feedetailInfo["ckc304"] = item.OutpatientIllnessCategory
-//		feedetailInfo["aae030"] = item.StartTime
-//		feedetail = append(feedetail, feedetailInfo)
-//	}
-//
-//	inputData["inputlist"] = feedetail
-//	inputMessage["transBody"] = inputData
-//
-//	bytesData, err := json.Marshal(inputMessage)
-//	fmt.Println(string(bytesData))
-//	if err != nil {
-//		fmt.Println(err.Error())
-//		return err.Error()
-//	}
-//	reader := bytes.NewReader(bytesData)
-//	//url := "http://192.168.1.99:10000"
-//	url := "http://192.168.1.228:17001/szsi-portal/transData"
-//
-//	request, err := http.NewRequest("POST", url, reader)
-//	if err != nil {
-//		fmt.Println(err.Error())
-//		return err.Error()
-//	}
-//
-//	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-//
-//	client := http.Client{}
-//	resp, err := client.Do(request)
-//	if err != nil {
-//		fmt.Println(err.Error())
-//		return err.Error()
-//	}
-//	respBytes, err := ioutil.ReadAll(resp.Body)
-//	if err != nil {
-//		fmt.Println(err.Error())
-//		return err.Error()
-//	}
-//	fmt.Println(string(respBytes))
-//	str := string(respBytes)
-//	return str
-//
-//}
-
-func SzybYS002(doctor string, doctor_code string, fixmedins_code string, datas *models.DocDetail) string {
+func SzybYS002(doctor string, doctor_code string, fixmedins_code string, datas []*models.DocDetail) string {
 
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
 
-	inputData["listsize"] = 1
+	inputData["listsize"] = len(datas)
 	inputMessage["transType"] = "YS002" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
-	feedetailInfo := make(map[string]interface{})
-	feedetailInfo["bkc320"] = datas.DoctorNumber
-	feedetailInfo["bke155"] = "4"
-	feedetail = append(feedetail, feedetailInfo)
+	for _, item := range datas {
+		fmt.Println("item2222", item)
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["bkc320"] = "H27224269"
+		feedetailInfo["bke155"] = "4"
+		feedetail = append(feedetail, feedetailInfo)
+	}
 
 	inputData["inputlist"] = feedetail
 	inputMessage["transBody"] = inputData
@@ -1209,23 +1123,24 @@ func SzybYML007(doctor string, doctor_code string, fixmedins_code string, infor
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
-	inputData["listsize"] = 1
+
 	inputMessage["transType"] = "ML007" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
 	feedetailInfo := make(map[string]interface{})
 	feedetailInfo["ake001"] = infor.SocialSecurityDirectoryCode // 社保目录编码
-
+	//feedetailInfo["ake001"] = "3333333333" // 社保目录编码
 	feedetailInfo["ake005"] = infor.SocialSecurityDirectoryCode //协议机构内部目录编码
-	feedetailInfo["ake006"] = infor.GoodName                    //医药机构内部目录名称
-	feedetailInfo["bka053"] = infor.ManufacturerName            //生产厂家
-	feedetailInfo["ake004"] = infor.ProductionType              //生产地类别
-	feedetailInfo["ckf261"] = infor.SpecialMedical              //特殊医用材料标识
-	feedetailInfo["aka067"] = "支"                               //计价单位
-	feedetailInfo["aka074"] = infor.SpecificationName           //规格
-	feedetailInfo["bka505"] = infor.BuyPrice                    //进货价
-	feedetailInfo["bka506"] = infor.SellPrice                   // 收获价
-	feedetailInfo["aae013"] = infor.Remark                      //备注
+	//feedetailInfo["ake006"] = item.GoodName                    //医药机构内部目录名称
+	feedetailInfo["ake006"] = "222222"                //医药机构内部目录名称
+	feedetailInfo["bka053"] = infor.ManufacturerName  //生产厂家
+	feedetailInfo["ake004"] = infor.ProductionType    //生产地类别
+	feedetailInfo["ckf261"] = infor.SpecialMedical    //特殊医用材料标识
+	feedetailInfo["aka067"] = "支"                     //计价单位
+	feedetailInfo["aka074"] = infor.SpecificationName //规格
+	feedetailInfo["bka505"] = infor.BuyPrice          //进货价
+	feedetailInfo["bka506"] = infor.SellPrice         // 收获价
+	feedetailInfo["aae013"] = infor.Remark            //备注
 	feedetail = append(feedetail, feedetailInfo)
 
 	inputData["inputlist"] = feedetail
@@ -1370,14 +1285,14 @@ func UpdateDrugByIdDetail(id int64) (models.XtBaseDrug, error) {
 	return drug, err
 }
 
-func UpdateGoodInformaitonByDetail(id int64) (models.MyGoodInformation, error) {
-	information := models.MyGoodInformation{}
+func UpdateGoodInformaitonByDetail(id int64) (models.XtGoodInformation, error) {
+	information := models.XtGoodInformation{}
 	err := XTWriteDB().Model(&information).Where("id=?", id).Updates(map[string]interface{}{"is_mark": 1}).Error
 	return information, err
 }
 
-func UpdateGoodInfoById(id int64) (models.MyGoodInformation, error) {
-	information := models.MyGoodInformation{}
+func UpdateGoodInfoById(id int64) (models.XtGoodInformation, error) {
+	information := models.XtGoodInformation{}
 	err := XTWriteDB().Model(&information).Where("id=?", id).Updates(map[string]interface{}{"is_mark": 0}).Error
 	return information, err
 }
@@ -1394,9 +1309,8 @@ func UpdateMyProjectById(id int64) (models.MyHisProject, error) {
 	return project, err
 }
 
-func UpdateAdminUserRoleById(id int64) (models.MySgjUserAdminRole, error) {
-
-	role := models.MySgjUserAdminRole{}
-	err = UserWriteDB().Model(&role).Where("admin_user_id = ?", id).Updates(map[string]interface{}{"is_mark = ?": 1}).Error
-	return role, err
+func UpdataOrderInfoStatus(id int64, number string, user_org_id int64) {
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+	err = writeDb.Model(&models.HisOrderInfo{}).Where("status = 1 AND user_org_id = ? AND order_number = ?", user_org_id, number).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+	return
 }