|
@@ -55,10 +55,14 @@ public class RationalUseServer {
|
|
|
.eq("a.enter_oper", TokenUtil.getTokenUserId())
|
|
|
.eq("isnull(a.self_buy,'0')", "0")
|
|
|
.ne("a.serial", "00");
|
|
|
+
|
|
|
XinZhenYiZhu patInfo = orderDao.queryPatientInfo(patNo, times);
|
|
|
+
|
|
|
// 获取新开的医嘱
|
|
|
patInfo.setList(orderDao.selectOrderNo(qw));
|
|
|
- List<XinZhenYzActOrder> historicalData = dao.getHistoricalMedicalOrders(patNo, times);
|
|
|
+ // 历史医嘱先不给,影响我这里开医嘱
|
|
|
+ // List<XinZhenYzActOrder> historicalData = dao.getHistoricalMedicalOrders(patNo, times);
|
|
|
+ List<XinZhenYzActOrder> historicalData = new ArrayList<>();
|
|
|
|
|
|
JSONObject js = verify(patInfo, historicalData);
|
|
|
return ResultVoUtil.success(js);
|
|
@@ -102,7 +106,6 @@ public class RationalUseServer {
|
|
|
* 添加药品编码
|
|
|
*
|
|
|
* @param list
|
|
|
- * @param yp
|
|
|
* @param drugList
|
|
|
*/
|
|
|
private static void addTheDrugCode(List<XinZhenYzActOrder> list, List<String> drugList) {
|