打印单单位修改

service/pharmacy_service.go

 
 //查询药房中某一天的患者人数,is_medicine:0未发，1已发(改)
 func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err error) {
+	//orgid = 9675
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.TmpTTT
-	err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
-		"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-		"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
-		"union "+
-		"select distinct patient_id from xt_doctor_advice where "+
-		"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-		"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
-		stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
-	if err != nil {
-		return
+	if is_medicine == 0 {
+		err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
+			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 0 and "+
+			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
+			"union "+
+			"select distinct patient_id from xt_doctor_advice where "+
+			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 0 and "+
+			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
+			stime, etime, orgid, orgid, stime, etime, orgid, orgid).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	} else {
+		err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
+			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 1 and "+
+			"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
+			"union "+
+			"select distinct patient_id from xt_doctor_advice where "+
+			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 1 and "+
+			"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) ",
+			stime, etime, orgid, orgid, stime, etime, orgid, orgid).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
 	}
+
 	return len(tmp), err
 
 }
 	//病人
 	var tmp []*models.TmpTTT
 	//tmp := make([]string,0)
-	if keyword != "" {
-		keyword = "%" + keyword + "%"
-		err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-			"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
-			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
-			"union "+
-			"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-			"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
-			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc ",
-			stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid, stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid).Scan(&tmp).Error
+	if is_medicine == 0 {
+		if keyword != "" {
+			keyword = "%" + keyword + "%"
+			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
+				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
+				"union "+
+				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc ",
+				stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid, stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid).Scan(&tmp).Error
+		} else {
+			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
+				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
+				"union "+
+				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc",
+				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
+		}
+
+		if err != nil {
+			return
+		}
 	} else {
-		err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
-			"union "+
-			"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc",
-			stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
-	}
+		if keyword != "" {
+			keyword = "%" + keyword + "%"
+			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
+				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
+				"union "+
+				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1))a order by dispensing_time desc ",
+				stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid, stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid).Scan(&tmp).Error
+		} else {
+			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
+				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
+				"union "+
+				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1))a order by dispensing_time desc",
+				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
+		}
 
-	if err != nil {
-		return
+		if err != nil {
+			return
+		}
 	}
+
 	tmp_s := make([]int64, 0)
 	s_map := make(map[int64]int64)
 	for _, v := range tmp {
 func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (pp []*models.PharmacyContent, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
-	err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-		"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
-	if err != nil {
-		return pp, err
+	if is_medicine == 0 {
+		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+		if err != nil {
+			return pp, err
+		}
+	} else {
+		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+		if err != nil {
+			return pp, err
+		}
 	}
+
 	for _, v := range tmp {
 		pp = append(pp, &models.PharmacyContent{
 			Name:         v.AdviceName,
 	}
 
 	var tmp_advice []*models.XtDoctorAdviceL
-	err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-		"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
-	if err != nil {
-		return pp, err
+	if is_medicine == 0 {
+		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+		if err != nil {
+			return pp, err
+		}
+	} else {
+		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+		if err != nil {
+			return pp, err
+		}
 	}
+
 	for _, v := range tmp_advice {
 		pp = append(pp, &models.PharmacyContent{
 			Name:         v.AdviceName,
 func PrescriptionDetails(patient_id, record_date, orgid int64) (pre []*models.PrescripDetails, err error) {
 	var tmp []*models.HisDoctorAdviceInfoL
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-		"status = 1 and patient_id = ? and user_org_id = ? and dispensing_time = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", patient_id, orgid, record_date, orgid).Find(&tmp).Error
+		"status = 1 and patient_id = ? and user_org_id = ? and dispensing_time = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", patient_id, orgid, record_date, orgid).Find(&tmp).Error
 	if err != nil {
 		return
 	}
 
 	var tmp_advice []*models.XtDoctorAdviceL
 	err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-		"status = 1 and (advice_type = 2 or advice_type = 3) and patient_id = ? and user_org_id = ? and dispensing_time = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", patient_id, orgid, record_date, orgid).Find(&tmp_advice).Error
+		"status = 1 and (advice_type = 2 or advice_type = 3) and patient_id = ? and user_org_id = ? and dispensing_time = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", patient_id, orgid, record_date, orgid).Find(&tmp_advice).Error
 	if err != nil {
 		return
 	}
 func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (finlly []*models.ListOfDrugs, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.TmpLLL
-	if keyword != "" {
-		keyword = "%" + keyword + "%"
-		err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-			"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1) "+
-			"union "+
-			"select distinct drug_id from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-			"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1)",
-			stime, etime, orgid, is_medicine, orgid, keyword, stime, etime, orgid, is_medicine, orgid, keyword).Scan(&tmp).Error
+	if is_medicine == 0 {
+		if keyword != "" {
+			keyword = "%" + keyword + "%"
+			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
+				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1) "+
+				"union "+
+				"select distinct drug_id from xt_doctor_advice where "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1)",
+				stime, etime, orgid, is_medicine, orgid, keyword, stime, etime, orgid, is_medicine, orgid, keyword).Scan(&tmp).Error
+		} else {
+			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
+				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
+				"union "+
+				"select distinct drug_id from xt_doctor_advice where "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
+				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
+		}
+		if err != nil {
+			return
+		}
 	} else {
-		err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
-			"union "+
-			"select distinct drug_id from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
-			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
-			stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
+		if keyword != "" {
+			keyword = "%" + keyword + "%"
+			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
+				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1) "+
+				"union "+
+				"select distinct drug_id from xt_doctor_advice where "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1)",
+				stime, etime, orgid, is_medicine, orgid, keyword, stime, etime, orgid, is_medicine, orgid, keyword).Scan(&tmp).Error
+		} else {
+			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
+				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
+				"union "+
+				"select distinct drug_id from xt_doctor_advice where "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) ",
+				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
+		}
+		if err != nil {
+			return
+		}
 	}
 
-	if err != nil {
-		return
-	}
 	for _, v := range tmp {
 		name, specifications := FindDrugSpecifications(v.DrugId)
 		number, errs := GetInventoryQuantity(orgid, v.DrugId)
 	var xids []*models.TmpID
 	//var hid,xid []int64//查询已发药的药品
 	err = tx.Raw("select id,dispensing_time from his_doctor_advice_info where status = 1 and created_time >= ? and created_time <= ? "+
-		"and user_org_id = ? and patient_id = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&hids).Error
+		"and user_org_id = ? and patient_id = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, orgid).Scan(&hids).Error
 	if err != nil {
 		return
 	}
 	}
 
 	err = tx.Raw("select id,dispensing_time from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and "+
-		"user_org_id = ? and patient_id = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
+		"user_org_id = ? and patient_id = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
 	if err != nil {
 		return
 	}
 
 	//删除掉发药明细
 	for k, _ := range map_time {
-		err = tx.Model(&models.Pharmary{}).Where("user_org_id = ? and record_date = ? ", orgid, k).Updates(map[string]interface{}{
+		err = tx.Model(&models.Pharmary{}).Where("user_org_id = ? and record_date = ? and patient_id = ? ", orgid, k, patient_id).Updates(map[string]interface{}{
 			"status": 0,
 			"mtime":  time.Now().Unix(),
 		}).Error
 	var tmp []*models.TmpAdviceDoctor
 	//var tmp []int64
 	err = XTReadDB().Raw("select distinct advice_doctor from his_doctor_advice_info where "+
-		"status = 1 and dispensing_time = ? and user_org_id = ? and is_medicine = 1 and patient_id = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
+		"status = 1 and dispensing_time = ? and user_org_id = ? and is_medicine = 1 and patient_id = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
 		"union "+
 		"select distinct advice_doctor from xt_doctor_advice where "+
-		"status = 1 and (advice_type = 2 or advice_type = 3) and dispensing_time = ? and user_org_id = ? and is_medicine = 1 and patient_id = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
+		"status = 1 and (advice_type = 2 or advice_type = 3) and dispensing_time = ? and user_org_id = ? and is_medicine = 1 and patient_id = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1) ",
 		recordtime, orgid, id, orgid, recordtime, orgid, id, orgid).Scan(&tmp).Error
 	if err != nil || len(tmp) == 0 {
 		return

service/warhouse_service.go

 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 			}
 
-			if minNumber == 0 && maxNumber != 1 {
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}