1111

controllers/sz/sz_his_api_controller.go

@@ -793,10 +793,13 @@ func (c *SZHisApiController) GetUploadInfo() {
 					_, dose_code := service.GetDoseCode(subItem.BaseDrugLib.DrugDosageForm, adminUser.CurrentOrgId)
 					detItemFeeSumamt, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber), 64)
 					price, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price), 64)
+					temp := strings.Split(subItem.FeedetlSn, "-")
+					newFl := fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) + "-" + temp[1] + "-" + temp[2]
+
 					cus := &models.CustomDetail{
 						PrescriptionNumber: chrg_bchno,
 						OrderType:          "1",
-						ChargeSerialNumber: subItem.FeedetlSn,
+						ChargeSerialNumber: newFl,
 						Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
 						CodeName:           subItem.BaseDrugLib.DrugName,
 						Flag:               "1",
@@ -819,11 +822,13 @@ func (c *SZHisApiController) GetUploadInfo() {
 					detItemFeeSumamt, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)), 64)
 
 					count, _ := strconv.ParseFloat(fmt.Sprintf("%f", subItem.Count), 64)
+					temp := strings.Split(subItem.FeedetlSn, "-")
+					newFl := fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) + "-" + temp[1] + "-" + temp[2]
 
 					cus := &models.CustomDetail{
 						PrescriptionNumber: chrg_bchno,
 						OrderType:          "1",
-						ChargeSerialNumber: subItem.FeedetlSn,
+						ChargeSerialNumber: newFl,
 						Code:               subItem.HisProject.MedicalCode,
 						CodeName:           subItem.HisProject.ProjectName,
 						Flag:               "1",
@@ -988,7 +993,7 @@ func (c *SZHisApiController) GetUploadInfo() {
 
 				info := &models.HisOrderInfo{
 					OrderNumber:      order.Number,
-					FeedetlSn:        item.Aae072,
+					FeedetlSn:        item.Bkf500,
 					UploadDate:       time.Now().Unix(),
 					AdviceId:         advice_id,
 					DetItemFeeSumamt: item.Akc264,
@@ -1130,6 +1135,11 @@ func (c *SZHisApiController) GetSettleInfo() {
 
 	order_src, _ := service.GetHisOrderByID(order_id)
 
+	if order_src.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
+		return
+	}
+
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		if order_src.OrderStatus != 2 {
@@ -1538,6 +1548,7 @@ func (c *SZHisApiController) CancelOrderDetail() {
 		}
 		customs = append(customs, cus)
 	}
+	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 
 	verifyCode, version_code := ReadCardGetCode("FY002" + "|" + order.OrgSetlNumber + "|" + miConfig.Code)
 
@@ -1563,7 +1574,7 @@ func (c *SZHisApiController) CancelOrderDetail() {
 			stop = len(customs)
 		}
 
-		result := service.SzybFY002(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop], verifyCode, order.OrgSetlNumber, order.MzNumber, version_code)
+		result := service.SzybFY002(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop], verifyCode, order.OrgSetlNumber, his.Number, version_code)
 		fmt.Println(result)
 
 		var dat map[string]interface{}
@@ -1604,6 +1615,7 @@ func (c *SZHisApiController) CancelOrderDetail() {
 		}
 	}
 	if isSuccess == true {
+		service.UpdataOrderInfoStatus(order.ID, order.Number, adminUser.CurrentOrgId)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "撤销成功",
 		})
@@ -1776,15 +1788,15 @@ func (c *SZHisApiController) GetDrugList() {
 			detail := &models.DrugDetail{
 
 				MedicalInsuranceNumber: item.MedicalInsuranceNumber,
-				Code:                   item.Code,
-				DrugName:               item.DrugName,
-				DrugSpec:               item.DrugSpec,
-				DrugDosageName:         item.DrugDosageName,
-				ManufacturerName:       item.ManufacturerName,
-				MinUnit:                item.MinUnit,
-				RetailPrice:            item.RetailPrice,
-				LastPrice:              item.LastPrice,
-				LimitRemark:            item.LimitRemark,
+				Code:             item.Code,
+				DrugName:         item.DrugName,
+				DrugSpec:         item.DrugSpec,
+				DrugDosageName:   item.DrugDosageName,
+				ManufacturerName: item.ManufacturerName,
+				MinUnit:          item.MinUnit,
+				RetailPrice:      item.RetailPrice,
+				LastPrice:        item.LastPrice,
+				LimitRemark:      item.LimitRemark,
 			}
 			customs = append(customs, detail)
 		}
@@ -1948,13 +1960,13 @@ func (c *SZHisApiController) GetRevocation() {
 				detail := &models.DrugDetail{
 
 					MedicalInsuranceNumber: item.MedicalInsuranceNumber, //社保目录
-					Code:                   item.Code,                   //协议机构内部目录编码
-					DrugName:               item.DrugName,               //协议机构内部目录名称
-					DrugSpec:               item.DrugSpec,
-					ManufacturerName:       item.ManufacturerName,
-					MinUnit:                item.MinUnit,
-					RetailPrice:            item.RetailPrice, //协议机构内部项目收费价格
-					LimitRemark:            item.LimitRemark,
+					Code:             item.Code,     //协议机构内部目录编码
+					DrugName:         item.DrugName, //协议机构内部目录名称
+					DrugSpec:         item.DrugSpec,
+					ManufacturerName: item.ManufacturerName,
+					MinUnit:          item.MinUnit,
+					RetailPrice:      item.RetailPrice, //协议机构内部项目收费价格
+					LimitRemark:      item.LimitRemark,
 				}
 				customs = append(customs, detail)
 			}
@@ -2226,43 +2238,43 @@ func (c *SZHisApiController) GetDoctorList() {
 			is_active := strconv.FormatInt(item.IsActive, 10)
 
 			detail := &models.DocDetail{
-				UserName:                                item.UserName,
-				RoleId:                                  item.Name,
-				Sex:                                     sex,
-				CardType:                                card_type,
-				IdCard:                                  item.IdCard,
-				Phone:                                   "",
-				WorkMajorName:                           item.WorkMajorName,
-				Nation:                                  item.Nation,
-				BirthDay:                                20201022,
-				WorkTime:                                12,
-				Education:                               strconv.FormatInt(item.Education, 10),
-				StudyMajorName:                          item.StudyMajorName,
-				CertificateCode:                         "",                                           //证书编码
-				MedicalCode:                             item.MedicalCode,                             //医师资格编码
-				MedicalRangeCode:                        strconv.FormatInt(item.MedicalRangeCode, 10), //医师执业范围代码
-				MedicalLevel:                            strconv.FormatInt(item.MedicalLevel, 10),     //医生级别
-				TypeJob:                                 strconv.FormatInt(item.DoctorTypeJob, 10),    //职业类别
-				DoctorNumber:                            item.DoctorNumber,                            //医师编号
-				Licensing:                               strconv.FormatInt(item.Licensing, 10),        //职业标志
-				DoctorServiceStatus:                     "",                                           //医师医保服务资格状态
-				MonitoringLevel:                         "",                                           //监控等级
-				DrugPsychotropicSubstances:              "",                                           //毒麻精神药品资格
-				HealthCareCode:                          "",                                           // 母婴保健技术考核合格证书编号
-				PlanningTechnicalServiceCode:            "",                                           //计划生育技术服务人员合格证编号
-				PharmacistType:                          "",                                           //药师类别
-				PharmacistPracticeCategory:              "",                                           //药师执业类别
-				PharmacistsLicensing:                    "",                                           //药师执业范围
-				PharmacistRegistrationNumber:            item.PharmacistRegistrationNumber,            //执业药师注册证编号
-				OfficeCode:                              "",                                           //科室编码
-				JobNumber:                               item.JobNumber,                               //工号
-				PostName:                                "",                                           //职位名称
-				TechnicalJobLevelCode:                   "",                                           //专业技术职务级别编码
-				IsActive:                                is_active,                                    //在职与否
-				PrescriptionQualificationIdentification: item.PharmacistRegistrationNumber,            //处方资格标识
-				IdentificationOutpatients:               "",                                           //门诊大病医师标识
-				OutpatientIllnessCategory:               item.OutpatientIllnessCategory,               //门诊大病类别
-				StartTime:                               1233,                                         //开始日期
+				UserName:                     item.UserName,
+				RoleId:                       item.Name,
+				Sex:                          sex,
+				CardType:                     card_type,
+				IdCard:                       item.IdCard,
+				Phone:                        "",
+				WorkMajorName:                item.WorkMajorName,
+				Nation:                       item.Nation,
+				BirthDay:                     20201022,
+				WorkTime:                     12,
+				Education:                    strconv.FormatInt(item.Education, 10),
+				StudyMajorName:               item.StudyMajorName,
+				CertificateCode:              "",                                           //证书编码
+				MedicalCode:                  item.MedicalCode,                             //医师资格编码
+				MedicalRangeCode:             strconv.FormatInt(item.MedicalRangeCode, 10), //医师执业范围代码
+				MedicalLevel:                 strconv.FormatInt(item.MedicalLevel, 10),     //医生级别
+				TypeJob:                      strconv.FormatInt(item.DoctorTypeJob, 10),    //职业类别
+				DoctorNumber:                 item.DoctorNumber,                            //医师编号
+				Licensing:                    strconv.FormatInt(item.Licensing, 10),        //职业标志
+				DoctorServiceStatus:          "",                                           //医师医保服务资格状态
+				MonitoringLevel:              "",                                           //监控等级
+				DrugPsychotropicSubstances:   "",                                           //毒麻精神药品资格
+				HealthCareCode:               "",                                           // 母婴保健技术考核合格证书编号
+				PlanningTechnicalServiceCode: "",                                           //计划生育技术服务人员合格证编号
+				PharmacistType:               "",                                           //药师类别
+				PharmacistPracticeCategory:   "",                                           //药师执业类别
+				PharmacistsLicensing:         "",                                           //药师执业范围
+				PharmacistRegistrationNumber: item.PharmacistRegistrationNumber,            //执业药师注册证编号
+				OfficeCode:                   "",                                           //科室编码
+				JobNumber:                    item.JobNumber,                               //工号
+				PostName:                     "",                                           //职位名称
+				TechnicalJobLevelCode:        "",                                           //专业技术职务级别编码
+				IsActive:                     is_active,                                    //在职与否
+				PrescriptionQualificationIdentification: item.PharmacistRegistrationNumber, //处方资格标识
+				IdentificationOutpatients:               "",                                //门诊大病医师标识
+				OutpatientIllnessCategory:               item.OutpatientIllnessCategory,    //门诊大病类别
+				StartTime:                               1233,                              //开始日期
 			}
 			customs = append(customs, detail)
 		}
@@ -2350,44 +2362,44 @@ func (c *SZHisApiController) GetMedicalList() {
 		for _, item := range list {
 			fmt.Println("医护类别", item.Name)
 			detail := &models.DocDetail{
-				StaffCode:                               "H27224269",
-				UserName:                                item.UserName,
-				RoleId:                                  item.Name,
-				Sex:                                     "1",
-				CardType:                                "01",
-				IdCard:                                  "430526199408156511",
-				Phone:                                   "13318464642",
-				WorkMajorName:                           "医生",
-				Nation:                                  "01",
-				BirthDay:                                20201022,
-				WorkTime:                                20201022,
-				Education:                               "21",
-				StudyMajorName:                          "医生",
-				CertificateCode:                         "y2222222", //证书编码
-				MedicalCode:                             "y2222222", //医师资格编码
-				MedicalRangeCode:                        "101",      //医师执业范围代码
-				MedicalLevel:                            "1",        //医生级别
-				TypeJob:                                 "1",        //职业类别
-				DoctorNumber:                            "22222",    //医师编号b
-				Licensing:                               "1",        //职业标志
-				DoctorServiceStatus:                     "1",        //医师医保服务资格状态
-				MonitoringLevel:                         "1",        //监控等级
-				DrugPsychotropicSubstances:              "1",        //毒麻精神药品资格
-				HealthCareCode:                          "1001",     // 母婴保健技术考核合格证书编号
-				PlanningTechnicalServiceCode:            "1002",     //计划生育技术服务人员合格证编号
-				PharmacistType:                          "1",        //药师类别
-				PharmacistPracticeCategory:              "1",        //药师执业类别
-				PharmacistsLicensing:                    "1",        //药师执业范围
-				PharmacistRegistrationNumber:            "000200",   //执业药师注册证编号
-				OfficeCode:                              "9933",     //科室编码
-				JobNumber:                               "82021344", //工号
-				PostName:                                "主任",       //职位名称
-				TechnicalJobLevelCode:                   "231",      //专业技术职务级别编码
-				IsActive:                                "1",        //在职与否
-				PrescriptionQualificationIdentification: "1",        //处方资格标识
-				IdentificationOutpatients:               "1",        //门诊大病医师标识
-				OutpatientIllnessCategory:               "血友病",      //门诊大病类别
-				StartTime:                               20210311,   //开始日期
+				StaffCode:                    "H27224269",
+				UserName:                     item.UserName,
+				RoleId:                       item.Name,
+				Sex:                          "1",
+				CardType:                     "01",
+				IdCard:                       "430526199408156511",
+				Phone:                        "13318464642",
+				WorkMajorName:                "医生",
+				Nation:                       "01",
+				BirthDay:                     20201022,
+				WorkTime:                     20201022,
+				Education:                    "21",
+				StudyMajorName:               "医生",
+				CertificateCode:              "y2222222", //证书编码
+				MedicalCode:                  "y2222222", //医师资格编码
+				MedicalRangeCode:             "101",      //医师执业范围代码
+				MedicalLevel:                 "1",        //医生级别
+				TypeJob:                      "1",        //职业类别
+				DoctorNumber:                 "22222",    //医师编号b
+				Licensing:                    "1",        //职业标志
+				DoctorServiceStatus:          "1",        //医师医保服务资格状态
+				MonitoringLevel:              "1",        //监控等级
+				DrugPsychotropicSubstances:   "1",        //毒麻精神药品资格
+				HealthCareCode:               "1001",     // 母婴保健技术考核合格证书编号
+				PlanningTechnicalServiceCode: "1002",     //计划生育技术服务人员合格证编号
+				PharmacistType:               "1",        //药师类别
+				PharmacistPracticeCategory:   "1",        //药师执业类别
+				PharmacistsLicensing:         "1",        //药师执业范围
+				PharmacistRegistrationNumber: "000200",   //执业药师注册证编号
+				OfficeCode:                   "9933",     //科室编码
+				JobNumber:                    "82021344", //工号
+				PostName:                     "主任",       //职位名称
+				TechnicalJobLevelCode:        "231",      //专业技术职务级别编码
+				IsActive:                     "1",        //在职与否
+				PrescriptionQualificationIdentification: "1",      //处方资格标识
+				IdentificationOutpatients:               "1",      //门诊大病医师标识
+				OutpatientIllnessCategory:               "血友病",    //门诊大病类别
+				StartTime:                               20210311, //开始日期
 
 			}
 			customs = append(customs, detail)
@@ -2473,44 +2485,44 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 		for _, item := range list {
 			fmt.Println("医护类别", item.Name)
 			detail := &models.DocDetail{
-				StaffCode:                               "",            //医护人员编码
-				UserName:                                item.UserName, //医护人员姓名
-				RoleId:                                  item.Name,     //医护人员类别
-				Sex:                                     "",            //性别
-				CardType:                                "",            //证件类型
-				IdCard:                                  "",            //证件号码
-				Phone:                                   "",            //联系电话
-				WorkMajorName:                           "",            //现从事专业名称
-				Nation:                                  "",            //民族
-				BirthDay:                                20201022,      //出生日期
-				WorkTime:                                12,            //参加工作日期
-				Education:                               "",            //学历
-				StudyMajorName:                          "",            //所学的专业名称
-				CertificateCode:                         "",            //证书编码
-				MedicalCode:                             "",            //医师资格编码
-				MedicalRangeCode:                        "",            //医师执业范围代码
-				MedicalLevel:                            "",            //医生级别
-				TypeJob:                                 "",            //职业类别
-				DoctorNumber:                            "",            //医师编号
-				Licensing:                               "",            //职业标志
-				DoctorServiceStatus:                     "",            //医师医保服务资格状态
-				MonitoringLevel:                         "",            //监控等级
-				DrugPsychotropicSubstances:              "",            //毒麻精神药品资格
-				HealthCareCode:                          "",            // 母婴保健技术考核合格证书编号
-				PlanningTechnicalServiceCode:            "",            //计划生育技术服务人员合格证编号
-				PharmacistType:                          "",            //药师类别
-				PharmacistPracticeCategory:              "",            //药师执业类别
-				PharmacistsLicensing:                    "",            //药师执业范围
-				PharmacistRegistrationNumber:            "",            //执业药师注册证编号
-				OfficeCode:                              "",            //科室编码
-				JobNumber:                               "",            //工号
-				PostName:                                "",            //职位名称
-				TechnicalJobLevelCode:                   "",            //专业技术职务级别编码
-				IsActive:                                "",            //在职与否
-				PrescriptionQualificationIdentification: "",            //处方资格标识
-				IdentificationOutpatients:               "",            //门诊大病医师标识
-				OutpatientIllnessCategory:               "",            //门诊大病类别
-				StartTime:                               1233,          //开始日期
+				StaffCode:                    "",            //医护人员编码
+				UserName:                     item.UserName, //医护人员姓名
+				RoleId:                       item.Name,     //医护人员类别
+				Sex:                          "",            //性别
+				CardType:                     "",            //证件类型
+				IdCard:                       "",            //证件号码
+				Phone:                        "",            //联系电话
+				WorkMajorName:                "",            //现从事专业名称
+				Nation:                       "",            //民族
+				BirthDay:                     20201022,      //出生日期
+				WorkTime:                     12,            //参加工作日期
+				Education:                    "",            //学历
+				StudyMajorName:               "",            //所学的专业名称
+				CertificateCode:              "",            //证书编码
+				MedicalCode:                  "",            //医师资格编码
+				MedicalRangeCode:             "",            //医师执业范围代码
+				MedicalLevel:                 "",            //医生级别
+				TypeJob:                      "",            //职业类别
+				DoctorNumber:                 "",            //医师编号
+				Licensing:                    "",            //职业标志
+				DoctorServiceStatus:          "",            //医师医保服务资格状态
+				MonitoringLevel:              "",            //监控等级
+				DrugPsychotropicSubstances:   "",            //毒麻精神药品资格
+				HealthCareCode:               "",            // 母婴保健技术考核合格证书编号
+				PlanningTechnicalServiceCode: "",            //计划生育技术服务人员合格证编号
+				PharmacistType:               "",            //药师类别
+				PharmacistPracticeCategory:   "",            //药师执业类别
+				PharmacistsLicensing:         "",            //药师执业范围
+				PharmacistRegistrationNumber: "",            //执业药师注册证编号
+				OfficeCode:                   "",            //科室编码
+				JobNumber:                    "",            //工号
+				PostName:                     "",            //职位名称
+				TechnicalJobLevelCode:        "",            //专业技术职务级别编码
+				IsActive:                     "",            //在职与否
+				PrescriptionQualificationIdentification: "",   //处方资格标识
+				IdentificationOutpatients:               "",   //门诊大病医师标识
+				OutpatientIllnessCategory:               "",   //门诊大病类别
+				StartTime:                               1233, //开始日期
 				EndTime:                                 123333,
 			}
 			customs = append(customs, detail)

service/sz_his_service.go

@@ -1081,3 +1081,11 @@ func UpdataOrderlog(id int64, user_org_id int64, refund_log string) (err error)
 	return
 
 }
+
+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
+
+}