|
|
@ -129,7 +129,6 @@ import com.ylzinfo.ehc.EhcHandler;
|
|
|
import com.ylzinfo.ehc.common.utils.DateUtils;
|
|
|
import com.ylzinfo.ehc.trans.TransRequest;
|
|
|
import com.ylzinfo.ehc.trans.TransResponse;
|
|
|
import io.reactivex.Flowable;
|
|
|
import jxl.format.VerticalAlignment;
|
|
|
import jxl.write.*;
|
|
|
import net.sf.json.JSONArray;
|
|
|
@ -4586,7 +4585,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
rs.put("jobTitleName", doctorDO.getJobTitleName());
|
|
|
rs.put("chargeType", doctorDO.getChargeType());
|
|
|
rs.put("photo", doctorDO.getPhoto());
|
|
|
rs.put("consultStatus", doctorDO.getConsultStatus());
|
|
|
rs.put("outpatientType", doctorDO.getOutpatientType());
|
|
|
rs.put("expertise", doctorDO.getExpertise());
|
|
|
rs.put("introduce", doctorDO.getIntroduce());
|
|
|
@ -5019,13 +5017,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
|
|
|
Map<String, Object> rs = new HashedMap();
|
|
|
if (doctorDO != null) {
|
|
|
rs.put("doctor", doctor);
|
|
|
rs.put("doctor", doctorDO.getName());
|
|
|
rs.put("jobTitleCode", doctorDO.getJobTitleCode());
|
|
|
rs.put("jobTitleName", doctorDO.getJobTitleName());
|
|
|
rs.put("chargeType", doctorDO.getChargeType());
|
|
|
rs.put("photo", doctorDO.getPhoto());
|
|
|
rs.put("consultStatus", doctorDO.getConsultStatus());
|
|
|
rs.put("outpatientType", doctorDO.getOutpatientType());
|
|
|
rs.put("expertise", doctorDO.getExpertise());
|
|
|
rs.put("introduce", doctorDO.getIntroduce());
|
|
|
@ -5060,22 +5056,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
|
|
|
}
|
|
|
}
|
|
|
/*List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
|
|
|
String chargeType = doctorDO.getChargeType();
|
|
|
if (StringUtils.isNotBlank(chargeType)){
|
|
|
if (chargeType.contains(",")){
|
|
|
chargeType = chargeType.replace(",","','");
|
|
|
}
|
|
|
String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
|
|
|
"req_fee as \"reqFee\",zj_fee as \"zjFee\",xt_fee as \"xtFee\",dept_type_code as \"deptTypeCode\" " +
|
|
|
" from wlyy_charge_dict where 1=1";
|
|
|
sqlCharge+=" and charge_type in ( '"+chargeType+"')";
|
|
|
if(StringUtils.isNoneBlank(deptTyepCode)){
|
|
|
sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
|
|
|
}
|
|
|
chargeDictDOLists = hibenateUtils.createSQLQuery(sqlCharge);
|
|
|
}
|
|
|
rs.put("chargeTypeList",chargeDictDOLists);*/
|
|
|
List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
|
|
|
String sqlCharge = "SELECT\n" +
|
|
|
"\tm.req_fee as \"twfzFee\",\n" +
|
wangzhinan